Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 05b41ee

Browse files
matskoIgorMinar
authored andcommitted
fix(grunt): ensure all dependent tasks are called for all test task
Close #3421
1 parent f80730f commit 05b41ee

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

Gruntfile.js

+15-9
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ module.exports = function(grunt) {
3131
stream: true
3232
},
3333
tasks: [
34-
util.parallelTask('test:docs'),
35-
util.parallelTask('test:modules'),
36-
util.parallelTask('test:jquery'),
37-
util.parallelTask('test:jqlite'),
38-
util.parallelTask('test:e2e')
34+
util.parallelTask('tests:docs'),
35+
util.parallelTask('tests:modules'),
36+
util.parallelTask('tests:jquery'),
37+
util.parallelTask('tests:jqlite'),
38+
util.parallelTask('tests:end2end')
3939
]
4040
}
4141
},
@@ -80,7 +80,7 @@ module.exports = function(grunt) {
8080
},
8181

8282

83-
test: {
83+
tests: {
8484
jqlite: 'karma-jqlite.conf.js',
8585
jquery: 'karma-jquery.conf.js',
8686
docs: 'karma-docs.conf.js',
@@ -94,7 +94,7 @@ module.exports = function(grunt) {
9494
jqlite: 'karma-jqlite.conf.js',
9595
jquery: 'karma-jquery.conf.js',
9696
modules: 'karma-modules.conf.js',
97-
docs: 'karma-docs.conf.js',
97+
docs: 'karma-docs.conf.js'
9898
},
9999

100100

@@ -230,10 +230,16 @@ module.exports = function(grunt) {
230230

231231

232232
//alias tasks
233-
grunt.registerTask('test:unit', ['test:jqlite', 'test:jquery', 'test:modules']);
233+
grunt.registerTask('test', ['package','test:unit', 'tests:docs', 'test:e2e']);
234+
grunt.registerTask('test:jqlite', ['tests:jqlite']);
235+
grunt.registerTask('test:jquery', ['tests:jquery']);
236+
grunt.registerTask('test:modules', ['tests:modules']);
237+
grunt.registerTask('test:docs', ['package', 'tests:docs']);
238+
grunt.registerTask('test:unit', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
239+
grunt.registerTask('test:e2e', ['connect:testserver', 'tests:end2end']);
234240
grunt.registerTask('test:docgen', ['jasmine-node']);
241+
235242
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
236-
grunt.registerTask('test:e2e', ['connect:testserver', 'test:end2end']);
237243
grunt.registerTask('webserver', ['connect:devserver']);
238244
grunt.registerTask('package', ['bower','clean', 'buildall', 'minall', 'collect-errors', 'docs', 'copy', 'write', 'compress']);
239245
grunt.registerTask('ci-checks', ['ddescribe-iit', 'merge-conflict']);

lib/grunt/plugins.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
5252
});
5353

5454

55-
grunt.registerMultiTask('test', 'Run the unit tests with Karma', function(){
55+
grunt.registerMultiTask('tests', 'Run the unit tests with Karma', function(){
5656
util.startKarma.call(util, this.data, true, this.async());
5757
});
5858

0 commit comments

Comments
 (0)