clean tests and gruntfile

Author: clmath

Gruntfile.js

@@ -62,7 +62,7 @@ module.exports = function (grunt) {
 			// Delete files created by the "testBuild" target.
 			testBuild: [
 				"tests/functional/jqueryApp/{bower_components,node_modules,build,tmp}",
-				"tests/jquery.js"	// work around grunt-amd-build bug where it puts files outside of tmp/ dir
+				"tests/jquery.js" // work around grunt-amd-build bug where it puts files outside of tmp/ dir
 			]
 		}
 	});
@@ -76,7 +76,7 @@ module.exports = function (grunt) {
 
 
 	// By default, lint and run all tests.
-	grunt.registerTask("default", ["jsbeautifier", "lineending", "jshint", "intern:remote"]);
+	grunt.registerTask("default", ["jsbeautifier", "lineending", "jshint", "test:remote"]);
 
 	// Just lint
 	grunt.registerTask("lint", ["jsbeautifier", "lineending", "jshint"]);
@@ -116,7 +116,16 @@ module.exports = function (grunt) {
 				opts: {
 					cwd: appRootDir
 				}
-			}, done.bind(null, true));
+			}, finish);
+		}
+
+		function finish(error, buildResults) {
+			if (error !== null) {
+				grunt.log.writeln(buildResults.stdout);
+				done(error);
+				return;
+			}
+			done(true);
 		}
 
 		grunt.util.spawn({
@@ -158,7 +167,7 @@ module.exports = function (grunt) {
 			addReporter("console");
 		}
 
-		// First create the test builds.  These are referenced from the intern tests.
+		// First create the test builds. These are referenced from the intern tests.
 		grunt.task.run("testBuild");
 
 		// Then run the intern tests.

tests/functional/jqueryApp/Gruntfile.js

@@ -11,12 +11,6 @@ module.exports = function (grunt) {
 	var outdir = "./build/";
 	var tmpdir = "./tmp/";
 
-	var common = {
-		options: { banner: "<%= " + outprop + ".header%>" },
-		src: "<%= " + outprop + ".modules.abs %>",
-		dest: outdir + "<%= " + outprop + ".layerPath %>"
-	};
-
 	grunt.initConfig({
 		amdloader: {
 			baseUrl: ".",

tests/intern.js

@@ -31,15 +31,12 @@ define({
 			version: "33",
 			platform: "Windows 7",
 			name: "requirejs-dplugins"
+		}, {
+			browserName: "safari",
+			version: "7",
+			platform: "OS X 10.9",
+			name: "requirejs-dplugins"
 		}
-		
-		// Disabled because environments are often unavailable on sauce and randomly break the build.
-		// {
-			// browserName: "safari",
-			// version: "7",
-			// platform: "OS X 10.9",
-			// name: "requirejs-dplugins"
-		// }
 
 		// Mobile
 		// Disabled because environments are often unavailable on sauce and randomly break the build.
@@ -95,8 +92,8 @@ define({
 	suites: ["requirejs-dplugins/tests/unit/all"],
 
 	// Functional test suite(s) to run in each browser once non-functional tests are completed
-	functionalSuites: [ "requirejs-dplugins/tests/functional/all" ],
+	functionalSuites: ["requirejs-dplugins/tests/functional/all"],
 
 	// A regular expression matching URLs to files that should not be included in code coverage analysis
-	excludeInstrumentation: /(?:requirejs(\/|\\)|dojo|jquery\/|tests|node_modules)/
+	excludeInstrumentation: /(?:requirejs|jquery|tests|node_modules)(?:\/|\\)/
 });

tests/unit/css.js

@@ -11,8 +11,7 @@ define([
 		//		to be able to access requirejs-dplugins sibling directories.
 		//		The last /requirejs-dplugins is here to allow to use css! directly instead of
 		//		requirejs-dplugins/css!
-		baseUrl: "../../../requirejs-dplugins",
-		paths: {dojo: "../dojo"}
+		baseUrl: "../../../requirejs-dplugins"
 	});
 
 	function getStyles() {

tests/unit/i18n.js

@@ -71,7 +71,7 @@ define([
 				assert.strictEqual(test.bundleB, "Fr from Layer Bundle B", hint);
 			}));
 		},
-		"fr-fr": function () {
+		"fr-fr (404 fr-fr expected)": function () {
 			var dfd = this.async();
 			var hint = "The text should come from the best layer (ie. fr)";
 
@@ -89,7 +89,7 @@ define([
 				assert.strictEqual(test.bundleB, "En from Layer Bundle B", hint);
 			}));
 		},
-		"it": function () {
+		"it (404 it expected)": function () {
 			var dfd = this.async();
 			var hint = "The root layer should be used when a locale does not exist";
 
@@ -262,7 +262,7 @@ define([
 				assert.strictEqual(test.bundleD, "Fr from Bundle D", hintBundle);
 			}));
 		},
-		"fr-fr": function () {
+		"fr-fr (404 fr-fr expected)": function () {
 			var dfd = this.async();
 			var hintLayer = "The layer should not be enhanced";
 			var hintBundle = "The best match should be found";
@@ -309,7 +309,7 @@ define([
 				assert.strictEqual(test.bundleD, "Fr from Bundle D", hintBundle);
 			}));
 		},
-		"fr-fr": function () {
+		"fr-fr (404 fr-fr expected)": function () {
 			var dfd = this.async();
 			var hintLayer = "The layer should be enhanced";
 			var hintBundle = "The best match should be found";