diff options
| author | Richard Gibson <richard.gibson@gmail.com> | 2013-09-03 09:55:32 -0400 |
|---|---|---|
| committer | Richard Gibson <richard.gibson@gmail.com> | 2013-09-03 11:13:20 -0400 |
| commit | 6a6604b7856494d2aa9bc8adb2d77798dd19e480 (patch) | |
| tree | 18f88f825566461176e8ce6b1f83208953a2c4d2 /test/data/testinit.js | |
| parent | ceb5b4c9a30f47bcec2380f972ce09cfea532f8b (diff) | |
| download | jquery-6a6604b7856494d2aa9bc8adb2d77798dd19e480.tar.gz jquery-6a6604b7856494d2aa9bc8adb2d77798dd19e480.zip | |
No ticket: Hide the testing-support jQuery from tests
(cherry picked from commit 0c185209233f4c15e57c6a24e8f81b27dd26db59)
Conflicts:
test/data/testrunner.js
Diffstat (limited to 'test/data/testinit.js')
| -rw-r--r-- | test/data/testinit.js | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/data/testinit.js b/test/data/testinit.js index 30136de36..8cb57d5f5 100644 --- a/test/data/testinit.js +++ b/test/data/testinit.js @@ -1,17 +1,17 @@ /*jshint multistr:true, quotmark:false */ -var fireNative, - originaljQuery = this.jQuery || "jQuery", - original$ = this.$ || "$", +var fireNative, originaljQuery, original$, + supportjQuery = this.jQuery, // see RFC 2606 externalHost = "example.com"; this.hasPHP = true; this.isLocal = window.location.protocol === "file:"; -// For testing .noConflict() -this.jQuery = originaljQuery; -this.$ = original$; +// Setup global variables before loading jQuery for testing .noConflict() +supportjQuery.noConflict( true ); +originaljQuery = this.jQuery = undefined; +original$ = this.$ = "replaced"; /** * Returns an array of elements with the given IDs @@ -253,3 +253,4 @@ this.testIframeWithCallback = function( title, fileName, func ) { ).appendTo( "body" ); }); }; +this.iframeCallback = undefined; |