| Index: utils/tests/pub/install/git/check_out_transitive_test.dart
|
| diff --git a/utils/tests/pub/install/git/check_out_transitive_test.dart b/utils/tests/pub/install/git/check_out_transitive_test.dart
|
| index c0e7b8d33f08aadf5235f06704d03b1fc6153293..60314470c21493e88528c049664ebcc2fa77d7ab 100644
|
| --- a/utils/tests/pub/install/git/check_out_transitive_test.dart
|
| +++ b/utils/tests/pub/install/git/check_out_transitive_test.dart
|
| @@ -6,45 +6,46 @@ library pub_tests;
|
|
|
| import 'dart:io';
|
|
|
| +import '../../descriptor.dart' as d;
|
| import '../../test_pub.dart';
|
|
|
| main() {
|
| integration('checks out packages transitively from Git', () {
|
| ensureGit();
|
|
|
| - git('foo.git', [
|
| - libDir('foo'),
|
| - libPubspec('foo', '1.0.0', deps: [{"git": "../bar.git"}])
|
| - ]).scheduleCreate();
|
| + d.git('foo.git', [
|
| + d.libDir('foo'),
|
| + d.libPubspec('foo', '1.0.0', deps: [{"git": "../bar.git"}])
|
| + ]).create();
|
|
|
| - git('bar.git', [
|
| - libDir('bar'),
|
| - libPubspec('bar', '1.0.0')
|
| - ]).scheduleCreate();
|
| + d.git('bar.git', [
|
| + d.libDir('bar'),
|
| + d.libPubspec('bar', '1.0.0')
|
| + ]).create();
|
|
|
| - appDir([{"git": "../foo.git"}]).scheduleCreate();
|
| + d.appDir([{"git": "../foo.git"}]).create();
|
|
|
| schedulePub(args: ['install'],
|
| output: new RegExp("Dependencies installed!\$"));
|
|
|
| - dir(cachePath, [
|
| - dir('git', [
|
| - dir('cache', [
|
| - gitPackageRepoCacheDir('foo'),
|
| - gitPackageRepoCacheDir('bar')
|
| + d.dir(cachePath, [
|
| + d.dir('git', [
|
| + d.dir('cache', [
|
| + d.gitPackageRepoCacheDir('foo'),
|
| + d.gitPackageRepoCacheDir('bar')
|
| ]),
|
| - gitPackageRevisionCacheDir('foo'),
|
| - gitPackageRevisionCacheDir('bar')
|
| + d.gitPackageRevisionCacheDir('foo'),
|
| + d.gitPackageRevisionCacheDir('bar')
|
| ])
|
| - ]).scheduleValidate();
|
| + ]).validate();
|
|
|
| - dir(packagesPath, [
|
| - dir('foo', [
|
| - file('foo.dart', 'main() => "foo";')
|
| + d.dir(packagesPath, [
|
| + d.dir('foo', [
|
| + d.file('foo.dart', 'main() => "foo";')
|
| ]),
|
| - dir('bar', [
|
| - file('bar.dart', 'main() => "bar";')
|
| + d.dir('bar', [
|
| + d.file('bar.dart', 'main() => "bar";')
|
| ])
|
| - ]).scheduleValidate();
|
| + ]).validate();
|
| });
|
| }
|
|
|