Index: sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_with_overwrite_test.dart |
diff --git a/sdk/lib/_internal/pub/test/global/binstubs/name_collision_with_overwrite_test.dart b/sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_with_overwrite_test.dart |
similarity index 55% |
copy from sdk/lib/_internal/pub/test/global/binstubs/name_collision_with_overwrite_test.dart |
copy to sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_with_overwrite_test.dart |
index 375252518b7e49a9c2ab9aa292466c6b52ff7f4a..a868a24639fc2175c77f4627343006e9eadc7008 100644 |
--- a/sdk/lib/_internal/pub/test/global/binstubs/name_collision_with_overwrite_test.dart |
+++ b/sdk/lib/_internal/pub_generated/test/global/binstubs/name_collision_with_overwrite_test.dart |
@@ -11,8 +11,7 @@ import '../../test_pub.dart'; |
main() { |
initConfig(); |
integration("overwrites an existing binstub if --overwrite is passed", () { |
- 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,29 +29,27 @@ 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"]); |
- var pub = startPub(args: [ |
- "global", "activate", "-spath", "../bar", "--overwrite" |
- ]); |
- pub.stdout.expect(consumeThrough( |
- "Installed executables bar, collide1 and collide2.")); |
+ var pub = |
+ startPub(args: ["global", "activate", "-spath", "../bar", "--overwrite"]); |
+ pub.stdout.expect( |
+ consumeThrough("Installed executables bar, collide1 and collide2.")); |
pub.stderr.expect("Replaced collide1 previously installed from foo."); |
pub.stderr.expect("Replaced collide2 previously installed from foo."); |
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("bar:bar")), |
- d.matcherFile(binStubName("collide2"), contains("bar:bar")) |
- ]) |
- ]).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("bar:bar")), |
+ d.matcherFile(binStubName("collide2"), contains("bar:bar"))])]).validate(); |
}); |
} |