| Index: sdk/lib/_internal/pub_generated/test/implicit_barback_dependency_test.dart
|
| diff --git a/sdk/lib/_internal/pub/test/implicit_barback_dependency_test.dart b/sdk/lib/_internal/pub_generated/test/implicit_barback_dependency_test.dart
|
| similarity index 76%
|
| copy from sdk/lib/_internal/pub/test/implicit_barback_dependency_test.dart
|
| copy to sdk/lib/_internal/pub_generated/test/implicit_barback_dependency_test.dart
|
| index 9b7877478b3456bb65c5eab24d0e24bd287ef24b..a7257975624ceca974270e9db761aa8ade1a39f4 100644
|
| --- a/sdk/lib/_internal/pub/test/implicit_barback_dependency_test.dart
|
| +++ b/sdk/lib/_internal/pub_generated/test/implicit_barback_dependency_test.dart
|
| @@ -13,8 +13,8 @@ main() {
|
|
|
| var constraint = barback.pubConstraints["barback"];
|
| var current = constraint.min.toString();
|
| - var previous = new Version(constraint.min.major, constraint.min.minor - 1, 0)
|
| - .toString();
|
| + var previous =
|
| + new Version(constraint.min.major, constraint.min.minor - 1, 0).toString();
|
| var nextPatch = constraint.min.nextPatch.toString();
|
| var max = constraint.max.toString();
|
|
|
| @@ -53,15 +53,16 @@ main() {
|
| builder.serve("stack_trace", stackTraceVersion);
|
| });
|
|
|
| - d.dir("foo", [
|
| - d.libDir("foo", "foo 0.0.1"),
|
| - d.libPubspec("foo", "0.0.1", deps: {
|
| + d.dir(
|
| + "foo",
|
| + [d.libDir("foo", "foo 0.0.1"), d.libPubspec("foo", "0.0.1", deps: {
|
| "barback": "any"
|
| - })
|
| - ]).create();
|
| + })]).create();
|
|
|
| d.appDir({
|
| - "foo": {"path": "../foo"}
|
| + "foo": {
|
| + "path": "../foo"
|
| + }
|
| }).create();
|
|
|
| pubCommand(command);
|
| @@ -72,26 +73,29 @@ main() {
|
| }).validate();
|
| });
|
|
|
| - integration("pub's implicit constraint uses the same source and "
|
| - "description as a dependency override", () {
|
| + integration(
|
| + "pub's implicit constraint uses the same source and "
|
| + "description as a dependency override",
|
| + () {
|
| servePackages((builder) {
|
| builder.serve("source_span", sourceSpanVersion);
|
| builder.serve("stack_trace", stackTraceVersion);
|
| });
|
|
|
| - d.dir('barback', [
|
| - d.libDir('barback', 'barback $current'),
|
| - d.libPubspec('barback', current),
|
| - ]).create();
|
| + d.dir(
|
| + 'barback',
|
| + [
|
| + d.libDir('barback', 'barback $current'),
|
| + d.libPubspec('barback', current),]).create();
|
|
|
| - d.dir(appPath, [
|
| - d.pubspec({
|
| + d.dir(appPath, [d.pubspec({
|
| "name": "myapp",
|
| "dependency_overrides": {
|
| - "barback": {"path": "../barback"}
|
| + "barback": {
|
| + "path": "../barback"
|
| + }
|
| }
|
| - })
|
| - ]).create();
|
| + })]).create();
|
|
|
| pubCommand(command);
|
|
|
| @@ -109,7 +113,9 @@ main() {
|
| builder.serve("stack_trace", stackTraceVersion);
|
| });
|
|
|
| - d.appDir({"barback": "any"}).create();
|
| + d.appDir({
|
| + "barback": "any"
|
| + }).create();
|
|
|
| // Hand-create a lockfile to pin barback to an older version.
|
| createLockFile("myapp", hosted: {
|
| @@ -124,15 +130,19 @@ main() {
|
| }).validate();
|
| });
|
|
|
| - integration("includes pub in the error if a solve failed because there "
|
| - "is no version available", () {
|
| + integration(
|
| + "includes pub in the error if a solve failed because there "
|
| + "is no version available",
|
| + () {
|
| servePackages((builder) {
|
| builder.serve("barback", previous);
|
| builder.serve("source_span", sourceSpanVersion);
|
| builder.serve("stack_trace", stackTraceVersion);
|
| });
|
|
|
| - d.appDir({"barback": "any"}).create();
|
| + d.appDir({
|
| + "barback": "any"
|
| + }).create();
|
|
|
| pubGet(error: """
|
| Package barback 0.12.0 does not match >=$current <$max derived from:
|
| @@ -140,8 +150,10 @@ Package barback 0.12.0 does not match >=$current <$max derived from:
|
| - pub itself depends on version >=$current <$max""");
|
| });
|
|
|
| - integration("includes pub in the error if a solve failed because there "
|
| - "is a disjoint constraint", () {
|
| + integration(
|
| + "includes pub in the error if a solve failed because there "
|
| + "is a disjoint constraint",
|
| + () {
|
| servePackages((builder) {
|
| builder.serve("barback", previous);
|
| builder.serve("barback", current);
|
| @@ -149,11 +161,13 @@ Package barback 0.12.0 does not match >=$current <$max derived from:
|
| builder.serve("stack_trace", stackTraceVersion);
|
| });
|
|
|
| - d.appDir({"barback": previous}).create();
|
| + d.appDir({
|
| + "barback": previous
|
| + }).create();
|
|
|
| pubGet(error: """
|
| Incompatible version constraints on barback:
|
| - myapp 0.0.0 depends on version $previous
|
| - pub itself depends on version >=$current <$max""");
|
| });
|
| -}
|
| +}
|
|
|