Skip to content

Commit cc8f1f9

Browse files
committed
feat(testing): package angular2_testing to prepare it for publishing
Closes angular#5682
1 parent cbf7888 commit cc8f1f9

File tree

4 files changed

+44
-13
lines changed

4 files changed

+44
-13
lines changed

gulpfile.js

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -791,7 +791,7 @@ gulp.task('test.transpiler.unittest',
791791
// Make a temporary directory and symlink dartium from there (just for this command)
792792
// so that it can run.
793793
var dartiumTmpdir = path.join(os.tmpdir(), 'dartium' + new Date().getTime().toString());
794-
gulp.task('test.dart.angular2_testing/ci', ['!pubget.angular2_testing.dart'], function(done) {
794+
gulp.task('test.dart.angular2_testing/ci', ['build/pubspec.dart'], function(done) {
795795
runSequence('test.dart.angular2_testing_symlink', 'test.dart.angular2_testing',
796796
sequenceComplete(done));
797797
});
@@ -802,11 +802,8 @@ gulp.task(
802802

803803
gulp.task('test.dart.angular2_testing',
804804
shell.task(['PATH=$PATH:' + dartiumTmpdir + ' pub run test -p dartium'],
805-
{'cwd': 'modules_dart/angular2_testing'}));
805+
{'cwd': 'dist/dart/angular2_testing'}));
806806

807-
gulp.task(
808-
'!pubget.angular2_testing.dart',
809-
pubget.dir(gulp, gulpPlugins, {dir: 'modules_dart/angular2_testing', command: DART_SDK.PUB}));
810807

811808
// -----------------
812809
// Pre-test checks
@@ -865,18 +862,42 @@ gulp.task('test.typings',
865862
// unmodified and directory structure is preserved.
866863
//
867864
// This task is expected to be run after build/tree.dart
868-
gulp.task('build/pure-packages.dart', function() {
869-
var yaml = require('js-yaml');
865+
gulp.task('build/pure-packages.dart', function(done) {
866+
runSequence('build/pure-packages.dart/standalone', 'build/pure-packages.dart/license',
867+
'build/pure-packages.dart/angular2', sequenceComplete(done));
868+
});
870869

870+
871+
gulp.task('build/pure-packages.dart/standalone', function() {
871872
return gulp.src([
872-
'modules_dart/transform/**/*',
873-
'!modules_dart/transform/**/*.proto',
874-
'!modules_dart/transform/pubspec.yaml',
875-
'!modules_dart/transform/**/packages{,/**}',
873+
'modules_dart/**/*',
874+
'!modules_dart/**/*.proto',
875+
'!modules_dart/**/packages{,/**}',
876+
'!modules_dart/payload{,/**}',
877+
'!modules_dart/transform{,/**}',
876878
])
877-
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));
879+
.pipe(gulp.dest(CONFIG.dest.dart));
878880
});
879881

882+
gulp.task('build/pure-packages.dart/license',
883+
function() {
884+
return gulp.src(['LICENSE'])
885+
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2_testing')));
886+
})
887+
888+
889+
gulp.task('build/pure-packages.dart/angular2', function() {
890+
var yaml = require('js-yaml');
891+
892+
return gulp.src([
893+
'modules_dart/transform/**/*',
894+
'!modules_dart/transform/**/*.proto',
895+
'!modules_dart/transform/pubspec.yaml',
896+
'!modules_dart/transform/**/packages{,/**}',
897+
])
898+
.pipe(gulp.dest(path.join(CONFIG.dest.dart, 'angular2')));
899+
});
900+
880901
// Builds all Dart packages, but does not compile them
881902
gulp.task('build/packages.dart', function(done) {
882903
runSequence('lint_protos.dart', 'build/tree.dart', 'build/pure-packages.dart',

modules_dart/angular2_testing/pubspec.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
name: angular2_testing
2+
description: 'Helpers to run unit tests for angular2 components and injectables.'
3+
version: 0.0.0
24
environment:
35
sdk: '>=1.10.0 <2.0.0'
46
dependencies:
7+
# This will be overridden by scripts/publish/pubspec_cleaner
8+
# to point to the current version of Angular2.
59
angular2:
6-
path: ../../dist/dart/angular2
10+
path: '../angular2'
711
dev_dependencies:
812
test: '^0.12.6'
913
transformers:

scripts/publish/pub_publish.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@ publishModule angular2
3737
publishModule benchpress
3838
publishModule benchmarks
3939
publishModule angular2_material
40+
publishModule angular2_testing

scripts/publish/pubspec_cleaner.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,9 @@ doc['authors'] = Object.keys(BASE_PACKAGE_JSON.contributors).map(function(name)
2727
return BASE_PACKAGE_JSON.contributors[name];
2828
});
2929

30+
if (doc['dependencies'] && doc['dependencies']['angular2']) {
31+
delete doc['dependencies']['angular2'];
32+
doc['dependencies']['angular2'] = BASE_PACKAGE_JSON.version;
33+
}
34+
3035
fs.writeFileSync(pubspecFile, yaml.safeDump(doc));

0 commit comments

Comments
 (0)