| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'dart:io'; | 5 import 'dart:io'; |
| 6 | 6 |
| 7 import 'package:path/path.dart' as p; | 7 import 'package:path/path.dart' as p; |
| 8 import 'package:scheduled_test/scheduled_test.dart'; | 8 import 'package:scheduled_test/scheduled_test.dart'; |
| 9 | 9 |
| 10 import '../../descriptor.dart' as d; | 10 import '../../descriptor.dart' as d; |
| 11 import '../../test_pub.dart'; | 11 import '../../test_pub.dart'; |
| 12 | 12 |
| 13 main() { | 13 main() { |
| 14 initConfig(); | 14 initConfig(); |
| 15 integration("does not warn if the binstub directory is on the path", () { | 15 integration("does not warn if the binstub directory is on the path", () { |
| 16 servePackages((builder) { | 16 servePackages((builder) { |
| 17 builder.serve("foo", "1.0.0", pubspec: { | 17 builder.serve("foo", "1.0.0", pubspec: { |
| 18 "executables": { | 18 "executables": { |
| 19 "script": null | 19 "script": null |
| 20 } | 20 } |
| 21 }, contents: [ | 21 }, |
| 22 d.dir("bin", [ | 22 contents: [ |
| 23 d.file("script.dart", "main(args) => print('ok \$args');") | 23 d.dir("bin", [d.file("script.dart", "main(args) => print('ok \$arg
s');")])]); |
| 24 ]) | |
| 25 ]); | |
| 26 }); | 24 }); |
| 27 | 25 |
| 28 // Add the test's cache bin directory to the path. | 26 // Add the test's cache bin directory to the path. |
| 29 var binDir = p.dirname(Platform.executable); | 27 var binDir = p.dirname(Platform.executable); |
| 30 var separator = Platform.operatingSystem == "windows" ? ";" : ":"; | 28 var separator = Platform.operatingSystem == "windows" ? ";" : ":"; |
| 31 var path = "${Platform.environment["PATH"]}$separator$binDir"; | 29 var path = "${Platform.environment["PATH"]}$separator$binDir"; |
| 32 | 30 |
| 33 schedulePub(args: ["global", "activate", "foo"], | 31 schedulePub( |
| 32 args: ["global", "activate", "foo"], |
| 34 output: isNot(contains("is not on your path")), | 33 output: isNot(contains("is not on your path")), |
| 35 environment: {"PATH": path}); | 34 environment: { |
| 35 "PATH": path |
| 36 }); |
| 36 }); | 37 }); |
| 37 } | 38 } |
| OLD | NEW |