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:23:45 -0400 |
| commit | be1e4eee602b64c654197276aa3edd77d0a35c6d (patch) | |
| tree | 420c522096f30baec3948a07dfb3d011df22448c /test/jquery.js | |
| parent | d14904d0831efaeb2c290aef0dcaaec48c13be03 (diff) | |
| download | jquery-be1e4eee602b64c654197276aa3edd77d0a35c6d.tar.gz jquery-be1e4eee602b64c654197276aa3edd77d0a35c6d.zip | |
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
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>"); } |