Index: sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_test.dart |
diff --git a/sdk/lib/_internal/pub/test/global/binstubs/name_collision_test.dart b/sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_test.dart |
similarity index 60% |
copy from sdk/lib/_internal/pub/test/global/binstubs/name_collision_test.dart |
copy to sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_test.dart |
index e07975a064ca7539abf4ddeaf4b454e623d4e17a..4667065ebfb9cf496ce6a397f51d7e486caecf98 100644 |
--- a/sdk/lib/_internal/pub/test/global/binstubs/name_collision_test.dart |
+++ b/sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_test.dart |
@@ -11,8 +11,7 @@ import '../../test_pub.dart'; |
main() { |
initConfig(); |
integration("does not overwrite an existing binstub", () { |
- d.dir("foo", [ |
- d.pubspec({ |
+ d.dir("foo", [d.pubspec({ |
"name": "foo", |
"executables": { |
"foo": "foo", |
@@ -20,13 +19,9 @@ main() { |
"collide2": "foo" |
} |
}), |
- d.dir("bin", [ |
- d.file("foo.dart", "main() => print('ok');") |
- ]) |
- ]).create(); |
+ d.dir("bin", [d.file("foo.dart", "main() => print('ok');")])]).create(); |
- d.dir("bar", [ |
- d.pubspec({ |
+ d.dir("bar", [d.pubspec({ |
"name": "bar", |
"executables": { |
"bar": "bar", |
@@ -34,10 +29,7 @@ main() { |
"collide2": "bar" |
} |
}), |
- d.dir("bin", [ |
- d.file("bar.dart", "main() => print('ok');") |
- ]) |
- ]).create(); |
+ d.dir("bin", [d.file("bar.dart", "main() => print('ok');")])]).create(); |
schedulePub(args: ["global", "activate", "-spath", "../foo"]); |
@@ -45,17 +37,19 @@ main() { |
pub.stdout.expect(consumeThrough("Installed executable bar.")); |
pub.stderr.expect("Executable collide1 was already installed from foo."); |
pub.stderr.expect("Executable collide2 was already installed from foo."); |
- pub.stderr.expect("Deactivate the other package(s) or activate bar using " |
- "--overwrite."); |
+ pub.stderr.expect( |
+ "Deactivate the other package(s) or activate bar using " "--overwrite."); |
pub.shouldExit(); |
- d.dir(cachePath, [ |
- d.dir("bin", [ |
- d.matcherFile(binStubName("foo"), contains("foo:foo")), |
- d.matcherFile(binStubName("bar"), contains("bar:bar")), |
- d.matcherFile(binStubName("collide1"), contains("foo:foo")), |
- d.matcherFile(binStubName("collide2"), contains("foo:foo")) |
- ]) |
- ]).validate(); |
+ d.dir( |
+ cachePath, |
+ [ |
+ d.dir( |
+ "bin", |
+ [ |
+ d.matcherFile(binStubName("foo"), contains("foo:foo")), |
+ d.matcherFile(binStubName("bar"), contains("bar:bar")), |
+ d.matcherFile(binStubName("collide1"), contains("foo:foo")), |
+ d.matcherFile(binStubName("collide2"), contains("foo:foo"))])]).validate(); |
}); |
} |