From f23a64d745759d358d423ba0557e8f74d65f76cc Mon Sep 17 00:00:00 2001
From: Richard Gibson <richard.gibson@gmail.com>
Date: Tue, 8 Sep 2015 16:03:10 -0400
Subject: [PATCH] Tests: Use QUnit URL parameter parsing

---
 test/data/testinit.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/test/data/testinit.js b/test/data/testinit.js
index 68de5e336..903bc9c34 100644
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -269,12 +269,9 @@ this.iframeCallback = undefined;
 // Tests are always loaded async
 QUnit.config.autostart = false;
 this.loadTests = function() {
-	var loadSwarm,
-		url = window.location.search,
-		basicTests = jQuery.inArray( "module=basic", url.substring( 1 ).split( "&" ) ) > -1;
-
-	url = decodeURIComponent( url.slice( url.indexOf( "swarmURL=" ) + "swarmURL=".length ) );
-	loadSwarm = url && url.indexOf( "http" ) === 0;
+	// Leverage QUnit URL parsing to detect testSwarm environment and "basic" testing mode
+	var loadSwarm = ( QUnit.urlParams[ "swarmURL" ] + "" ).indexOf( "http" ) === 0,
+		basicTests = ( QUnit.urlParams[ "module" ] + "" ) === "basic";
 
 	// Get testSubproject from testrunner first
 	require( [ "data/testrunner.js" ], function() {