Tests: move readywait to an iframe test

Close jquerygh-3331 Fixes jquerygh-3573
timmywil · Mar 18, 2017 · 45fa984bb49fc0a5ecdb78aededa6dc960b79f92 · 45fa984
1 parent f8faf14
commit 45fa984bb49fc0a5ecdb78aededa6dc960b79f92
Unified Split

Showing with 49 additions and 44 deletions.

+7 −7 src/deprecated.js

+17 −11 test/{ → data}/readywait.html

+0 −1 test/data/readywaitasset.js

+0 −25 test/data/readywaitloader.js

+13 −0 test/unit/ready.js

+12 −0 test/unit/readywait.js
diff --git a/src/deprecated.js b/src/deprecated.js
@@ -23,16 +23,16 @@ jQuery.fn.extend( {
 		return arguments.length === 1 ?
 			this.off( selector, "**" ) :
 			this.off( types, selector || "**", fn );
-	},
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
 	}
 } );
 
+jQuery.holdReady = function( hold ) {
+	if ( hold ) {
+		jQuery.readyWait++;
+	} else {
+		jQuery.ready( true );
+	}
+};
 jQuery.isArray = Array.isArray;
 jQuery.parseJSON = JSON.parse;
 jQuery.nodeName = nodeName;

diff --git a/test/readywait.html → test/data/readywait.html b/test/readywait.html → test/data/readywait.html
@@ -14,22 +14,28 @@
 		#output { background-color: green }
 		#expectedOutput { background-color: green }
 	</style>
-	<script src="jquery.js"></script>
+	<script src="../jquery.js"></script>
+	<script src="./iframeTest.js"></script>
 
 	<!-- Load the script loader that uses
 		jQuery.readyWait -->
-	<script src="data/readywaitloader.js"></script>
 
 	<script type="text/javascript">
-	jQuery(function() {
-		// The delayedMessage is defined by
-		// the readywaitasset.js file, so the
-		// next line will only work if this DOM
-		// ready callback is called after readyWait
-		// has been decremented by readywaitloader.js
-		// If an error occurs.
-		jQuery("#output").append(delayedMessage);
-	});
+	(function() {
+		var released = false;
+		// Hold on jQuery!
+		jQuery.holdReady( true );
+
+		setTimeout( function() {
+		  released = true;
+			jQuery.holdReady( false );
+		}, 300 );
+
+		jQuery(function() {
+			jQuery( "#output" ).text( "Ready called, holdReady released: " + released );
+			startIframeTest( released );
+		});
+	})();
 	</script>
 </head>
 <body>

diff --git a/test/data/readywaitasset.js b/test/data/readywaitasset.js
diff --git a/test/data/readywaitloader.js b/test/data/readywaitloader.js
diff --git a/test/unit/ready.js b/test/unit/ready.js
@@ -4,6 +4,7 @@ QUnit.module( "ready" );
 	var notYetReady, noEarlyExecution,
 		whenified = jQuery.when( jQuery.ready ),
 		promisified = Promise.resolve( jQuery.ready ),
+		start = new Date(),
 		order = [],
 		args = {};
 
@@ -147,4 +148,16 @@ QUnit.module( "ready" );
 			done();
 		} );
 	} );
+
+	testIframe(
+		"holdReady test needs to be a standalone test since it deals with DOM ready",
+		"readywait.html",
+		function( assert, jQuery, window, document, releaseCalled ) {
+			assert.expect( 2 );
+			var now = new Date();
+			assert.ok( now - start >= 300, "Needs to have waited at least half a second" );
+			assert.ok( releaseCalled, "The release function was called, which resulted in ready" );
+		}
+	);
+
 } )();
diff --git a/test/unit/readywait.js b/test/unit/readywait.js
@@ -0,0 +1,12 @@
+var start = new Date();
+
+testIframe(
+	"holdReady test needs to be a standalone test since it deals with DOM ready",
+	"readywait.html",
+	function( assert, jQuery, window, document, delayedMessage ) {
+		assert.expect( 2 );
+		var now = new Date();
+		assert.ok( now - start >= 2000, "Must have waited 2 seconds" );
+		assert.equal( delayedMessage, "It worked!" );
+	}
+);