Build: Rearrange grunt/npm tasks into a build/dist/test pattern

Ref 76df9e4e389d80bff410a9e5f08b848de1d21a2f
Ref bb928bde7e7b85357fef3fedd450b04c03e965d7

Conflicts:
	Gruntfile.js
	package.json

diff --git a/Gruntfile.js b/Gruntfile.js
index 0192cb02702cc65cec0362fa7529ae17e3c97b77..99ae3f0934e2018dc908cba9da1122aa8fbc1bb0 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -120,7 +120,7 @@ module.exports = function( grunt ) {
                },
                watch: {
                        files: [ "<%= jshint.all.src %>" ],
-                       tasks: "dev"
+                       tasks: [ "dev" ]
                },
                uglify: {
                        all: {
@@ -153,11 +153,15 @@ module.exports = function( grunt ) {
        // Integrate jQuery specific tasks
        grunt.loadTasks( "build/tasks" );
 
-       grunt.registerTask( "lint", [ "jshint", "jscs" ] );
+       grunt.registerTask( "lint", [ "jsonlint", "jshint", "jscs" ] );
+
+       // Only defined for master at this time, but kept for cross-branch consistency
+       grunt.registerTask( "test_fast", [] );
+
+       grunt.registerTask( "test", [ "test_fast" ] );
 
        // Short list as a high frequency watch task
-       grunt.registerTask( "dev", [ "build:*:*", "lint" ] );
+       grunt.registerTask( "dev", [ "build:*:*", "lint", "uglify", "dist:*" ] );
 
-       // Default grunt
-       grunt.registerTask( "default", [ "jsonlint", "dev", "uglify", "dist:*", "compare_size" ] );
+       grunt.registerTask( "default", [ "dev", "test_fast", "compare_size" ] );
 };

diff --git a/package.json b/package.json
index c4c61c2018bee391503f1656e5a349348fab041e..d97652b786499335d2433dac4fd2d52c0295b80a 100644 (file)
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
   "scripts": {
     "build": "npm install && grunt",
     "start": "grunt watch",
-    "test": "grunt"
+    "test": "grunt && grunt test"
   },
   "commitplease": {
     "components": [