| Index: sdk/lib/_internal/pub_generated/test/global/activate/activate_hosted_after_git_test.dart
|
| diff --git a/sdk/lib/_internal/pub_generated/test/global/activate/activate_hosted_after_git_test.dart b/sdk/lib/_internal/pub_generated/test/global/activate/activate_hosted_after_git_test.dart
|
| index 70f2bf8f022895a7bc16f32d376f57a557867f1c..29d56b4589cf86c807c2d9574f23f8d326df4cda 100644
|
| --- a/sdk/lib/_internal/pub_generated/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,7 +1,13 @@
|
| +// 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', () {
|
| @@ -12,12 +18,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", "-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".
|
| @@ -28,6 +37,8 @@ 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();
|
|
|