| Index: sdk/lib/_internal/pub_generated/test/global/activate/activate_hosted_after_git_test.dart
|
| diff --git a/sdk/lib/_internal/pub/test/global/activate/activate_hosted_after_git_test.dart b/sdk/lib/_internal/pub_generated/test/global/activate/activate_hosted_after_git_test.dart
|
| similarity index 60%
|
| copy from sdk/lib/_internal/pub/test/global/activate/activate_hosted_after_git_test.dart
|
| copy to sdk/lib/_internal/pub_generated/test/global/activate/activate_hosted_after_git_test.dart
|
| index 88e9913a9ec8bf5ae3e5ce3df262b3849fd5def5..70f2bf8f022895a7bc16f32d376f57a557867f1c 100644
|
| --- a/sdk/lib/_internal/pub/test/global/activate/activate_hosted_after_git_test.dart
|
| +++ b/sdk/lib/_internal/pub_generated/test/global/activate/activate_hosted_after_git_test.dart
|
| @@ -1,33 +1,23 @@
|
| -// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file
|
| -// for details. All rights reserved. Use of this source code is governed by a
|
| -// BSD-style license that can be found in the LICENSE file.
|
| -
|
| import 'package:path/path.dart' as p;
|
| -
|
| import '../../../lib/src/io.dart';
|
| import '../../descriptor.dart' as d;
|
| import '../../test_pub.dart';
|
| -
|
| main() {
|
| initConfig();
|
| integration('activating a hosted package deactivates the Git one', () {
|
| servePackages((builder) {
|
| - builder.serve("foo", "2.0.0", contents: [
|
| - d.dir("bin", [
|
| - d.file("foo.dart", "main(args) => print('hosted');")
|
| - ])
|
| - ]);
|
| + builder.serve(
|
| + "foo",
|
| + "2.0.0",
|
| + contents: [
|
| + d.dir("bin", [d.file("foo.dart", "main(args) => print('hosted');")])]);
|
| });
|
| -
|
| - d.git('foo.git', [
|
| - d.libPubspec("foo", "1.0.0"),
|
| - d.dir("bin", [
|
| - d.file("foo.dart", "main() => print('git');")
|
| - ])
|
| - ]).create();
|
| -
|
| + d.git(
|
| + 'foo.git',
|
| + [
|
| + d.libPubspec("foo", "1.0.0"),
|
| + d.dir("bin", [d.file("foo.dart", "main() => print('git');")])]).create();
|
| schedulePub(args: ["global", "activate", "-sgit", "../foo.git"]);
|
| -
|
| var path = canonicalize(p.join(sandboxDir, "foo"));
|
| schedulePub(args: ["global", "activate", "foo"], output: """
|
| Package foo is currently active from Git repository "../foo.git".
|
| @@ -38,8 +28,6 @@ main() {
|
| Loading source assets...
|
| Precompiled foo:foo.
|
| Activated foo 2.0.0.""");
|
| -
|
| - // Should now run the hosted one.
|
| var pub = pubRun(global: true, args: ["foo"]);
|
| pub.stdout.expect("hosted");
|
| pub.shouldExit();
|
|
|