| Index: sdk/lib/_internal/pub_generated/test/dependency_override_test.dart
|
| diff --git a/sdk/lib/_internal/pub/test/dependency_override_test.dart b/sdk/lib/_internal/pub_generated/test/dependency_override_test.dart
|
| similarity index 82%
|
| copy from sdk/lib/_internal/pub/test/dependency_override_test.dart
|
| copy to sdk/lib/_internal/pub_generated/test/dependency_override_test.dart
|
| index 4e47e24f6a9aafa2da9d4277b47ae6ca00fe4d0c..51eef32407ed02a9781a9ace6690b2696d7fc814 100644
|
| --- a/sdk/lib/_internal/pub/test/dependency_override_test.dart
|
| +++ b/sdk/lib/_internal/pub_generated/test/dependency_override_test.dart
|
| @@ -17,8 +17,7 @@ main() {
|
| builder.serve("foo", "3.0.0");
|
| });
|
|
|
| - d.dir(appPath, [
|
| - d.pubspec({
|
| + d.dir(appPath, [d.pubspec({
|
| "name": "myapp",
|
| "dependencies": {
|
| "foo": ">2.0.0"
|
| @@ -26,8 +25,7 @@ main() {
|
| "dependency_overrides": {
|
| "foo": "<3.0.0"
|
| }
|
| - })
|
| - ]).create();
|
| + })]).create();
|
|
|
| pubCommand(command);
|
|
|
| @@ -41,14 +39,12 @@ main() {
|
| builder.serve("foo", "1.0.0");
|
| });
|
|
|
| - d.dir(appPath, [
|
| - d.pubspec({
|
| + d.dir(appPath, [d.pubspec({
|
| "name": "myapp",
|
| "dependency_overrides": {
|
| "foo": "any"
|
| }
|
| - })
|
| - ]).create();
|
| + })]).create();
|
|
|
| pubCommand(command);
|
|
|
| @@ -63,12 +59,13 @@ main() {
|
| builder.serve("foo", "2.0.0");
|
| builder.serve("foo", "3.0.0");
|
| builder.serve("bar", "1.0.0", pubspec: {
|
| - "dependencies": {"foo": "5.0.0-nonexistent"}
|
| + "dependencies": {
|
| + "foo": "5.0.0-nonexistent"
|
| + }
|
| });
|
| });
|
|
|
| - d.dir(appPath, [
|
| - d.pubspec({
|
| + d.dir(appPath, [d.pubspec({
|
| "name": "myapp",
|
| "dependencies": {
|
| "bar": "any"
|
| @@ -76,8 +73,7 @@ main() {
|
| "dependency_overrides": {
|
| "foo": "<3.0.0"
|
| }
|
| - })
|
| - ]).create();
|
| + })]).create();
|
|
|
| pubCommand(command);
|
|
|
| @@ -93,26 +89,22 @@ main() {
|
| builder.serve("bar", "1.0.0");
|
| });
|
|
|
| - d.dir("baz", [
|
| - d.libDir("baz"),
|
| - d.libPubspec("baz", "0.0.1")
|
| - ]).create();
|
| + d.dir("baz", [d.libDir("baz"), d.libPubspec("baz", "0.0.1")]).create();
|
|
|
| - d.dir(appPath, [
|
| - d.pubspec({
|
| + d.dir(appPath, [d.pubspec({
|
| "name": "myapp",
|
| "dependency_overrides": {
|
| "foo": "any",
|
| "bar": "any",
|
| - "baz": {"path": "../baz"}
|
| + "baz": {
|
| + "path": "../baz"
|
| + }
|
| }
|
| - })
|
| - ]).create();
|
| + })]).create();
|
|
|
| var bazPath = path.join("..", "baz");
|
|
|
| - schedulePub(args: [command.name], output: command.success, error:
|
| - """
|
| + schedulePub(args: [command.name], output: command.success, error: """
|
| Warning: You are using these overridden dependencies:
|
| ! bar 1.0.0
|
| ! baz 0.0.1 from path $bazPath
|
| @@ -120,4 +112,4 @@ main() {
|
| """);
|
| });
|
| });
|
| -}
|
| +}
|
|
|