diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2014-12-09 15:39:24 -0500 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2014-12-09 15:39:24 -0500 |
| commit | 6051609df35ef5e478c79c76534c03e4b46100bf (patch) | |
| tree | 65da2705750c520dbdea933aacce39887d482c2a /test/data | |
| parent | 58c24608210c9a9a264a38746628ebc26823f59b (diff) | |
| download | jquery-6051609df35ef5e478c79c76534c03e4b46100bf.tar.gz jquery-6051609df35ef5e478c79c76534c03e4b46100bf.zip | |
Build: fix tests in AMD mode
Diffstat (limited to 'test/data')
| -rw-r--r-- | test/data/testinit.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/data/testinit.js b/test/data/testinit.js index cb7ddf3ca..9b3caba93 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -301,7 +301,9 @@ this.loadTests = function() { /** * Run in noConflict mode */ - jQuery.noConflict(); + if (jQuery.noConflict) { + jQuery.noConflict(); + } // Load the TestSwarm listener if swarmURL is in the address. if ( loadSwarm ) { |