Convert testrunner to an AMD module and ensure jQuery is on the page when...

Convert testrunner to an AMD module and ensure jQuery is on the page when executing the testrunner (another race condition amplified by swarm)

Conflicts:
	test/data/testinit.js
	test/data/testrunner.js

test/.jshintrc

@@ -22,6 +22,7 @@
 
 	"globals": {
 		"require": false,
+		"define": false,
 		"DOMParser": false,
 		"QUnit": false,
 		"ok": false,

test/data/testinit.js

@@ -259,65 +259,68 @@ this.iframeCallback = undefined;
 QUnit.config.autostart = false;
 this.loadTests = function() {
 	var loadSwarm,
-		url = window.location.search,
-		tests = [
-		"data/testrunner.js",
-		"unit/core.js",
-		"unit/callbacks.js",
-		"unit/deferred.js",
-		"unit/support.js",
-		"unit/data.js",
-		"unit/queue.js",
-		"unit/attributes.js",
-		"unit/event.js",
-		"unit/selector.js",
-		"unit/traversing.js",
-		"unit/manipulation.js",
-		"unit/wrap.js",
-		"unit/css.js",
-		"unit/serialize.js",
-		"unit/ajax.js",
-		"unit/effects.js",
-		"unit/offset.js",
-		"unit/dimensions.js"
-	];
+		url = window.location.search;
 	url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + "swarmURL=".length ) );
 	loadSwarm = url && url.indexOf("http") === 0;
 
-	// Ensure load order (to preserve test numbers)
-	(function loadDep() {
-		var dep = tests.shift();
-		if ( dep ) {
-			require( [ dep ], loadDep );
-		} else {
-			// Subproject tests must be last because they replace our test fixture
-			testSubproject( "Sizzle", "../bower_components/sizzle/test/", /^unit\/.*\.js$/, function() {
-				// Call load to build module filter select element
-				QUnit.load();
-
-				// Load the TestSwarm listener if swarmURL is in the address.
-				if ( loadSwarm ) {
-					require( [ "http://swarm.jquery.org/js/inject.js?" + (new Date()).getTime() ], function() {
-						QUnit.start();
+	// Get testSubproject from testrunner first
+	require([ "data/testrunner.js" ], function( testSubproject ) {
+		var tests = [
+			"unit/core.js",
+			"unit/callbacks.js",
+			"unit/deferred.js",
+			"unit/support.js",
+			"unit/data.js",
+			"unit/queue.js",
+			"unit/attributes.js",
+			"unit/event.js",
+			"unit/selector.js",
+			"unit/traversing.js",
+			"unit/manipulation.js",
+			"unit/wrap.js",
+			"unit/css.js",
+			"unit/serialize.js",
+			"unit/ajax.js",
+			"unit/effects.js",
+			"unit/offset.js",
+			"unit/dimensions.js"
+		];
+
+		// Ensure load order (to preserve test numbers)
+		(function loadDep() {
+			var dep = tests.shift();
+			if ( dep ) {
+				require( [ dep ], loadDep );
+			} else {
+				// Subproject tests must be last because they replace our test fixture
+				testSubproject( "Sizzle", "../bower_components/sizzle/test/", /^unit\/.*\.js$/, function() {
+					// Call load to build module filter select element
+					QUnit.load();
+
+					/**
+					 * Run in noConflict mode
+					 */
+					jQuery.noConflict();
+
+					// Expose Sizzle for Sizzle's selector tests
+					// We remove Sizzle's globalization in jQuery
+					window.Sizzle = window.Sizzle || jQuery.find;
+
+					// For checking globals pollution despite auto-created globals in various environments
+					supportjQuery.each( [ jQuery.expando, "getInterface", "Packages", "java", "netscape" ], function( i, name ) {
+						window[ name ] = window[ name ];
 					});
-				} else {
-					QUnit.start();
-				}
-
-				/**
-				 * Run in noConflict mode
-				 */
-				jQuery.noConflict();
 
-				// Expose Sizzle for Sizzle's selector tests
-				// We remove Sizzle's globalization in jQuery
-				window.Sizzle = window.Sizzle || jQuery.find;
-
-				// For checking globals pollution despite auto-created globals in various environments
-				supportjQuery.each( [ jQuery.expando, "getInterface", "Packages", "java", "netscape" ], function( i, name ) {
-					window[ name ] = window[ name ];
+					// Load the TestSwarm listener if swarmURL is in the address.
+					if ( loadSwarm ) {
+						require( [ "http://swarm.jquery.org/js/inject.js?" + (new Date()).getTime() ], function() {
+							QUnit.start();
+						});
+					} else {
+						QUnit.start();
+					}
 				});
-			});
-		}
-	})();
+			}
+		})();
+	});
 };

test/index.html

@@ -29,6 +29,13 @@
 		).replace(/\w+/g, function(n) {
 			document.createElement(n);
 		});
+
+		// Load tests if they have not been loaded
+		// This is in a different script tag to ensure that
+		// jQuery is on the page when the testrunner executes
+		if ( !QUnit.urlParams.amd ) {
+			loadTests();
+		}
 	</script>
 </head>
 

test/jquery.js

@@ -54,11 +54,9 @@
 	// Load jQuery
 	document.write( "<script id='jquery-js' src='" + path + src + "'><\x2Fscript>" );
 
-	// Load tests if available
-	// These can be loaded async as QUnit won't start until finished
+	// Synchronous-only tests
+	// Other tests are loaded from the test page
 	if ( typeof loadTests !== "undefined" ) {
-		loadTests();
-		// Synchronous-only tests
 		document.write( "<script src='" + path + "test/unit/ready.js'><\x2Fscript>");
 	}