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,9 +259,13 @@ this.iframeCallback = undefined;
 QUnit.config.autostart = false;
 this.loadTests = function() {
 	var loadSwarm,
-		url = window.location.search,
-		tests = [
-		"data/testrunner.js",
+		url = window.location.search;
+	url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + "swarmURL=".length ) );
+	loadSwarm = url && url.indexOf("http") === 0;
+
+	// Get testSubproject from testrunner first
+	require([ "data/testrunner.js" ], function( testSubproject ) {
+		var tests = [
 			"unit/core.js",
 			"unit/callbacks.js",
 			"unit/deferred.js",
@@ -281,8 +285,6 @@ this.loadTests = function() {
 			"unit/offset.js",
 			"unit/dimensions.js"
 		];
-	url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + "swarmURL=".length ) );
-	loadSwarm = url && url.indexOf("http") === 0;
 
 		// Ensure load order (to preserve test numbers)
 		(function loadDep() {
@@ -295,15 +297,6 @@ this.loadTests = 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();
-					});
-				} else {
-					QUnit.start();
-				}
-
 					/**
 					 * Run in noConflict mode
 					 */
@@ -317,7 +310,17 @@ this.loadTests = function() {
 					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
-	if ( typeof loadTests !== "undefined" ) {
-		loadTests();
 	// Synchronous-only tests
+	// Other tests are loaded from the test page
+	if ( typeof loadTests !== "undefined" ) {
 		document.write( "<script src='" + path + "test/unit/ready.js'><\x2Fscript>");
 	}