| 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; |
| 9 import '../../test_pub.dart'; | 10 import '../../test_pub.dart'; |
| 10 | 11 |
| 11 main() { | 12 main() { |
| 12 integration('checks out and updates a package from Git', () { | 13 integration('checks out and updates a package from Git', () { |
| 13 ensureGit(); | 14 ensureGit(); |
| 14 | 15 |
| 15 git('foo.git', [ | 16 d.git('foo.git', [ |
| 16 libDir('foo'), | 17 d.libDir('foo'), |
| 17 libPubspec('foo', '1.0.0') | 18 d.libPubspec('foo', '1.0.0') |
| 18 ]).scheduleCreate(); | 19 ]).create(); |
| 19 | 20 |
| 20 appDir([{"git": "../foo.git"}]).scheduleCreate(); | 21 d.appDir([{"git": "../foo.git"}]).create(); |
| 21 | 22 |
| 22 schedulePub(args: ['install'], | 23 schedulePub(args: ['install'], |
| 23 output: new RegExp(r"Dependencies installed!$")); | 24 output: new RegExp(r"Dependencies installed!$")); |
| 24 | 25 |
| 25 dir(cachePath, [ | 26 d.dir(cachePath, [ |
| 26 dir('git', [ | 27 d.dir('git', [ |
| 27 dir('cache', [gitPackageRepoCacheDir('foo')]), | 28 d.dir('cache', [d.gitPackageRepoCacheDir('foo')]), |
| 28 gitPackageRevisionCacheDir('foo') | 29 d.gitPackageRevisionCacheDir('foo') |
| 29 ]) | 30 ]) |
| 30 ]).scheduleValidate(); | 31 ]).validate(); |
| 31 | 32 |
| 32 dir(packagesPath, [ | 33 d.dir(packagesPath, [ |
| 33 dir('foo', [ | 34 d.dir('foo', [ |
| 34 file('foo.dart', 'main() => "foo";') | 35 d.file('foo.dart', 'main() => "foo";') |
| 35 ]) | 36 ]) |
| 36 ]).scheduleValidate(); | 37 ]).validate(); |
| 37 | 38 |
| 38 // TODO(nweiz): remove this once we support pub update | 39 d.git('foo.git', [ |
| 39 dir(packagesPath).scheduleDelete(); | 40 d.libDir('foo', 'foo 2'), |
| 40 file('$appPath/pubspec.lock', '').scheduleDelete(); | 41 d.libPubspec('foo', '1.0.0') |
| 42 ]).commit(); |
| 41 | 43 |
| 42 git('foo.git', [ | 44 schedulePub(args: ['update'], |
| 43 libDir('foo', 'foo 2'), | 45 output: new RegExp(r"Dependencies updated!$")); |
| 44 libPubspec('foo', '1.0.0') | |
| 45 ]).scheduleCommit(); | |
| 46 | |
| 47 schedulePub(args: ['install'], | |
| 48 output: new RegExp(r"Dependencies installed!$")); | |
| 49 | 46 |
| 50 // When we download a new version of the git package, we should re-use the | 47 // When we download a new version of the git package, we should re-use the |
| 51 // git/cache directory but create a new git/ directory. | 48 // git/cache directory but create a new git/ directory. |
| 52 dir(cachePath, [ | 49 d.dir(cachePath, [ |
| 53 dir('git', [ | 50 d.dir('git', [ |
| 54 dir('cache', [gitPackageRepoCacheDir('foo')]), | 51 d.dir('cache', [d.gitPackageRepoCacheDir('foo')]), |
| 55 gitPackageRevisionCacheDir('foo'), | 52 d.gitPackageRevisionCacheDir('foo'), |
| 56 gitPackageRevisionCacheDir('foo', 2) | 53 d.gitPackageRevisionCacheDir('foo', 2) |
| 57 ]) | 54 ]) |
| 58 ]).scheduleValidate(); | 55 ]).validate(); |
| 59 | 56 |
| 60 dir(packagesPath, [ | 57 d.dir(packagesPath, [ |
| 61 dir('foo', [ | 58 d.dir('foo', [ |
| 62 file('foo.dart', 'main() => "foo 2";') | 59 d.file('foo.dart', 'main() => "foo 2";') |
| 63 ]) | 60 ]) |
| 64 ]).scheduleValidate(); | 61 ]).validate(); |
| 65 }); | 62 }); |
| 66 } | 63 } |
| OLD | NEW |