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/unit/core.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/unit/core.js')
| -rw-r--r-- | test/unit/core.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/unit/core.js b/test/unit/core.js index e57d53334..cdc4c6528 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -353,8 +353,9 @@ asyncTest("isPlainObject", function() { ok( pass, "Does not throw exceptions on host objects" ); // Objects from other windows should be matched - window.iframeCallback = function( otherObject, detail ) { - window.iframeCallback = undefined; + Globals.register("iframeDone"); + window.iframeDone = function( otherObject, detail ) { + window.iframeDone = undefined; iframe.parentNode.removeChild( iframe ); ok( jQuery.isPlainObject(new otherObject()), "new otherObject" + ( detail ? " - " + detail : "" ) ); start(); @@ -364,7 +365,7 @@ asyncTest("isPlainObject", function() { iframe = jQuery("#qunit-fixture")[0].appendChild( document.createElement("iframe") ); doc = iframe.contentDocument || iframe.contentWindow.document; doc.open(); - doc.write("<body onload='window.parent.iframeCallback(Object);'>"); + doc.write("<body onload='window.parent.iframeDone(Object);'>"); doc.close(); } catch(e) { window.iframeDone( Object, "iframes not supported" ); |