| Index: utils/tests/pub/update/git/update_to_nonexistent_pubspec_test.dart
|
| diff --git a/utils/tests/pub/update/git/update_to_nonexistent_pubspec_test.dart b/utils/tests/pub/update/git/update_to_nonexistent_pubspec_test.dart
|
| index 21951ab85efd0a3b04d3200912e8cdddbf42e777..c4bf53d4ccfcc7fbe38a20b85d2ec6e0378ab2b2 100644
|
| --- a/utils/tests/pub/update/git/update_to_nonexistent_pubspec_test.dart
|
| +++ b/utils/tests/pub/update/git/update_to_nonexistent_pubspec_test.dart
|
| @@ -6,41 +6,42 @@ library pub_tests;
|
|
|
| import 'dart:io';
|
|
|
| +import '../../descriptor.dart' as d;
|
| import '../../test_pub.dart';
|
|
|
| main() {
|
| integration("updates Git packages to a nonexistent pubspec", () {
|
| ensureGit();
|
|
|
| - var repo = git('foo.git', [
|
| - libDir('foo'),
|
| - libPubspec('foo', '1.0.0')
|
| + var repo = d.git('foo.git', [
|
| + d.libDir('foo'),
|
| + d.libPubspec('foo', '1.0.0')
|
| ]);
|
| - repo.scheduleCreate();
|
| + repo.create();
|
|
|
| - appDir([{"git": "../foo.git"}]).scheduleCreate();
|
| + d.appDir([{"git": "../foo.git"}]).create();
|
|
|
| schedulePub(args: ['install'],
|
| output: new RegExp(r"Dependencies installed!$"));
|
|
|
| - dir(packagesPath, [
|
| - dir('foo', [
|
| - file('foo.dart', 'main() => "foo";')
|
| + d.dir(packagesPath, [
|
| + d.dir('foo', [
|
| + d.file('foo.dart', 'main() => "foo";')
|
| ])
|
| - ]).scheduleValidate();
|
| + ]).validate();
|
|
|
| - repo.scheduleGit(['rm', 'pubspec.yaml']);
|
| - repo.scheduleGit(['commit', '-m', 'delete']);
|
| + repo.runGit(['rm', 'pubspec.yaml']);
|
| + repo.runGit(['commit', '-m', 'delete']);
|
|
|
| schedulePub(args: ['update'],
|
| error: new RegExp(r'Package "foo" doesn' "'" r't have a '
|
| r'pubspec.yaml file.'),
|
| exitCode: 1);
|
|
|
| - dir(packagesPath, [
|
| - dir('foo', [
|
| - file('foo.dart', 'main() => "foo";')
|
| + d.dir(packagesPath, [
|
| + d.dir('foo', [
|
| + d.file('foo.dart', 'main() => "foo";')
|
| ])
|
| - ]).scheduleValidate();
|
| + ]).validate();
|
| });
|
| }
|
|
|