Siklos/libgit2dart
1
0
Fork 0
mirror of https://github.com/SkinnyMind/libgit2dart.git synced 2025-05-04 20:29:08 -04:00
Code Issues Projects Releases Wiki Activity

refactor: compose paths using path package

Browse source
This commit is contained in:
Aleksey Kulikov 2021-12-31 12:00:04 +03:00
parent f2e78daa42
commit 59cf7174f6
36 changed files with 225 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

5
test/merge_test.dart
View file

@ -4,6 +4,7 @@ import 'dart:ffi';
import 'dart:io';
import 'package:libgit2dart/libgit2dart.dart';
import 'package:path/path.dart' as p;
import 'package:test/test.dart';
import 'helpers/util.dart';
@ -13,7 +14,7 @@ void main() {
late Directory tmpDir;
setUp(() {
tmpDir = setupRepo(Directory('test/assets/merge_repo/'));
tmpDir = setupRepo(Directory(p.join('test', 'assets', 'merge_repo')));
repo = Repository.open(tmpDir.path);
});
@ -224,7 +225,7 @@ conflict branch edit
expect(index.conflicts, isEmpty);
expect(
File('${repo.workdir}conflict_file').readAsStringSync(),
File(p.join(repo.workdir, 'conflict_file')).readAsStringSync(),
'master conflict edit\n',
);