Tests: Output tests reports in _tests & .gitignore it

Fixes gh-7029
jquery · 5f34b7718746969a922dfb982dca54978098dd76 · gseguin committed Jan 30, 2014 · Jan 30, 2014 · 5f34b77
1 parent 468d221
commit 5f34b7718746969a922dfb982dca54978098dd76
Unified Split

Showing with 17 additions and 6 deletions.

+3 −1 .gitignore

+13 −4 Gruntfile.js

+1 −1 package.json
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,8 @@ branches
 # node build dependencies
 node_modules
 
+# tests output
+_tests/
+
 # phantom junit output
 build/test-results/
-
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -647,8 +647,8 @@ module.exports = function( grunt ) {
 						"!js/requirejs.config.js"
 					],
 					instrumentedFiles: "temp/",
-					htmlReport: "build/report/coverage",
-					lcovReport: "build/report/lcov",
+					htmlReport: "_tests/reports/coverage",
+					lcovReport: "_tests/reports/lcov",
 					linesThresholdPct: 0
 				}
 			},
@@ -760,7 +760,7 @@ module.exports = function( grunt ) {
 			all: {
 
 				// LCOV coverage file relevant to every target
-				src: "build/report/lcov/lcov.info"
+				src: "_tests/reports/lcov/lcov.info"
 			}
 		},
 
@@ -834,6 +834,7 @@ module.exports = function( grunt ) {
 			dist: [ dist ],
             git: [ path.join( dist, "git" ) ],
 			tmp: [ "<%= dirs.tmp %>" ],
+			testsOutput: [ "_tests" ],
 			"googleCDN": [ "<%= dirs.cdn.google %>" ],
 			"jqueryCDN": [ "<%= dirs.cdn.jquery %>" ]
 		}
@@ -889,7 +890,15 @@ module.exports = function( grunt ) {
 
 	grunt.registerTask( "updateDependencies", [ "bowercopy" ] );
 
-	grunt.registerTask( "test", [ "jshint", "config:fetchHeadHash", "js:release", "connect", "qunit:http" ] );
+	grunt.registerTask( "test",
+		[
+			"clean:testsOutput",
+			"jshint",
+			"config:fetchHeadHash",
+			"js:release",
+			"connect", "qunit:http"
+		]
+	);
 	grunt.registerTask( "test:ci", [ "qunit_junit", "connect", "qunit:http" ] );
 
 	// Default grunt
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
 		"node": ">= 0.8.0"
 	},
 	"scripts": {
-		"ci": "grunt test && grunt coveralls",
+		"ci": "grunt test coveralls",
 		"test": "grunt test",
 		"lint": "grunt jshint"
 	},