X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Fdata%2Ftestrunner.js;h=821799bbf5251028bdf9c9b4714f48235b65324f;hb=9e48649729a5d4cd9ce52bcba067ba33a562cb4b;hp=c1114a5969b8190fc6f3d86c7346e60f51c5e9ea;hpb=ba391eccf9ab50056e2126f712741537d27fe1c9;p=jquery.git

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index c1114a5..821799b 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -1,3 +1,5 @@
+jQuery.noConflict(); // Allow the test to run with other libs or jQuery's.
+
 var _config = {
 	fixture: null,
 	Test: [],
@@ -14,12 +16,12 @@ var _config = {
 };
 
 _config.filters = location.search.length > 1 && //restrict modules/tests by get parameters
-		$.map( location.search.slice(1).split('&'), decodeURIComponent );
+		jQuery.map( location.search.slice(1).split('&'), decodeURIComponent );
 
 var isLocal = !!(window.location.protocol == 'file:');
 
-$(function() {
-	$('#userAgent').html(navigator.userAgent);
+jQuery(function() {
+	jQuery('#userAgent').html(navigator.userAgent);
 	runTest();	
 });
 
@@ -81,14 +83,15 @@ function runTest() {
 	_config.blocking = false;
 	var time = new Date();
 	_config.fixture = document.getElementById('main').innerHTML;
+	_config.ajaxSettings = jQuery.ajaxSettings;
 	synchronize(function() {
 		time = new Date() - time;
-		$("<div>").html(['<p class="result">Tests completed in ',
+		jQuery("<div>").html(['<p class="result">Tests completed in ',
 			time, ' milliseconds.<br/>',
 			_config.stats.bad, ' tests of ', _config.stats.all, ' failed.</p>']
 			.join(''))
 			.appendTo("body");
-		$("#banner").addClass(_config.stats.bad ? "fail" : "pass");
+		jQuery("#banner").addClass(_config.stats.bad ? "fail" : "pass");
 	});
 }
 
@@ -109,7 +112,7 @@ function test(name, callback, nowait) {
 				console.error(e);
 				console.warn(callback.toString());
 			}
-			_config.Test.push( [ false, "Died on test #" + (_config.Test.length+1) + ": " + e ] );
+			_config.Test.push( [ false, "Died on test #" + (_config.Test.length+1) + ": " + e.message ] );
 		}
 	});
 	synchronize(function() {
@@ -153,11 +156,11 @@ function test(name, callback, nowait) {
 			else
 				n.style.display = "none";
 		};
-		$(b).dblclick(function(event) {
+		jQuery(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()));
+				location.href = location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(jQuery.trim(target.text()));
 			}
 		});
 		li.appendChild( b );
@@ -183,12 +186,14 @@ function expect(asserts) {
  * Resets the test setup. Useful for tests that modify the DOM.
  */
 function reset() {
-	$("#main").html( _config.fixture );
+	jQuery("#main").html( _config.fixture );
+	jQuery.event.global = {};
+	jQuery.ajaxSettings = jQuery.extend({}, _config.ajaxSettings);
 }
 
 /**
  * Asserts true.
- * @example ok( $("a").size() > 5, "There must be at least 5 anchors" );
+ * @example ok( jQuery("a").size() > 5, "There must be at least 5 anchors" );
  */
 function ok(a, msg) {
 	_config.Test.push( [ !!a, msg ] );