| Index: sdk/lib/_internal/pub_generated/test/global/activate/activate_git_after_hosted_test.dart
|
| diff --git a/sdk/lib/_internal/pub_generated/test/global/activate/activate_git_after_hosted_test.dart b/sdk/lib/_internal/pub_generated/test/global/activate/activate_git_after_hosted_test.dart
|
| index 240c1af36b11a47a74267b2e43e6e54457b4a4f5..84c42f4c8857eaee54ea6a9b265f445297e7cf2e 100644
|
| --- a/sdk/lib/_internal/pub_generated/test/global/activate/activate_git_after_hosted_test.dart
|
| +++ b/sdk/lib/_internal/pub_generated/test/global/activate/activate_git_after_hosted_test.dart
|
| @@ -1,9 +1,15 @@
|
| +// 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 '../../descriptor.dart' as d;
|
| import '../../test_pub.dart';
|
| +
|
| main() {
|
| initConfig();
|
| integration('activating a Git package deactivates the hosted one', () {
|
| ensureGit();
|
| +
|
| servePackages((builder) {
|
| builder.serve(
|
| "foo",
|
| @@ -11,12 +17,15 @@ main() {
|
| 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();
|
| +
|
| schedulePub(args: ["global", "activate", "foo"]);
|
| +
|
| schedulePub(args: ["global", "activate", "-sgit", "../foo.git"], output: """
|
| Package foo is currently active at version 1.0.0.
|
| Resolving dependencies...
|
| @@ -25,6 +34,8 @@ main() {
|
| Loading source assets...
|
| Precompiled foo:foo.
|
| Activated foo 1.0.0 from Git repository "../foo.git".""");
|
| +
|
| + // Should now run the git one.
|
| var pub = pubRun(global: true, args: ["foo"]);
|
| pub.stdout.expect("git");
|
| pub.shouldExit();
|
|
|