From e5ffcb0838c894e26f4ff32dfec162cf624d8d7d Mon Sep 17 00:00:00 2001
From: Dave Methvin <dave.methvin@gmail.com>
Date: Sun, 10 Apr 2016 15:42:44 -0400
Subject: [PATCH] Tests: Refactor testIframe() to make it DRYer and more
 consistent

Ref gh-3040
Closes gh-3049
---
 README.md                                   | 30 +++++++++++++--------
 test/data/ajax/onunload.html                |  3 ++-
 test/data/ajax/unreleasedXHR.html           |  3 ++-
 test/data/core/aliased.html                 |  7 ++---
 test/data/core/cc_on.html                   |  3 ++-
 test/data/core/dynamic_ready.html           |  5 ++--
 test/data/core/onready.html                 |  3 ++-
 test/data/css/cssWidthBeforeDocReady.html   |  3 ++-
 test/data/data/dataAttrs.html               |  3 ++-
 test/data/dimensions/documentLarge.html     |  5 ++--
 test/data/event/focusElem.html              |  3 ++-
 test/data/event/focusinCrossFrame.html      |  3 ++-
 test/data/event/interactiveReady.html       |  7 ++---
 test/data/event/promiseReady.html           |  3 ++-
 test/data/event/syncReady.html              |  3 ++-
 test/data/event/triggerunload.html          |  3 ++-
 test/data/iframeTest.js                     |  8 ++++++
 test/data/manipulation/iframe-denied.html   |  3 ++-
 test/data/manipulation/scripts-context.html |  7 ++---
 test/data/offset/absolute.html              |  3 ++-
 test/data/offset/body.html                  |  3 ++-
 test/data/offset/fixed.html                 |  3 ++-
 test/data/offset/relative.html              |  3 ++-
 test/data/offset/scroll.html                |  3 ++-
 test/data/offset/static.html                |  3 ++-
 test/data/offset/table.html                 |  3 ++-
 test/data/selector/html5_selector.html      |  6 ++---
 test/data/selector/sizzle_cache.html        |  5 ++--
 test/data/support/bodyBackground.html       |  3 ++-
 test/data/support/csp.js                    |  2 +-
 test/data/support/csp.php                   |  1 +
 test/data/testinit.js                       |  7 +++--
 test/unit/ajax.js                           |  6 ++---
 test/unit/core.js                           | 18 ++++++-------
 test/unit/css.js                            |  4 +--
 test/unit/data.js                           |  4 +--
 test/unit/dimensions.js                     |  4 +--
 test/unit/event.js                          | 24 ++++++++---------
 test/unit/manipulation.js                   | 10 +++----
 test/unit/offset.js                         | 16 +++++------
 test/unit/selector.js                       |  8 +++---
 test/unit/support.js                        |  8 +++---
 42 files changed, 142 insertions(+), 110 deletions(-)
 create mode 100644 test/data/iframeTest.js

diff --git a/README.md b/README.md
index 5c1a90c04..9e5b130c4 100644
--- a/README.md
+++ b/README.md
@@ -340,24 +340,32 @@ url("data/test.php?foo=bar");
 ```
 
 
-### Load tests in an iframe (window.iframeCallback) ###
+### Run tests in an iframe ###
+
+Some tests may require a document other than the standard test fixture, and
+these can be run in a separate iframe. The actual test code and assertions
+remain in jQuery's main test files; only the minimal test fixture markup
+and setup code should be placed in the iframe file.
 
 ```js
