cargdev/angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(gulp): use the new karma.Server api

Browse Source 
Closes #4375
This commit is contained in:
Igor Minar 2015-09-26 20:26:02 -07:00
parent e21bf120b9
commit 758efba34b
1 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
gulpfile.js
View File

@ -610,21 +610,21 @@ gulp.task('test.unit.js', ['build.js.dev'], function (done) {
gulp.task('test.unit.js.sauce', ['build.js.dev'], function (done) { gulp.task('test.unit.js.sauce', ['build.js.dev'], function (done) {
var browserConf = getBrowsersFromCLI(); var browserConf = getBrowsersFromCLI();
if (browserConf.isSauce) { if (browserConf.isSauce) {
karma.server.start({ new karma.Server({
configFile: __dirname + '/karma-js.conf.js', configFile: __dirname + '/karma-js.conf.js',
singleRun: true, singleRun: true,
browserNoActivityTimeout: 240000, browserNoActivityTimeout: 240000,
captureTimeout: 120000, captureTimeout: 120000,
reporters: ['dots'], reporters: ['dots'],
browsers: browserConf.browsersToRun}, browsers: browserConf.browsersToRun},
function(err) {done(); process.exit(err ? 1 : 0);}); function(err) {done(); process.exit(err ? 1 : 0);}).start();
} else { } else {
throw new Error('ERROR: no Saucelabs browsers provided, add them with the --browsers option'); throw new Error('ERROR: no Saucelabs browsers provided, add them with the --browsers option');
} }
}); });
gulp.task('!test.unit.js/karma-server', function() { gulp.task('!test.unit.js/karma-server', function() {
karma.server.start({configFile: __dirname + '/karma-js.conf.js', reporters: 'dots'}); new karma.Server({configFile: __dirname + '/karma-js.conf.js', reporters: 'dots'}).start();
}); });
@ -647,7 +647,11 @@ gulp.task('test.unit.router', function (done) {
}); });
gulp.task('!test.unit.router/karma-server', function() { gulp.task('!test.unit.router/karma-server', function() {
karma.server.start({configFile: __dirname + '/modules/angular1_router/karma-router.conf.js'}); new karma.Server({
configFile: __dirname + '/modules/angular1_router/karma-router.conf.js',
reporters: 'dots'
}
).start();
}); });
@ -697,33 +701,57 @@ gulp.task('!test.unit.dart/karma-run', function (done) {
gulp.task('!test.unit.dart/karma-server', function() { gulp.task('!test.unit.dart/karma-server', function() {
karma.server.start({configFile: __dirname + '/karma-dart.conf.js', reporters: 'dots'}); new karma.Server({configFile: __dirname + '/karma-dart.conf.js', reporters: 'dots'}).start();
}); });
gulp.task('test.unit.router/ci', function (done) { gulp.task('test.unit.router/ci', function (done) {
var browserConf = getBrowsersFromCLI(); var browserConf = getBrowsersFromCLI();
karma.server.start({configFile: __dirname + '/modules/angular1_router/karma-router.conf.js', new karma.Server({
singleRun: true, reporters: ['dots'], browsers: browserConf.browsersToRun}, done); configFile: __dirname + '/modules/angular1_router/karma-router.conf.js',
singleRun: true,
reporters: ['dots'],
browsers: browserConf.browsersToRun
},
done
).start();
}); });
gulp.task('test.unit.js/ci', function (done) { gulp.task('test.unit.js/ci', function (done) {
var browserConf = getBrowsersFromCLI(); var browserConf = getBrowsersFromCLI();
karma.server.start({configFile: __dirname + '/karma-js.conf.js', new karma.Server({
singleRun: true, reporters: ['dots'], browsers: browserConf.browsersToRun}, done); configFile: __dirname + '/karma-js.conf.js',
singleRun: true,
reporters: ['dots'],
browsers: browserConf.browsersToRun
},
done
).start();
}); });
gulp.task('test.unit.js.sauce/ci', function (done) { gulp.task('test.unit.js.sauce/ci', function (done) {
karma.server.start({configFile: __dirname + '/karma-js.conf.js', new karma.Server({
singleRun: true, browserNoActivityTimeout: 240000, captureTimeout: 120000, configFile: __dirname + '/karma-js.conf.js',
reporters: ['dots', 'saucelabs'], browsers: sauceConf.aliases.CI}, singleRun: true,
function(err) {done(); process.exit(err ? 1 : 0);}); browserNoActivityTimeout: 240000,
captureTimeout: 120000,
reporters: ['dots', 'saucelabs'],
browsers: sauceConf.aliases.CI
},
function(err) {done(); process.exit(err ? 1 : 0);}
).start();
}); });
gulp.task('test.unit.dart/ci', function (done) { gulp.task('test.unit.dart/ci', function (done) {
var browserConf = getBrowsersFromCLI(); var browserConf = getBrowsersFromCLI();
karma.server.start({configFile: __dirname + '/karma-dart.conf.js', new karma.Server({
singleRun: true, reporters: ['dots'], browsers: browserConf.browsersToRun}, done); configFile: __dirname + '/karma-dart.conf.js',
singleRun: true,
reporters: ['dots'],
browsers: browserConf.browsersToRun
},
done
).start();
}); });