Skip to content
This repository has been archived by the owner on Dec 1, 2023. It is now read-only.

Commit

Permalink
chore(travis): fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
mgcrea committed May 15, 2015
1 parent 65f5b0c commit 33a34d2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
20 changes: 9 additions & 11 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ gulp.task('karma:unit', gulp.series('ng:test/templates', function() {
process.exit(code);
});
}));
gulp.task('karma:server', ['ng:test/templates'], function() {
gulp.task('karma:server', gulp.series('ng:test/templates', function karmaServer() {
karma.start({
configFile: path.join(__dirname, 'test/karma.conf.js'),
browsers: ['PhantomJS'],
Expand All @@ -71,9 +71,9 @@ gulp.task('karma:server', ['ng:test/templates'], function() {
gutil.log('Karma has exited with ' + code);
process.exit(code);
});
});
}));
// codeclimate-test-reporter
gulp.task('karma:travis', ['ng:test/templates'], function() {
gulp.task('karma:travis', gulp.series('ng:test/templates', function karmaTravis() {
karma.start({
configFile: path.join(__dirname, 'test/karma.conf.js'),
browsers: ['PhantomJS'],
Expand All @@ -88,8 +88,8 @@ gulp.task('karma:travis', ['ng:test/templates'], function() {
// process.exit(code);
// });
});
});
gulp.task('karma:travis~1.2.0', ['ng:test/templates'], function() {
}));
gulp.task('karma:travis~1.2.0', gulp.series('ng:test/templates', function karmaTravis120() {
karma.start({
configFile: path.join(__dirname, 'test/~1.2.0/karma.conf.js'),
browsers: ['PhantomJS'],
Expand All @@ -99,17 +99,15 @@ gulp.task('karma:travis~1.2.0', ['ng:test/templates'], function() {
gutil.log('Karma has exited with ' + code);
process.exit(code);
});
});
}));

/*
gulp.task('test', gulp.series('ng:test/clean', 'ng:test/templates', ['jshint', 'karma:unit']));
gulp.task('test', gulp.series('ng:test/templates', gulp.parallel('jshint', 'karma:unit')));
gulp.task('test:timezone', function() {
// parse command line argument for optional timezone
// invoke like this:
// gulp test:timezone --Europe/Paris
var timezone = process.argv[3] || '';
testTimezone = timezone.replace(/-/g, '');
return gulp.series('ng:test/clean', 'ng:test/templates', ['jshint', 'karma:unit']);
return gulp.series('ng:test/templates', gulp.parallel('jshint', 'karma:unit'));
});
gulp.task('test:server', gulp.series('ng:test/clean', 'ng:test/templates', 'karma:server'));
*/
gulp.task('test:server', gulp.series('ng:test/templates', 'karma:server'));
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"karma-phantomjs-launcher": "^0.1.4",
"karma-sauce-launcher": "^0.2.11",
"ng-factory": "^1.0",
"undertaker-lib-tasks": "^0.3"
"undertaker-lib-tasks": "^0.3.1"
},
"engines": {
"node": "^0.10"
Expand Down

0 comments on commit 33a34d2

Please sign in to comment.