Index: utils/tests/pub/install/path/relative_path_test.dart |
diff --git a/utils/tests/pub/install/path/relative_path_test.dart b/utils/tests/pub/install/path/relative_path_test.dart |
index 4474562dc8f755cfaa2acffa662473b06161a985..691beed156e84633798d70c2588893f547087552 100644 |
--- a/utils/tests/pub/install/path/relative_path_test.dart |
+++ b/utils/tests/pub/install/path/relative_path_test.dart |
@@ -1,73 +1,72 @@ |
-// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS d.file |
+// Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file |
// for details. All rights reserved. Use of this source code is governed by a |
-// BSD-style license that can be found in the LICENSE d.file. |
+// BSD-style license that can be found in the LICENSE file. |
import '../../../../../pkg/pathos/lib/path.dart' as path; |
import '../../../../pub/exit_codes.dart' as exit_codes; |
-import '../../descriptor.dart' as d; |
import '../../test_pub.dart'; |
main() { |
initConfig(); |
integration("can use relative path", () { |
- d.dir("foo", [ |
- d.libDir("foo"), |
- d.libPubspec("foo", "0.0.1") |
- ]).create(); |
+ dir("foo", [ |
+ libDir("foo"), |
+ libPubspec("foo", "0.0.1") |
+ ]).scheduleCreate(); |
- d.dir(appPath, [ |
- d.pubspec({ |
+ dir(appPath, [ |
+ pubspec({ |
"name": "myapp", |
"dependencies": { |
"foo": {"path": "../foo"} |
} |
}) |
- ]).create(); |
+ ]).scheduleCreate(); |
schedulePub(args: ["install"], |
output: new RegExp(r"Dependencies installed!$")); |
- d.dir(packagesPath, [ |
- d.dir("foo", [ |
- d.file("foo.dart", 'main() => "foo";') |
+ dir(packagesPath, [ |
+ dir("foo", [ |
+ file("foo.dart", 'main() => "foo";') |
]) |
- ]).validate(); |
+ ]).scheduleValidate(); |
}); |
- integration("path is relative to containing d.pubspec", () { |
- d.dir("relative", [ |
- d.dir("foo", [ |
- d.libDir("foo"), |
- d.libPubspec("foo", "0.0.1", deps: [ |
+ integration("path is relative to containing pubspec", () { |
+ dir("relative", [ |
+ dir("foo", [ |
+ libDir("foo"), |
+ libPubspec("foo", "0.0.1", deps: [ |
{"path": "../bar"} |
]) |
]), |
- d.dir("bar", [ |
- d.libDir("bar"), |
- d.libPubspec("bar", "0.0.1") |
+ dir("bar", [ |
+ libDir("bar"), |
+ libPubspec("bar", "0.0.1") |
]) |
- ]).create(); |
+ ]).scheduleCreate(); |
- d.dir(appPath, [ |
- d.pubspec({ |
+ dir(appPath, [ |
+ pubspec({ |
"name": "myapp", |
"dependencies": { |
"foo": {"path": "../relative/foo"} |
} |
}) |
- ]).create(); |
+ ]).scheduleCreate(); |
schedulePub(args: ["install"], |
output: new RegExp(r"Dependencies installed!$")); |
- d.dir(packagesPath, [ |
- d.dir("foo", [ |
- d.file("foo.dart", 'main() => "foo";') |
+ dir(packagesPath, [ |
+ dir("foo", [ |
+ file("foo.dart", 'main() => "foo";') |
]), |
- d.dir("bar", [ |
- d.file("bar.dart", 'main() => "bar";') |
+ dir("bar", [ |
+ file("bar.dart", 'main() => "bar";') |
]) |
- ]).validate(); |
+ ]).scheduleValidate(); |
}); |
} |