Skip to content
Permalink
Browse files

Use requirejs to load the testswarm inject script

  • Loading branch information
timmywil committed Sep 6, 2013
1 parent 1a25f21 commit 6535cc599e4d7ccb80cb1d83f20344d71702516b
Showing with 15 additions and 16 deletions.
  1. +0 −14 test/data/testrunner.js
  2. +15 −2 test/index.html
@@ -379,17 +379,3 @@ QUnit.config.testTimeout = 20 * 1000; // 20 seconds

// Enforce an "expect" argument or expect() call in all test bodies.
QUnit.config.requireExpects = true;

/**
* Load the TestSwarm listener if swarmURL is in the address.
*/
(function() {
var url = window.location.search;
url = decodeURIComponent( url.slice( url.indexOf("swarmURL=") + "swarmURL=".length ) );

if ( !url || url.indexOf("http") !== 0 ) {
return;
}

document.write("<scr" + "ipt src='http://swarm.jquery.org/js/inject.js?" + (new Date()).getTime() + "'></scr" + "ipt>");
})();
@@ -19,7 +19,9 @@
// Tests are always loaded async
QUnit.config.autostart = false;
function loadTests() {
var tests = [
var loadSwarm,
url = window.location.search,
tests = [
"data/testrunner.js",
"unit/core.js",
"unit/callbacks.js",
@@ -40,6 +42,9 @@
"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() {
var dep = tests.shift();
@@ -50,7 +55,15 @@
testSubproject( "Sizzle", "../bower_components/sizzle/test/", /^unit\/.*\.js$/, function() {
// Call load to build module filter select element
QUnit.load();
QUnit.start();
// 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();
}
});
}
})();

0 comments on commit 6535cc5

Please sign in to comment.
You can’t perform that action at this time.