X-Git-Url: http://git.asbjorn.biz/?p=jquery.git;a=blobdiff_plain;f=build%2Ftest%2Fdata%2Ftestrunner.js;h=25ffb3f27ba13d14081bb14a1b79877404e28285;hp=e73fd671d096d67d7dae09b57d9589066cd9b4b3;hb=2ef4093cf7f52383dd43bd361864edcda27e5c3c;hpb=c6a893b68001be9b9389de5e2c5ea58c1a28c742

diff --git a/build/test/data/testrunner.js b/build/test/data/testrunner.js
index e73fd67..25ffb3f 100644
--- a/build/test/data/testrunner.js
+++ b/build/test/data/testrunner.js
@@ -13,10 +13,10 @@ var _config = {
 	asyncTimeout: 2 // seconds for async timeout
 };
 
+var isLocal = !!(window.location.protocol == 'file:');
+
 $(function() {
 	$('#userAgent').html(navigator.userAgent);
-	if($.browser.safari)
-		$("h1").append(" - Slowed down for Safari to prevent crashes");
 	runTest();	
 });
 
@@ -41,13 +41,17 @@ function stop(allowFailure) {
 		ok( false, "Test timed out" );
 		start();
 	};
-	_config.timeout = setTimeout(handler, _config.asyncTimeout * 1000);
+	// Disabled, caused too many random errors
+	//_config.timeout = setTimeout(handler, _config.asyncTimeout * 1000);
 }
 function start() {
-	if(_config.timeout)
-		clearTimeout(_config.timeout);
-	_config.blocking = false;
-	process();
+	// A slight delay, to avoid any current callbacks
+	setTimeout(function(){
+		if(_config.timeout)
+			clearTimeout(_config.timeout);
+		_config.blocking = false;
+		process();
+	}, 13);
 }
 
 function runTest() {
@@ -66,17 +70,13 @@ function runTest() {
 }
 
 function test(name, callback, nowait) {
-	// safari seems to have some memory problems, so we need to slow it down
-	if($.browser.safari && !nowait) {
-		test("", function() {
-			stop();
-			setTimeout(start, 250);
-		}, true);
-	}
-
 	if(_config.currentModule)
 		name = _config.currentModule + " module: " + name;
 		
+	var filter = location.search.slice(1);
+	if ( filter && encodeURIComponent(name) != filter )
+		return;
+		
 	synchronize(function() {
 		_config.Test = [];
 		try {
@@ -122,7 +122,7 @@ function test(name, callback, nowait) {
 		var li = document.createElement("li");
 		li.className = state;
 	
-		var b = document.createElement("b");
+		var b = document.createElement("strong");
 		b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + _config.Test.length + ")</b>";
 		b.onclick = function(){
 			var n = this.nextSibling;
@@ -131,6 +131,13 @@ function test(name, callback, nowait) {
 			else
 				n.style.display = "none";
 		};
+		$(b).dblclick(function(event) {
+			var target = jQuery(event.target).filter("strong").clone();
+			if ( target.length ) {
+				target.children().remove();
+				location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent($.trim(target.text()));
+			}
+		});
 		li.appendChild( b );
 		li.appendChild( ol );
 	
@@ -170,19 +177,57 @@ function ok(a, msg) {
  */
 function isSet(a, b, msg) {
 	var ret = true;
-	if ( a && b && a.length == b.length ) {
-		for ( var i in a )
+	if ( a && b && a.length != undefined && a.length == b.length ) {
+		for ( var i = 0; i < a.length; i++ )
 			if ( a[i] != b[i] )
 				ret = false;
 	} else
 		ret = false;
 	if ( !ret )
-		_config.Test.push( [ ret, msg + " expected: " + b + " result: " + a ] );
+		_config.Test.push( [ ret, msg + " expected: " + serialArray(b) + " result: " + serialArray(a) ] );
 	else 
 		_config.Test.push( [ ret, msg ] );
 }
 
 /**
+ * Asserts that two objects are equivalent
+ */
+function isObj(a, b, msg) {
+	var ret = true;
+	
+	if ( a && b ) {
+		for ( var i in a )
+			if ( a[i] != b[i] )
+				ret = false;
+
+		for ( i in b )
+			if ( a[i] != b[i] )
+				ret = false;
+	} else
+		ret = false;
+
+    _config.Test.push( [ ret, msg ] );
+}
+
+function serialArray( a ) {
+	var r = [];
+	
+	if ( a && a.length )
+        for ( var i = 0; i < a.length; i++ ) {
+            var str = a[i].nodeName;
+            if ( str ) {
+                str = str.toLowerCase();
+                if ( a[i].id )
+                    str += "#" + a[i].id;
+            } else
+                str = a[i];
+            r.push( str );
+        }
+
+	return "[ " + r.join(", ") + " ]"
+}
+
+/**
  * Returns an array of elements with the given IDs, eg.
  * @example q("main", "foo", "bar")
  * @result [<div id="main">, <span id="foo">, <input id="bar">]
@@ -200,7 +245,7 @@ function q() {
  * @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar'
  */
 function t(a,b,c) {
-	var f = jQuery.find(b);
+	var f = jQuery(b);
 	var s = "";
 	for ( var i = 0; i < f.length; i++ )
 		s += (s && ",") + '"' + f[i].id + '"';
@@ -218,4 +263,41 @@ function t(a,b,c) {
  */
 function url(value) {
 	return value + (/\?/.test(value) ? "&" : "?") + new Date().getTime() + "" + parseInt(Math.random()*100000);
-}
\ No newline at end of file
+}
+
+/**
+ * Checks that the first two arguments are equal, with an optional message.
+ * Prints out both expected and actual values on failure.
+ *
+ * Prefered to ok( expected == actual, message )
+ *
+ * @example equals( "Expected 2 characters.", v.formatMessage("Expected {0} characters.", 2) );
+ *
+ * @param Object expected
+ * @param Object actual
+ * @param String message (optional)
+ */
+function equals(actual, expected, message) {
+	var result = expected == actual;
+	message = message || (result ? "okay" : "failed");
+	_config.Test.push( [ result, result ? message + ": " + expected : message + " expected: " + expected + " actual: " + actual ] );
+}
+
+/**
+ * Trigger an event on an element.
+ *
+ * @example triggerEvent( document.body, "click" );
+ *
+ * @param DOMElement elem
+ * @param String type
+ */
+function triggerEvent( elem, type, event ) {
+	if ( jQuery.browser.mozilla || jQuery.browser.opera ) {
+		event = document.createEvent("MouseEvents");
+		event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+			0, 0, 0, 0, 0, false, false, false, false, 0, null);
+		elem.dispatchEvent( event );
+	} else if ( jQuery.browser.msie ) {
+		elem.fireEvent("on"+type);
+	}
+}