diff options
author | Timmy Willison <timmywillisn@gmail.com> | 2013-09-06 17:11:04 -0400 |
---|---|---|
committer | Timmy Willison <timmywillisn@gmail.com> | 2013-09-06 17:11:32 -0400 |
commit | 5093b89f08aa4565d1987666d998d16e2e3b6f4a (patch) | |
tree | 20f0eb6cf978155141e1aea1a8de37ce9be6eaf8 /test/jquery.js | |
parent | 4ca5a0c6913ce7e56654b7a795d17a1cc644a115 (diff) | |
download | jquery-5093b89f08aa4565d1987666d998d16e2e3b6f4a.tar.gz jquery-5093b89f08aa4565d1987666d998d16e2e3b6f4a.zip |
Convert testrunner to an AMD module and ensure jQuery is on the page when executing the testrunner (another race condition amplified by swarm)
Diffstat (limited to 'test/jquery.js')
-rw-r--r-- | test/jquery.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/jquery.js b/test/jquery.js index 3c937d598..fd0be6759 100644 --- a/test/jquery.js +++ b/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>"); } |