diff options
author | Dave Methvin <dave.methvin@gmail.com> | 2016-04-10 15:42:44 -0400 |
---|---|---|
committer | Dave Methvin <dave.methvin@gmail.com> | 2016-04-11 13:32:51 -0400 |
commit | e5ffcb0838c894e26f4ff32dfec162cf624d8d7d (patch) | |
tree | 1a57c3a0cbf026dcd98d1f821dc9ed6f848f46d3 /test/data/manipulation | |
parent | 08d73d7f9c7eec2f0abd14d00bf903625728ef17 (diff) | |
download | jquery-e5ffcb0838c894e26f4ff32dfec162cf624d8d7d.tar.gz jquery-e5ffcb0838c894e26f4ff32dfec162cf624d8d7d.zip |
Tests: Refactor testIframe() to make it DRYer and more consistent
Ref gh-3040
Closes gh-3049
Diffstat (limited to 'test/data/manipulation')
-rw-r--r-- | test/data/manipulation/iframe-denied.html | 3 | ||||
-rw-r--r-- | test/data/manipulation/scripts-context.html | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/test/data/manipulation/iframe-denied.html b/test/data/manipulation/iframe-denied.html index 14df26a69..e74872ad0 100644 --- a/test/data/manipulation/iframe-denied.html +++ b/test/data/manipulation/iframe-denied.html @@ -7,6 +7,7 @@ <body> <div id="qunit-fixture"></div> <script src="../../jquery.js"></script> + <script src="../iframeTest.js"></script> <script> var script = document.getElementsByTagName( "script" )[ 0 ], div = document.createElement( "div" ), @@ -25,7 +26,7 @@ error = e; } - window.parent.iframeCallback({ + startIframeTest({ status: success, description: "buildFragment sets the context without throwing an exception" + ( error ? ": " + error : "" ) diff --git a/test/data/manipulation/scripts-context.html b/test/data/manipulation/scripts-context.html index 6958453c5..1b75e3a0a 100644 --- a/test/data/manipulation/scripts-context.html +++ b/test/data/manipulation/scripts-context.html @@ -7,12 +7,9 @@ <body> <div id="qunit-fixture"></div> <script src="../../jquery.js"></script> + <script src="../iframeTest.js"></script> <script> - window.parent.iframeCallback( - window, - document.body, - "<script>window.scriptTest = true;<\x2fscript>" - ); + startIframeTest(); </script> </body> </html> |