Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-10 07:44:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(grunt): ensure all dependent tasks are called for all test task

Browse source 
Close #3421
This commit is contained in:
Matias Niemelä 2013-08-01 16:14:52 -04:00 committed by Igor Minar
parent f80730f497
commit 05b41eedce
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
Gruntfile.js
View file

@ -31,11 +31,11 @@ module.exports = function(grunt) {
stream: true stream: true
}, },
tasks: [ tasks: [
util.parallelTask('test:docs'), util.parallelTask('tests:docs'),
util.parallelTask('test:modules'), util.parallelTask('tests:modules'),
util.parallelTask('test:jquery'), util.parallelTask('tests:jquery'),
util.parallelTask('test:jqlite'), util.parallelTask('tests:jqlite'),
util.parallelTask('test:e2e') util.parallelTask('tests:end2end')
] ]
} }
}, },
@ -80,7 +80,7 @@ module.exports = function(grunt) {
}, },
test: { tests: {
jqlite: 'karma-jqlite.conf.js', jqlite: 'karma-jqlite.conf.js',
jquery: 'karma-jquery.conf.js', jquery: 'karma-jquery.conf.js',
docs: 'karma-docs.conf.js', docs: 'karma-docs.conf.js',
@ -94,7 +94,7 @@ module.exports = function(grunt) {
jqlite: 'karma-jqlite.conf.js', jqlite: 'karma-jqlite.conf.js',
jquery: 'karma-jquery.conf.js', jquery: 'karma-jquery.conf.js',
modules: 'karma-modules.conf.js', modules: 'karma-modules.conf.js',
docs: 'karma-docs.conf.js', docs: 'karma-docs.conf.js'
}, },
@ -230,10 +230,16 @@ module.exports = function(grunt) {
//alias tasks //alias tasks
grunt.registerTask('test:unit', ['test:jqlite', 'test:jquery', 'test:modules']); grunt.registerTask('test', ['package','test:unit', 'tests:docs', 'test:e2e']);
grunt.registerTask('test:jqlite', ['tests:jqlite']);
grunt.registerTask('test:jquery', ['tests:jquery']);
grunt.registerTask('test:modules', ['tests:modules']);
grunt.registerTask('test:docs', ['package', 'tests:docs']);
grunt.registerTask('test:unit', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
grunt.registerTask('test:e2e', ['connect:testserver', 'tests:end2end']);
grunt.registerTask('test:docgen', ['jasmine-node']); grunt.registerTask('test:docgen', ['jasmine-node']);
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']); grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
grunt.registerTask('test:e2e', ['connect:testserver', 'test:end2end']);
grunt.registerTask('webserver', ['connect:devserver']); grunt.registerTask('webserver', ['connect:devserver']);
grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']); grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict']); grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict']);

2
lib/grunt/plugins.js
View file

@ -52,7 +52,7 @@ module.exports = function(grunt) {
}); });
grunt.registerMultiTask('test', 'Run the unit tests with Karma', function(){ grunt.registerMultiTask('tests', 'Run the unit tests with Karma', function(){
util.startKarma.call(util, this.data, true, this.async()); util.startKarma.call(util, this.data, true, this.async());
}); });