moved check to interval, made the directories an ajax call instead of a templated js array, and reorged some bits to clean things up

johnbender · johnbender · commit 97feeaffc0e3 · 2011-06-26T23:16:50.000-07:00
diff --git a/tests/unit/index.php b/tests/unit/index.php
@@ -2,6 +2,7 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
+	<link rel="stylesheet" href="../../external/qunit.css"></link>
 </head>
 <body>
   <div style="float: left; width: 500px;">
@@ -14,7 +15,6 @@
        I think an entire link and stylesheet is a waste -->
 	<iframe data-src="../../tests/unit/{{testdir}}" name="testFrame" id="testFrame" width="800px" height="100%" style="float: left; border: 0px; height: 100%;" scrolling="no">
 	</iframe>
-	<link rel="stylesheet" href="../../external/qunit.css"></link>
 	<script src="../../js/jquery.js"></script>
 	<script src="../../external/qunit.js"></script>
 	<script src="runner.js"></script>
diff --git a/tests/unit/ls.php b/tests/unit/ls.php
@@ -13,5 +13,5 @@
     closedir($handle);
   }
 
-  echo json_encode($response)
+	echo json_encode($response)
 ?>
diff --git a/tests/unit/runner.js b/tests/unit/runner.js
@@ -1,63 +1,55 @@
 (function(){
-  var test = function(data){
+	var test = function(data){
 		var $frameElem = $("#testFrame"),
-		    template = $frameElem.attr("data-src"),
-		    updateFrame = function(dir){
-			    return $frameElem.attr("src", template.replace("{{testdir}}", dir));
-		    };
+				template = $frameElem.attr("data-src"),
+				updateFrame = function(dir){
+					return $frameElem.attr("src", template.replace("{{testdir}}", dir));
+				};
 
 		$.each(data.directories, function(i, dir){
 			asyncTest( dir, function(){
-				var nextCheck = null;
+				var testTimeout = 2 * 60 * 1000, checkInterval = 2000;
 
 				// establish a timeout for a given suite in case of async tests hanging
-				var testTimeout = setTimeout( function(){
+				var testTimer = setTimeout( function(){
 					// prevent any schedule checks for completion
-					clearTimeout(nextCheck);
+					clearTimeout( checkTimer );
 					start();
-				}, 2 * 60 * 1000 ),
+				}, testTimeout ),
 
-				// setup the next state check and record the timer id for removal
-				scheduleCheck = function(){
-					nextCheck = setTimeout( check, 2000 );
-				},
+				checkTimer = setInterval( check, checkInterval );
 
 				// check the iframe for success or failure and respond accordingly
-				check = function(){
-
+				function check(){
 					// check for the frames jquery object each time
 					var framejQuery = window.frames["testFrame"].jQuery;
 
 					// if the iframe hasn't loaded (ie loaded jQuery) check back again shortly
-					if( !framejQuery ){
-						scheduleCheck();
-						return;
-					}
+					if( !framejQuery ) return;
 
 					// grab the result of the iframe test suite
-          // TODO strip extra white space
-					var result = framejQuery("#qunit-banner").attr('class');
+					// TODO strip extra white space
+					var result = framejQuery( "#qunit-banner" ).attr( "class" );
 
 					// if we have a result check it, otherwise check back shortly
 					if( result ){
 						ok( result == "qunit-pass" );
-						clearTimeout(testTimeout);
+
+            // prevent the next interval of the check function and the test timeout
+						clearTimeout( checkTimer );
+            clearTimeout( testTimer );
 						start();
-					} else {
-						scheduleCheck();
 					}
 				};
 
 				expect( 1 );
+
+        // set the test suite page on the iframe
 				updateFrame( dir );
-				scheduleCheck();
 			});
 		});
 	};
 
 	// get the test directories
-	$.ajax({
-		url: "ls.php",
-		success: test
-	});
+	$.get("ls.php", test);
 })();

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@`
`13`	`13`	`closedir($handle);`
`14`	`14`	`}`
`15`	`15`
`16`		`- echo json_encode($response)`
	`16`	`+ echo json_encode($response)`
`17`	`17`	`?>`