| Index: utils/tests/pub/install/git/stay_locked_if_compatible_test.dart
|
| diff --git a/utils/tests/pub/install/git/stay_locked_if_compatible_test.dart b/utils/tests/pub/install/git/stay_locked_if_compatible_test.dart
|
| index 0f577855fd45856a70d2cbc06a0feca2761ac7dc..67bef629fca74fb8fd89bff2c86569e9ba61ee2e 100644
|
| --- a/utils/tests/pub/install/git/stay_locked_if_compatible_test.dart
|
| +++ b/utils/tests/pub/install/git/stay_locked_if_compatible_test.dart
|
| @@ -6,7 +6,6 @@ library pub_tests;
|
|
|
| import 'dart:io';
|
|
|
| -import '../../descriptor.dart' as d;
|
| import '../../test_pub.dart';
|
|
|
| main() {
|
| @@ -14,36 +13,36 @@ main() {
|
| "constraint", () {
|
| ensureGit();
|
|
|
| - d.git('foo.git', [
|
| - d.libDir('foo', 'foo 1.0.0'),
|
| - d.libPubspec("foo", "1.0.0")
|
| - ]).create();
|
| + git('foo.git', [
|
| + libDir('foo', 'foo 1.0.0'),
|
| + libPubspec("foo", "1.0.0")
|
| + ]).scheduleCreate();
|
|
|
| - d.appDir([{"git": "../foo.git"}]).create();
|
| + appDir([{"git": "../foo.git"}]).scheduleCreate();
|
|
|
| schedulePub(args: ['install'],
|
| output: new RegExp(r"Dependencies installed!$"));
|
|
|
| - d.dir(packagesPath, [
|
| - d.dir('foo', [
|
| - d.file('foo.dart', 'main() => "foo 1.0.0";')
|
| + dir(packagesPath, [
|
| + dir('foo', [
|
| + file('foo.dart', 'main() => "foo 1.0.0";')
|
| ])
|
| - ]).validate();
|
| + ]).scheduleValidate();
|
|
|
| - d.git('foo.git', [
|
| - d.libDir('foo', 'foo 1.0.1'),
|
| - d.libPubspec("foo", "1.0.1")
|
| - ]).commit();
|
| + git('foo.git', [
|
| + libDir('foo', 'foo 1.0.1'),
|
| + libPubspec("foo", "1.0.1")
|
| + ]).scheduleCommit();
|
|
|
| - d.appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).create();
|
| + appDir([{"git": "../foo.git", "version": ">=1.0.0"}]).scheduleCreate();
|
|
|
| schedulePub(args: ['install'],
|
| output: new RegExp(r"Dependencies installed!$"));
|
|
|
| - d.dir(packagesPath, [
|
| - d.dir('foo', [
|
| - d.file('foo.dart', 'main() => "foo 1.0.0";')
|
| + dir(packagesPath, [
|
| + dir('foo', [
|
| + file('foo.dart', 'main() => "foo 1.0.0";')
|
| ])
|
| - ]).validate();
|
| + ]).scheduleValidate();
|
| });
|
| }
|
|
|