diff options
| author | Timmy Willison <timmywillisn@gmail.com> | 2014-12-09 15:39:24 -0500 |
|---|---|---|
| committer | Timmy Willison <timmywillisn@gmail.com> | 2014-12-10 10:18:59 -0500 |
| commit | 57652eecd96e47f39725671ffce45bfa01493380 (patch) | |
| tree | f5d839816ade59fbdb54d6003a266c4c2c3a88e3 /test/data | |
| parent | 828a718aa028ba6cde7b4076d94b10ef0853f9ee (diff) | |
| download | jquery-57652eecd96e47f39725671ffce45bfa01493380.tar.gz jquery-57652eecd96e47f39725671ffce45bfa01493380.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 9419986fd..5afc2e370 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -304,7 +304,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 ) { |