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/index.html | |
| 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/index.html')
| -rw-r--r-- | test/index.html | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/test/index.html b/test/index.html index 070624036..1b5e33a3b 100644 --- a/test/index.html +++ b/test/index.html @@ -29,6 +29,13 @@ ).replace(/\w+/g, function(n) { document.createElement(n); }); + + // Load tests if they have not been loaded + // This is in a different script tag to ensure that + // jQuery is on the page when the testrunner executes + if ( !QUnit.urlParams.amd ) { + loadTests(); + } </script> </head> |