aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Gruntfile.js14
-rw-r--r--lib/grunt/plugins.js2
2 files changed, 8 insertions, 8 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index b79467ca..64163525 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -230,13 +230,13 @@ module.exports = function(grunt) {
//alias tasks
- 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', 'Run unit, docs and e2e tests with Karma', ['package','test:unit', 'tests:docs', 'test:e2e']);
+ grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
+ grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
+ grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
+ grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
+ grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
+ grunt.registerTask('test:e2e', 'Run the end to end tests with Karma and keep a test server running in the background', ['connect:testserver', 'tests:end2end']);
grunt.registerTask('test:docgen', ['jasmine-node']);
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
diff --git a/lib/grunt/plugins.js b/lib/grunt/plugins.js
index 33c52abf..363b8698 100644
--- a/lib/grunt/plugins.js
+++ b/lib/grunt/plugins.js
@@ -52,7 +52,7 @@ module.exports = function(grunt) {
});
- grunt.registerMultiTask('tests', 'Run the unit tests with Karma', function(){
+ grunt.registerMultiTask('tests', '**Use `grunt test` instead**', function(){
util.startKarma.call(util, this.data, true, this.async());
});