-testIframeWithCallback( testName, fileName,
-  function callback( arg1, arg2, ... assert ) {
+testIframe( testName, fileName,
+  function testCallback(
+      assert, jQuery, window, document,
+	  [ additional args ] ) {
 	...
   } );
 ```
 
-Loads a given page constructing a url with fileName: `"./data/" + fileName + ".html"`
-The iframe page is responsible for determining when `window.parent.iframeCallback`
-should be called, for example at document ready or window.onload time.
-Arguments passed to the callback are the same as the arguments passed
-to `window.parent.iframeCallback` by the iframe, plus the QUnit `assert`
-object from the `QUnit.test()` that this wrapper sets up for you.
-The iframe should send any objects needed by the unit test via arguments, for example
-its `jQuery`, `window`, and `document` objects from the iframe.
+This loads a page, constructing a url with fileName `"./data/" + fileName`.
+The iframed page determines when the callback occurs in the test by
+including the "/test/data/iframeTest.js" script and calling
+`startIframeTest( [ additional args ] )` when appropriate. Often this
+will be after either document ready or `window.onload` fires.
 
+The `testCallback` receives the QUnit `assert` object created by `testIframe`
+for this test, followed by the global `jQuery`, `window`, and `document` from
+the iframe. If the iframe code passes any arguments to `startIframeTest`,
+they follow the `document` argument.
 
 
 Questions?
diff --git a/test/data/ajax/onunload.html b/test/data/ajax/onunload.html
index eb1bca263..ec6e4b702 100644
--- a/test/data/ajax/onunload.html
+++ b/test/data/ajax/onunload.html
@@ -4,6 +4,7 @@
 	<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
 	<title>onunload ajax requests (#14379)</title>
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 	<form id="navigate" action="../iframe.html"></form>
@@ -17,7 +18,7 @@
 					ajaxStatus = status;
 				}
 			});
-			parent.iframeCallback( ajaxStatus );
+			startIframeTest( ajaxStatus );
 		});
 
 		jQuery(function() {
diff --git a/test/data/ajax/unreleasedXHR.html b/test/data/ajax/unreleasedXHR.html
index 8a41c4967..3eedaabf8 100644
--- a/test/data/ajax/unreleasedXHR.html
+++ b/test/data/ajax/unreleasedXHR.html
@@ -4,13 +4,14 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <title>Attempt to block tests because of dangling XHR requests (IE)</title>
 <script src="../../jquery.js"></script>
+<script src="../iframeTest.js"></script>
 <script type="text/javascript">
 window.onunload = function() {};
 jQuery(function() {
 	setTimeout(function() {
 		var parent = window.parent;
 		document.write("");
-		parent.iframeCallback();
+		startIframeTest();
 	}, 200 );
 	var number = 50;
 	while( number-- ) {
diff --git a/test/data/core/aliased.html b/test/data/core/aliased.html
index ed06606af..87b5871f4 100644
--- a/test/data/core/aliased.html
+++ b/test/data/core/aliased.html
@@ -10,15 +10,16 @@
 		};
 	</script>
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 	<form>
 		<input type="text" id="nodeName"/>
 	</form>
 	<script>
-		jQuery(function() {
-			window.parent.iframeCallback( errors );
-		});
+		jQuery( function() {
+			startIframeTest( errors );
+		} );
 	</script>
 </body>
 </html>
diff --git a/test/data/core/cc_on.html b/test/data/core/cc_on.html
index 131e2e853..5db18916c 100644
--- a/test/data/core/cc_on.html
+++ b/test/data/core/cc_on.html
@@ -13,10 +13,11 @@
 		};
 	</script>
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 	<script>
-		window.parent.iframeCallback( cc_on, errors, jQuery );
+		startIframeTest( cc_on, errors );
 	</script>
 </body>
 </html>
diff --git a/test/data/core/dynamic_ready.html b/test/data/core/dynamic_ready.html
index 3b29c1104..1db068b95 100644
--- a/test/data/core/dynamic_ready.html
+++ b/test/data/core/dynamic_ready.html
@@ -4,6 +4,7 @@
 	<meta charset="utf-8">
 	<script src="../../jquery.js"></script>
 	<script>var $j = jQuery.noConflict();</script>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 <iframe id="dont_return" src="dont_return.php"></iframe>
@@ -20,14 +21,14 @@
 			$(function () {
 				clearTimeout( timeoutId );
 				if ( !timeoutFired ) {
-					window.parent.iframeCallback( true );
+					startIframeTest( true );
 				}
 			});
 		});
 
 		timeoutId = setTimeout(function () {
 			timeoutFired = true;
-			window.parent.iframeCallback( false );
+			startIframeTest( false );
 		}, 10000);
 	});
 </script>
diff --git a/test/data/core/onready.html b/test/data/core/onready.html
index 1e8f127e7..88ba94a07 100644
--- a/test/data/core/onready.html
+++ b/test/data/core/onready.html
@@ -8,6 +8,7 @@
 		window.onready = function() { error = "Called window.onready"; };
 	</script>
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 	<form>
@@ -16,7 +17,7 @@
 	<script>
 		jQuery(function() {
 			setTimeout( function() {
-				window.parent.iframeCallback( error );
+				startIframeTest( error );
 			});
 		});
 	</script>
diff --git a/test/data/css/cssWidthBeforeDocReady.html b/test/data/css/cssWidthBeforeDocReady.html
index a8fa4af0f..4ebc2c9d3 100644
--- a/test/data/css/cssWidthBeforeDocReady.html
+++ b/test/data/css/cssWidthBeforeDocReady.html
@@ -14,8 +14,9 @@
 <body>
 <div id="test"></div>
 <script src="../../jquery.js"></script>
+<script src="../iframeTest.js"></script>
 <script>
-	window.parent.iframeCallback( jQuery( "#test" ).css( 'width' ) );
+	startIframeTest( jQuery( "#test" ).css( 'width' ) );
 </script>
 </body>
 </html>
diff --git a/test/data/data/dataAttrs.html b/test/data/data/dataAttrs.html
index 5e6e442a6..785150eb8 100644
--- a/test/data/data/dataAttrs.html
+++ b/test/data/data/dataAttrs.html
@@ -4,9 +4,10 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>IE11 onpageshow strangeness (#14894)</title>
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 	<script>
 		$(function(){
-			window.parent.iframeCallback( $( "body" ).data().result );
+			startIframeTest( $( "body" ).data().result );
 		});
 	</script>
 </head>
diff --git a/test/data/dimensions/documentLarge.html b/test/data/dimensions/documentLarge.html
index c977fac96..9d6a7291d 100644
--- a/test/data/dimensions/documentLarge.html
+++ b/test/data/dimensions/documentLarge.html
@@ -8,14 +8,13 @@
 			height: 1000px;
 		}
 	</style>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 	<div>
 		<script src="../../jquery.js"></script>
 		<script>
-			jQuery( function() {
-				window.parent.iframeCallback( jQuery, window, document );
-			} );
+			jQuery( startIframeTest );
 		</script>
 	</div>
 </body>
diff --git a/test/data/event/focusElem.html b/test/data/event/focusElem.html
index a9a976518..1940e8b61 100644
--- a/test/data/event/focusElem.html
+++ b/test/data/event/focusElem.html
@@ -5,12 +5,13 @@
 	<title>.focus() (activeElement access #13393)</title>
 
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 	<a href="#" id="frame-link"></a>
 	<script>
 		jQuery( "#frame-link" ).trigger( "focus" );
-		window.parent.iframeCallback( true );
+		startIframeTest( true );
 	</script>
 </body>
 </html>
diff --git a/test/data/event/focusinCrossFrame.html b/test/data/event/focusinCrossFrame.html
index 487f8de8f..6dd187e90 100644
--- a/test/data/event/focusinCrossFrame.html
+++ b/test/data/event/focusinCrossFrame.html
@@ -5,13 +5,14 @@
 	<title>focusin event cross-frame (#14180)</title>
 
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 </head>
 <body>
 	<input type="text" id="frame-input" />
 	<script>
 		// Call parent when this frame is fully loaded, it will mess with #frame-input
 		jQuery( window ).one( "load", function() {
-			window.parent.iframeCallback( document );
+			startIframeTest();
 		});
 	</script>
 </body>
diff --git a/test/data/event/interactiveReady.html b/test/data/event/interactiveReady.html
index 77b37104d..3fb25f907 100644
--- a/test/data/event/interactiveReady.html
+++ b/test/data/event/interactiveReady.html
@@ -4,13 +4,14 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <title>Test case for gh-2100</title>
 <script src="../../jquery.js"></script>
+<script src="../iframeTest.js"></script>
 </head>
 <body>
 
 <script type="text/javascript">
-jQuery( document ).ready(function () {
-	window.parent.iframeCallback( jQuery("#container").length === 1 );
-});
+jQuery( function () {
+	startIframeTest( jQuery("#container").length === 1 );
+} );
 </script>
 
 <!-- external resources that come before elements trick
diff --git a/test/data/event/promiseReady.html b/test/data/event/promiseReady.html
index 17b6e7f2c..c6e086245 100644
--- a/test/data/event/promiseReady.html
+++ b/test/data/event/promiseReady.html
@@ -4,10 +4,11 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <title>Test case for jQuery ticket #11470</title>
 <script src="../../jquery.js"></script>
+<script src="../iframeTest.js"></script>
 <script type="text/javascript">
 jQuery.when( jQuery.ready ).done(function() {
 	jQuery("body").append("<div>modifying DOM</div>");
-	window.parent.iframeCallback( $("div").text() === "modifying DOM" );
+	startIframeTest( $("div").text() === "modifying DOM" );
 });
 </script>
 </head>
diff --git a/test/data/event/syncReady.html b/test/data/event/syncReady.html
index dfa9ac337..61a50e423 100644
--- a/test/data/event/syncReady.html
+++ b/test/data/event/syncReady.html
@@ -4,12 +4,13 @@
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <title>Test case for jQuery ticket #10067</title>
 <script src="../../jquery.js"></script>
+<script src="../iframeTest.js"></script>
 </head>
 <body>
 
 <script type="text/javascript">
 jQuery( document ).ready(function () {
-	window.parent.iframeCallback( jQuery('#container').length === 1 );
+	startIframeTest( jQuery('#container').length === 1 );
 });
 </script>
 
diff --git a/test/data/event/triggerunload.html b/test/data/event/triggerunload.html
index a7879c772..02be59d48 100644
--- a/test/data/event/triggerunload.html
+++ b/test/data/event/triggerunload.html
@@ -1,6 +1,7 @@
 <!doctype html>
 <html>
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 	<script>
 		var called = false,
 			error = false;
@@ -12,7 +13,7 @@
 			return "maybe";
 		}).on( "load", function( event ) {
 			$( window ).triggerHandler( "beforeunload" );
-			window.parent.iframeCallback( called && !error );
+			startIframeTest( called && !error );
 		});
 	</script>
 </html>
diff --git a/test/data/iframeTest.js b/test/data/iframeTest.js
new file mode 100644
index 000000000..877e884f0
--- /dev/null
+++ b/test/data/iframeTest.js
@@ -0,0 +1,8 @@
+
+window.startIframeTest = function() {
+	var args = Array.prototype.slice.call( arguments );
+
+	// Note: jQuery may be undefined if page did not load it
+	args.unshift( window.jQuery, window, document );
+	window.parent.iframeCallback.apply( null, args );
+};
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>
diff --git a/test/data/offset/absolute.html b/test/data/offset/absolute.html
index 84a9e33de..9d8700465 100644
--- a/test/data/offset/absolute.html
+++ b/test/data/offset/absolute.html
@@ -16,6 +16,7 @@
 			#positionTest { position: absolute; }
 		</style>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
 				$(".absolute").click(function() {
@@ -24,7 +25,7 @@
 					$(this).css({ top: pos.top, left: pos.left });
 					return false;
 				});
-				window.parent.iframeCallback( jQuery, window, document );
+				startIframeTest();
 			});
 		</script>
 	</head>
diff --git a/test/data/offset/body.html b/test/data/offset/body.html
index cada87a15..75757d7e6 100644
--- a/test/data/offset/body.html
+++ b/test/data/offset/body.html
@@ -10,13 +10,14 @@
 			#firstElement { width: 50px; height: 50px; background: green; }
 		</style>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
 				$("body").click(function() {
 					$("marker").css( $(this).offset() );
 					return false;
 				});
-				window.parent.iframeCallback( jQuery, window, document );
+				startIframeTest();
 			});
 		</script>
 	</head>
diff --git a/test/data/offset/fixed.html b/test/data/offset/fixed.html
index e54389596..48a2c4797 100644
--- a/test/data/offset/fixed.html
+++ b/test/data/offset/fixed.html
@@ -13,6 +13,7 @@
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
 				window.scrollTo(1000,1000);
@@ -20,7 +21,7 @@
 					$("#marker").css( $(this).offset() );
 					return false;
 				});
-				window.parent.iframeCallback( jQuery, window, document );
+				startIframeTest();
 			});
 		</script>
 	</head>
diff --git a/test/data/offset/relative.html b/test/data/offset/relative.html
index b413e05ee..288fd4ea3 100644
--- a/test/data/offset/relative.html
+++ b/test/data/offset/relative.html
@@ -12,6 +12,7 @@
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
 				$(".relative").click(function() {
@@ -20,7 +21,7 @@
 					$(this).css({ position: 'absolute', top: pos.top, left: pos.left });
 					return false;
 				});
-				window.parent.iframeCallback( jQuery, window, document );
+				startIframeTest();
 			});
 		</script>
 	</head>
diff --git a/test/data/offset/scroll.html b/test/data/offset/scroll.html
index 49304eee7..28cade1c3 100644
--- a/test/data/offset/scroll.html
+++ b/test/data/offset/scroll.html
@@ -15,6 +15,7 @@
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
 				window.scrollTo(1000,1000);
@@ -24,7 +25,7 @@
 					$("#marker").css( $(this).offset() );
 					return false;
 				});
-				window.parent.iframeCallback( jQuery, window, document );
+				startIframeTest();
 			});
 		</script>
 	</head>
diff --git a/test/data/offset/static.html b/test/data/offset/static.html
index 125ad740f..1f4c3dc3d 100644
--- a/test/data/offset/static.html
+++ b/test/data/offset/static.html
@@ -11,6 +11,7 @@
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
 				$(".static").click(function() {
@@ -19,7 +20,7 @@
 					$(this).css({ position: 'absolute', top: pos.top, left: pos.left });
 					return false;
 				});
-				window.parent.iframeCallback( jQuery, window, document );
+				startIframeTest();
 			});
 		</script>
 	</head>
diff --git a/test/data/offset/table.html b/test/data/offset/table.html
index 1e37957ce..eeac19b77 100644
--- a/test/data/offset/table.html
+++ b/test/data/offset/table.html
@@ -11,13 +11,14 @@
 			#marker { position: absolute; border: 2px solid #000; width: 50px; height: 50px; background: #ccc; }
 		</style>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script type="text/javascript" charset="utf-8">
 			jQuery(function($) {
 				$("table, th, td").click(function() {
 					$("#marker").css( $(this).offset() );
 					return false;
 				});
-				window.parent.iframeCallback( jQuery, window, document );
+				startIframeTest();
 			});
 		</script>
 	</head>
diff --git a/test/data/selector/html5_selector.html b/test/data/selector/html5_selector.html
index bf0e5ba5e..35c583cd0 100644
--- a/test/data/selector/html5_selector.html
+++ b/test/data/selector/html5_selector.html
@@ -5,7 +5,7 @@
 	<title>jQuery selector - attributes</title>
 
 	<script src="../../jquery.js"></script>
-
+	<script src="../iframeTest.js"></script>
 	<script id="script1"
 			defer
 			async></script>
@@ -16,9 +16,7 @@
 		document.createElement('article');
 		document.createElement('details');
 
-		jQuery( function() {
-			window.parent.iframeCallback( jQuery, window, document );
-		} );
+		jQuery( startIframeTest );
 	</script>
 </head>
 <body>
diff --git a/test/data/selector/sizzle_cache.html b/test/data/selector/sizzle_cache.html
index 4320fdcfd..513390cab 100644
--- a/test/data/selector/sizzle_cache.html
+++ b/test/data/selector/sizzle_cache.html
@@ -5,6 +5,7 @@
 	<title>jQuery selector - sizzle cache</title>
 
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 	<script>
 		document.write(
 			"<script>var $cached = jQuery.noConflict(true);<\x2Fscript>" +
@@ -18,9 +19,7 @@
 		<a href="#" id="collision">Worlds collide</a>
 	</div>
 	<script>
-		jQuery( function() {
-			window.parent.iframeCallback( jQuery, window, document );
-		} );
+		jQuery( startIframeTest );
 	</script>
 </body>
 </html>
diff --git a/test/data/support/bodyBackground.html b/test/data/support/bodyBackground.html
index cac099805..d95f39d57 100644
--- a/test/data/support/bodyBackground.html
+++ b/test/data/support/bodyBackground.html
@@ -18,10 +18,11 @@
 <body>
 	<div>
 		<script src="../../jquery.js"></script>
+		<script src="../iframeTest.js"></script>
 		<script src="getComputedSupport.js"></script>
 	</div>
 	<script>
-		window.parent.iframeCallback( jQuery( "body" ).css( "backgroundColor" ),
+		startIframeTest( jQuery( "body" ).css( "backgroundColor" ),
 				getComputedSupport( jQuery.support ) );
 	</script>
 </body>
diff --git a/test/data/support/csp.js b/test/data/support/csp.js
index 5ebdcea08..4d55bdaa1 100644
--- a/test/data/support/csp.js
+++ b/test/data/support/csp.js
@@ -1,3 +1,3 @@
 jQuery( function() {
-	parent.iframeCallback( getComputedSupport( jQuery.support ) );
+	startIframeTest( getComputedSupport( jQuery.support ) );
 } );
diff --git a/test/data/support/csp.php b/test/data/support/csp.php
index 0783e1774..446000239 100644
--- a/test/data/support/csp.php
+++ b/test/data/support/csp.php
@@ -9,6 +9,7 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title>CSP Test Page</title>
 	<script src="../../jquery.js"></script>
+	<script src="../iframeTest.js"></script>
 	<script src="csp.js"></script>
 	<script src="getComputedSupport.js"></script>
 </head>
diff --git a/test/data/testinit.js b/test/data/testinit.js
index 70c9bbd5a..40ac02114 100644
--- a/test/data/testinit.js
+++ b/test/data/testinit.js
@@ -232,15 +232,15 @@ this.ajaxTest = function( title, expect, options ) {
 	} );
 };
 
-this.testIframeWithCallback = function( title, fileName, func ) {
-	QUnit.test( title, 1, function( assert ) {
+this.testIframe = function( title, fileName, func ) {
+	QUnit.test( title, function( assert ) {
 		var iframe;
 		var done = assert.async();
 
 		window.iframeCallback = function() {
 			var args = Array.prototype.slice.call( arguments );
 
-			args.push( assert );
+			args.unshift( assert );
 
 			setTimeout( function() {
 				this.iframeCallback = undefined;
@@ -248,7 +248,6 @@ this.testIframeWithCallback = function( title, fileName, func ) {
 				func.apply( this, args );
 				func = function() {};
 				iframe.remove();
-
 				done();
 			} );
 		};
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 297f051d9..1082ce88e 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -28,7 +28,7 @@ QUnit.module( "ajax", {
 
 //----------- jQuery.ajax()
 
-	testIframeWithCallback(
+	testIframe(
 		"XMLHttpRequest - Attempt to block tests because of dangling XHR requests (IE)",
 		"ajax/unreleasedXHR.html",
 		function( assert ) {
@@ -1826,10 +1826,10 @@ if ( typeof window.ArrayBuffer === "undefined" || typeof new XMLHttpRequest().re
 		};
 	} );
 
-	testIframeWithCallback(
+	testIframe(
 		"#14379 - jQuery.ajax() on unload",
 		"ajax/onunload.html",
-		function( status, assert ) {
+		function( assert, jQuery, window, document, status ) {
 			assert.expect( 1 );
 			assert.strictEqual( status, "success", "Request completed" );
 		}
diff --git a/test/unit/core.js b/test/unit/core.js
index a42346d00..57c8dd9e9 100644
--- a/test/unit/core.js
+++ b/test/unit/core.js
@@ -1648,14 +1648,14 @@ QUnit.test( "jQuery.camelCase()", function( assert ) {
 	} );
 } );
 
-testIframeWithCallback(
+testIframe(
 	"Conditional compilation compatibility (#13274)",
 	"core/cc_on.html",
-	function( cc_on, errors, $, assert ) {
+	function( assert, jQuery, window, document, cc_on, errors ) {
 		assert.expect( 3 );
 		assert.ok( true, "JScript conditional compilation " + ( cc_on ? "supported" : "not supported" ) );
 		assert.deepEqual( errors, [], "No errors" );
-		assert.ok( $(), "jQuery executes" );
+		assert.ok( jQuery(), "jQuery executes" );
 	}
 );
 
@@ -1663,29 +1663,29 @@ testIframeWithCallback(
 // This makes this test fail but it doesn't seem to cause any real-life problems so blacklisting
 // this test there is preferred to complicating the hard-to-test core/ready code further.
 if ( !/iphone os 7_/i.test( navigator.userAgent ) ) {
-	testIframeWithCallback(
+	testIframe(
 		"document ready when jQuery loaded asynchronously (#13655)",
 		"core/dynamic_ready.html",
-		function( ready, assert ) {
+		function( assert, jQuery, window, document, ready ) {
 			assert.expect( 1 );
 			assert.equal( true, ready, "document ready correctly fired when jQuery is loaded after DOMContentLoaded" );
 		}
 	);
 }
 
-testIframeWithCallback(
+testIframe(
 	"Tolerating alias-masked DOM properties (#14074)",
 	"core/aliased.html",
-	function( errors, assert ) {
+	function( assert, jQuery, window, document, errors ) {
 		assert.expect( 1 );
 		assert.deepEqual( errors, [], "jQuery loaded" );
 	}
 );
 
-testIframeWithCallback(
+testIframe(
 	"Don't call window.onready (#14802)",
 	"core/onready.html",
-	function( error, assert ) {
+	function( assert, jQuery, window, document, error ) {
 		assert.expect( 1 );
 		assert.equal( error, false, "no call to user-defined onready" );
 	}
diff --git a/test/unit/css.js b/test/unit/css.js
index e04ad5dea..38d5ed6d1 100644
--- a/test/unit/css.js
+++ b/test/unit/css.js
@@ -1139,10 +1139,10 @@ QUnit.test( "css('width') and css('height') should respect box-sizing, see #1100
 	assert.equal( el_dis.css( "height" ), el_dis.css( "height", el_dis.css( "height" ) ).css( "height" ), "css('height') is not respecting box-sizing for disconnected element, see #11004" );
 } );
 
-testIframeWithCallback(
+testIframe(
 	"css('width') should work correctly before document ready (#14084)",
 	"css/cssWidthBeforeDocReady.html",
-	function( cssWidthBeforeDocReady, assert ) {
+	function( assert, jQuery, window, document, cssWidthBeforeDocReady ) {
 		assert.expect( 1 );
 		assert.strictEqual( cssWidthBeforeDocReady, "100px", "elem.css('width') works correctly before document ready" );
 	}
diff --git a/test/unit/data.js b/test/unit/data.js
index 19f32504b..9a9371aae 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -857,10 +857,10 @@ QUnit.test( "Check proper data removal of non-element descendants nodes (#8335)"
 	assert.ok( !text.data( "test" ), "Be sure data is not stored in non-element" );
 } );
 
-testIframeWithCallback(
+testIframe(
 	"enumerate data attrs on body (#14894)",
 	"data/dataAttrs.html",
-	function( result, assert ) {
+	function( assert, jQuery, window, document, result ) {
 		assert.expect( 1 );
 		assert.equal( result, "ok", "enumeration of data- attrs on body" );
 	}
diff --git a/test/unit/dimensions.js b/test/unit/dimensions.js
index 1f8ff5007..8d304c435 100644
--- a/test/unit/dimensions.js
+++ b/test/unit/dimensions.js
@@ -469,10 +469,10 @@ QUnit.test( "setters with and without box-sizing:border-box", function( assert )
 	} );
 } );
 
-testIframeWithCallback(
+testIframe(
 	"window vs. large document",
 	"dimensions/documentLarge.html",
-	function( jQuery, window, document, assert ) {
+	function( assert, jQuery, window, document ) {
 		assert.expect( 2 );
 
 		assert.ok( jQuery( document ).height() > jQuery( window ).height(), "document height is larger than window height" );
diff --git a/test/unit/event.js b/test/unit/event.js
index 1c46b4607..5b00c7c3b 100644
--- a/test/unit/event.js
+++ b/test/unit/event.js
@@ -2476,10 +2476,10 @@ QUnit.test( "focusin using non-element targets", function( assert ) {
 
 } );
 
-testIframeWithCallback(
+testIframe(
 	"focusin from an iframe",
 	"event/focusinCrossFrame.html",
-	function( frameDoc, assert ) {
+	function( assert, framejQuery, frameWin, frameDoc ) {
 		assert.expect( 1 );
 
 		var input = jQuery( frameDoc ).find( "#frame-input" );
@@ -2507,10 +2507,10 @@ testIframeWithCallback(
 	}
 );
 
-testIframeWithCallback(
+testIframe(
 	"jQuery.ready promise",
 	"event/promiseReady.html",
-	function( isOk, assert ) {
+	function( assert, jQuery, window, document, isOk ) {
 		assert.expect( 1 );
 		assert.ok( isOk, "$.when( $.ready ) works" );
 	}
@@ -2518,29 +2518,29 @@ testIframeWithCallback(
 
 // need PHP here to make the incepted IFRAME hang
 if ( hasPHP ) {
-	testIframeWithCallback(
+	testIframe(
 		"jQuery.ready uses interactive",
 		"event/interactiveReady.html",
-		function( isOk, assert ) {
+	function( assert, jQuery, window, document, isOk ) {
 			assert.expect( 1 );
 			assert.ok( isOk, "jQuery fires ready when the DOM can truly be interacted with" );
 		}
 	);
 }
 
-testIframeWithCallback(
+testIframe(
 	"Focusing iframe element",
 	"event/focusElem.html",
-	function( isOk, assert ) {
+	function( assert, jQuery, window, document, isOk ) {
 		assert.expect( 1 );
 		assert.ok( isOk, "Focused an element in an iframe" );
 	}
 );
 
-testIframeWithCallback(
+testIframe(
 	"triggerHandler(onbeforeunload)",
 	"event/triggerunload.html",
-	function( isOk, assert ) {
+	function( assert, jQuery, window, document, isOk ) {
 		assert.expect( 1 );
 		assert.ok( isOk, "Triggered onbeforeunload without an error" );
 	}
@@ -2548,10 +2548,10 @@ testIframeWithCallback(
 
 // need PHP here to make the incepted IFRAME hang
 if ( hasPHP ) {
-	testIframeWithCallback(
+	testIframe(
 		"jQuery.ready synchronous load with long loading subresources",
 		"event/syncReady.html",
-		function( isOk, assert ) {
+		function( assert, jQuery, window, document, isOk ) {
 			assert.expect( 1 );
 			assert.ok( isOk, "jQuery loaded synchronously fires ready when the DOM can truly be interacted with" );
 		}
diff --git a/test/unit/manipulation.js b/test/unit/manipulation.js
index d439ba11c..8f8d78433 100644
--- a/test/unit/manipulation.js
+++ b/test/unit/manipulation.js
@@ -2237,21 +2237,21 @@ QUnit.test( "domManip executes scripts containing html comments or CDATA (trac-9
 	].join( "\n" ) ).appendTo( "#qunit-fixture" );
 } );
 
-testIframeWithCallback(
+testIframe(
 	"domManip tolerates window-valued document[0] in IE9/10 (trac-12266)",
 	"manipulation/iframe-denied.html",
-	function( test, assert ) {
+	function( assert, jQuery, window, document, test ) {
 		assert.expect( 1 );
 		assert.ok( test.status, test.description );
 	}
 );
 
-testIframeWithCallback(
+testIframe(
 	"domManip executes scripts in iframes in the iframes' context",
 	"manipulation/scripts-context.html",
-	function( frameWindow, bodyElement, html, assert ) {
+	function( assert, framejQuery, frameWindow, frameDocument ) {
 		assert.expect( 2 );
-		jQuery( bodyElement ).append( html );
+		jQuery( frameDocument.body ).append( "<script>window.scriptTest = true;<\x2fscript>" );
 		assert.ok( !window.scriptTest, "script executed in iframe context" );
 		assert.ok( frameWindow.scriptTest, "script executed in iframe context" );
 	}
diff --git a/test/unit/offset.js b/test/unit/offset.js
index 65483107e..4caf36873 100644
--- a/test/unit/offset.js
+++ b/test/unit/offset.js
@@ -68,7 +68,7 @@ QUnit.test( "hidden (display: none) element", function( assert ) {
 	assert.equal( result.left, 0, "Retrieving offset on hidden elements returns zeros (gh-2310)" );
 } );
 
-testIframeWithCallback( "absolute", "offset/absolute.html", function( $, iframe, document, assert ) {
+testIframe( "absolute", "offset/absolute.html", function( assert, $, iframe ) {
 	assert.expect( 4 );
 
 	var doc = iframe.document,
@@ -93,7 +93,7 @@ testIframeWithCallback( "absolute", "offset/absolute.html", function( $, iframe,
 	} );
 } );
 
-testIframeWithCallback( "absolute", "offset/absolute.html", function( $, window, document, assert ) {
+testIframe( "absolute", "offset/absolute.html", function( assert, $ ) {
 	assert.expect( 178 );
 
 	var tests, offset;
@@ -178,7 +178,7 @@ testIframeWithCallback( "absolute", "offset/absolute.html", function( $, window,
 	} );
 } );
 
-testIframeWithCallback( "relative", "offset/relative.html", function( $, window, document, assert ) {
+testIframe( "relative", "offset/relative.html", function( assert, $ ) {
 	assert.expect( 64 );
 
 	// get offset
@@ -236,7 +236,7 @@ testIframeWithCallback( "relative", "offset/relative.html", function( $, window,
 	} );
 } );
 
-testIframeWithCallback( "static", "offset/static.html", function( $, window, document, assert ) {
+testIframe( "static", "offset/static.html", function( assert, $ ) {
 	assert.expect( 80 );
 
 	// get offset
@@ -298,7 +298,7 @@ testIframeWithCallback( "static", "offset/static.html", function( $, window, doc
 	} );
 } );
 
-testIframeWithCallback( "fixed", "offset/fixed.html", function( $, window, document, assert ) {
+testIframe( "fixed", "offset/fixed.html", function( assert, $, window ) {
 	assert.expect( 34 );
 
 	var tests, $noTopLeft;
@@ -388,7 +388,7 @@ testIframeWithCallback( "fixed", "offset/fixed.html", function( $, window, docum
 	}
 } );
 
-testIframeWithCallback( "table", "offset/table.html", function( $, window, document, assert ) {
+testIframe( "table", "offset/table.html", function( assert, $ ) {
 	assert.expect( 4 );
 
 	assert.equal( $( "#table-1" ).offset().top, 6, "jQuery('#table-1').offset().top" );
@@ -398,7 +398,7 @@ testIframeWithCallback( "table", "offset/table.html", function( $, window, docum
 	assert.equal( $( "#th-1" ).offset().left, 10, "jQuery('#th-1').offset().left" );
 } );
 
-testIframeWithCallback( "scroll", "offset/scroll.html", function( $, win, doc, assert ) {
+testIframe( "scroll", "offset/scroll.html", function( assert, $, win ) {
 	assert.expect( 26 );
 
 	assert.equal( $( "#scroll-1" ).offset().top, 7, "jQuery('#scroll-1').offset().top" );
@@ -457,7 +457,7 @@ testIframeWithCallback( "scroll", "offset/scroll.html", function( $, win, doc, a
 	assert.strictEqual( $().scrollLeft(), undefined, "jQuery().scrollLeft() testing getter on empty jquery object" );
 } );
 
-testIframeWithCallback( "body", "offset/body.html", function( $, window, document, assert ) {
+testIframe( "body", "offset/body.html", function( assert, $ ) {
 	assert.expect( 4 );
 
 	assert.equal( $( "body" ).offset().top, 1, "jQuery('#body').offset().top" );
diff --git a/test/unit/selector.js b/test/unit/selector.js
index 1b5de1317..4c2449425 100644
--- a/test/unit/selector.js
+++ b/test/unit/selector.js
@@ -289,10 +289,10 @@ QUnit[ jQuery.find.compile ? "test" : "skip" ]( "disconnected nodes", function(
 	assert.equal( $opt.is( ":selected" ), true, "selected option" );
 } );
 
-testIframeWithCallback(
+testIframe(
 	"attributes - jQuery.attr",
 	"selector/html5_selector.html",
-	function( jQuery, window, document, assert ) {
+	function( assert, jQuery, window, document ) {
 		assert.expect( 38 );
 
 		/**
@@ -489,10 +489,10 @@ QUnit.test( "jQuery.uniqueSort", function( assert ) {
 	assert.strictEqual( jQuery.unique, jQuery.uniqueSort, "jQuery.unique() is an alias for jQuery.uniqueSort()" );
 } );
 
-testIframeWithCallback(
+testIframe(
 	"Sizzle cache collides with multiple Sizzles on a page",
 	"selector/sizzle_cache.html",
-	function( jQuery, window, document, assert ) {
+	function( assert, jQuery, window, document ) {
 		var $cached = window[ "$cached" ];
 
 		assert.expect( 4 );
diff --git a/test/unit/support.js b/test/unit/support.js
index 3e6af1ae7..ff5d66f87 100644
--- a/test/unit/support.js
+++ b/test/unit/support.js
@@ -18,10 +18,10 @@ function getComputedSupport( support ) {
 }
 
 if ( jQuery.css ) {
-	testIframeWithCallback(
+	testIframe(
 		"body background is not lost if set prior to loading jQuery (#9239)",
 		"support/bodyBackground.html",
-		function( color, support, assert ) {
+		function( assert, jQuery, window, document, color, support ) {
 			assert.expect( 2 );
 			var okValue = {
 				"#000000": true,
@@ -37,10 +37,10 @@ if ( jQuery.css ) {
 
 // This test checks CSP only for browsers with "Content-Security-Policy" header support
 // i.e. no old WebKit or old Firefox
-testIframeWithCallback(
+testIframe(
 	"Check CSP (https://developer.mozilla.org/en-US/docs/Security/CSP) restrictions",
 	"support/csp.php",
-	function( support, assert ) {
+	function( assert, jQuery, window, document, support ) {
 		var done = assert.async();
 
 		assert.expect( 2 );
-- 
2.39.5