| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, 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 library pub_tests; | 5 library pub_tests; |
| 6 | 6 |
| 7 import 'dart:io'; | 7 import 'dart:io'; |
| 8 | 8 |
| 9 import '../../descriptor.dart' as d; | |
| 10 import '../../test_pub.dart'; | 9 import '../../test_pub.dart'; |
| 11 | 10 |
| 12 main() { | 11 main() { |
| 13 integration("updates locked Git packages", () { | 12 integration("updates locked Git packages", () { |
| 14 ensureGit(); | 13 ensureGit(); |
| 15 | 14 |
| 16 d.git('foo.git', [ | 15 git('foo.git', [ |
| 17 d.libDir('foo'), | 16 libDir('foo'), |
| 18 d.libPubspec('foo', '1.0.0') | 17 libPubspec('foo', '1.0.0') |
| 19 ]).create(); | 18 ]).scheduleCreate(); |
| 20 | 19 |
| 21 d.git('bar.git', [ | 20 git('bar.git', [ |
| 22 d.libDir('bar'), | 21 libDir('bar'), |
| 23 d.libPubspec('bar', '1.0.0') | 22 libPubspec('bar', '1.0.0') |
| 24 ]).create(); | 23 ]).scheduleCreate(); |
| 25 | 24 |
| 26 d.appDir([{"git": "../foo.git"}, {"git": "../bar.git"}]).create(); | 25 appDir([{"git": "../foo.git"}, {"git": "../bar.git"}]).scheduleCreate(); |
| 27 | 26 |
| 28 schedulePub(args: ['install'], | 27 schedulePub(args: ['install'], |
| 29 output: new RegExp(r"Dependencies installed!$")); | 28 output: new RegExp(r"Dependencies installed!$")); |
| 30 | 29 |
| 31 d.dir(packagesPath, [ | 30 dir(packagesPath, [ |
| 32 d.dir('foo', [ | 31 dir('foo', [ |
| 33 d.file('foo.dart', 'main() => "foo";') | 32 file('foo.dart', 'main() => "foo";') |
| 34 ]), | 33 ]), |
| 35 d.dir('bar', [ | 34 dir('bar', [ |
| 36 d.file('bar.dart', 'main() => "bar";') | 35 file('bar.dart', 'main() => "bar";') |
| 37 ]) | 36 ]) |
| 38 ]).validate(); | 37 ]).scheduleValidate(); |
| 39 | 38 |
| 40 d.git('foo.git', [ | 39 git('foo.git', [ |
| 41 d.libDir('foo', 'foo 2'), | 40 libDir('foo', 'foo 2'), |
| 42 d.libPubspec('foo', '1.0.0') | 41 libPubspec('foo', '1.0.0') |
| 43 ]).commit(); | 42 ]).scheduleCommit(); |
| 44 | 43 |
| 45 d.git('bar.git', [ | 44 git('bar.git', [ |
| 46 d.libDir('bar', 'bar 2'), | 45 libDir('bar', 'bar 2'), |
| 47 d.libPubspec('bar', '1.0.0') | 46 libPubspec('bar', '1.0.0') |
| 48 ]).commit(); | 47 ]).scheduleCommit(); |
| 49 | 48 |
| 50 schedulePub(args: ['update'], | 49 schedulePub(args: ['update'], |
| 51 output: new RegExp(r"Dependencies updated!$")); | 50 output: new RegExp(r"Dependencies updated!$")); |
| 52 | 51 |
| 53 d.dir(packagesPath, [ | 52 dir(packagesPath, [ |
| 54 d.dir('foo', [ | 53 dir('foo', [ |
| 55 d.file('foo.dart', 'main() => "foo 2";') | 54 file('foo.dart', 'main() => "foo 2";') |
| 56 ]), | 55 ]), |
| 57 d.dir('bar', [ | 56 dir('bar', [ |
| 58 d.file('bar.dart', 'main() => "bar 2";') | 57 file('bar.dart', 'main() => "bar 2";') |
| 59 ]) | 58 ]) |
| 60 ]).validate(); | 59 ]).scheduleValidate(); |
| 61 }); | 60 }); |
| 62 } | 61 } |
| OLD | NEW |