honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(windows): fix !test.unit.js/karma-run and !test.unit.dart/karma-run tasks 

Closes #2431
This commit is contained in:
Marc Laval 2015-06-09 13:44:42 +02:00
parent f04b606bb0
commit 37f8fd6551
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gulpfile.js
View File

@ -351,6 +351,17 @@ gulp.task('docs/angular.io', function() {
// ------------------ // ------------------
// CI tests suites // CI tests suites
function runKarma(configFile, done) {
var cmd = process.platform === 'win32' ? 'node_modules\\.bin\\karma run ' :
'node node_modules/.bin/karma run ';
cmd += configFile;
exec(cmd, function(e, stdout) {
// ignore errors, we don't want to fail the build in the interactive (non-ci) mode
// karma server will print all test failures
done();
});
}
gulp.task('test.js', function(done) { gulp.task('test.js', function(done) {
runSequence('test.unit.tools/ci', 'test.transpiler.unittest', 'docs/test', 'test.unit.js/ci', runSequence('test.unit.tools/ci', 'test.transpiler.unittest', 'docs/test', 'test.unit.js/ci',
'test.unit.cjs/ci', sequenceComplete(done)); 'test.unit.cjs/ci', sequenceComplete(done));
@ -396,11 +407,7 @@ gulp.task('!test.unit.js/karma-server', function() {
gulp.task('!test.unit.js/karma-run', function(done) { gulp.task('!test.unit.js/karma-run', function(done) {
// run the run command in a new process to avoid duplicate logging by both server and runner from // run the run command in a new process to avoid duplicate logging by both server and runner from
// a single process // a single process
exec('node node_modules/.bin/karma run karma-js.conf.js', function(e, stdout) { runKarma('karma-js.conf.js', done);
// ignore errors, we don't want to fail the build in the interactive (non-ci) mode
// karma server will print all test failures
done();
});
}); });
@ -430,11 +437,7 @@ gulp.task('test.unit.dart', function (done) {
gulp.task('!test.unit.dart/karma-run', function (done) { gulp.task('!test.unit.dart/karma-run', function (done) {
// run the run command in a new process to avoid duplicate logging by both server and runner from // run the run command in a new process to avoid duplicate logging by both server and runner from
// a single process // a single process
exec('node node_modules/.bin/karma run karma-dart.conf.js', function(e, stdout) { runKarma('karma-dart.conf.js', done);
// ignore errors, we don't want to fail the build in the interactive (non-ci) mode
// karma server will print all test failures
done();
});
}); });