| Index: test/no_packages_dir_test.dart
|
| diff --git a/test/no_packages_dir_test.dart b/test/no_packages_dir_test.dart
|
| index 579788e6502165afefa1f51641be614dccee92c3..2e590c187f40911fa26736dacc50999bd5369836 100644
|
| --- a/test/no_packages_dir_test.dart
|
| +++ b/test/no_packages_dir_test.dart
|
| @@ -9,69 +9,7 @@ import 'test_pub.dart';
|
|
|
| main() {
|
| forBothPubGetAndUpgrade((command) {
|
| - group("with --no-packages-dir", () {
|
| - integration("installs hosted dependencies to the cache", () {
|
| - servePackages((builder) {
|
| - builder.serve("foo", "1.0.0");
|
| - builder.serve("bar", "1.0.0");
|
| - });
|
| -
|
| - d.appDir({"foo": "any", "bar": "any"}).create();
|
| -
|
| - pubCommand(command, args: ["--no-packages-dir"]);
|
| -
|
| - d.nothing("$appPath/packages").validate();
|
| -
|
| - d.hostedCache([
|
| - d.dir("foo-1.0.0", [
|
| - d.dir("lib", [d.file("foo.dart", 'main() => "foo 1.0.0";')])
|
| - ]),
|
| - d.dir("bar-1.0.0", [
|
| - d.dir("lib", [d.file("bar.dart", 'main() => "bar 1.0.0";')])
|
| - ])
|
| - ]).validate();
|
| - });
|
| -
|
| - integration("installs git dependencies to the cache", () {
|
| - ensureGit();
|
| -
|
| - d.git('foo.git', [
|
| - d.libDir('foo'),
|
| - d.libPubspec('foo', '1.0.0')
|
| - ]).create();
|
| -
|
| - d.appDir({"foo": {"git": "../foo.git"}}).create();
|
| -
|
| - pubCommand(command, args: ["--no-packages-dir"]);
|
| -
|
| - d.nothing("$appPath/packages").validate();
|
| -
|
| - d.dir(cachePath, [
|
| - d.dir('git', [
|
| - d.dir('cache', [d.gitPackageRepoCacheDir('foo')]),
|
| - d.gitPackageRevisionCacheDir('foo')
|
| - ])
|
| - ]).validate();
|
| - });
|
| -
|
| - integration("locks path dependencies", () {
|
| - d.dir("foo", [
|
| - d.libDir("foo"),
|
| - d.libPubspec("foo", "0.0.1")
|
| - ]).create();
|
| -
|
| - d.dir(appPath, [
|
| - d.appPubspec({
|
| - "foo": {"path": "../foo"}
|
| - })
|
| - ]).create();
|
| -
|
| - pubCommand(command, args: ["--no-packages-dir"]);
|
| -
|
| - d.nothing("$appPath/packages").validate();
|
| - d.matcherFile("$appPath/pubspec.lock", contains("foo"));
|
| - });
|
| -
|
| + group("without --packages-dir", () {
|
| integration("removes package directories near entrypoints", () {
|
| d.dir(appPath, [
|
| d.appPubspec(),
|
| @@ -81,7 +19,7 @@ main() {
|
| d.dir("web/subdir/packages")
|
| ]).create();
|
|
|
| - pubCommand(command, args: ["--no-packages-dir"]);
|
| + pubCommand(command);
|
|
|
| d.dir(appPath, [
|
| d.nothing("packages"),
|
| @@ -100,7 +38,7 @@ main() {
|
| d.dir("lib/packages")
|
| ]).create();
|
|
|
| - pubCommand(command, args: ["--no-packages-dir"]);
|
| + pubCommand(command);
|
|
|
| d.dir(appPath, [
|
| d.nothing("packages"),
|
|
|