Tests: Use QUnit URL parameter parsing

(cherry picked from commit f23a64d745)
This commit is contained in:
Richard Gibson 2015-09-08 16:03:10 -04:00
parent 5fb689debc
commit fb98ea49b6

View File

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