X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Fdata%2Ftestrunner.js;h=d4fdcf50f06a95797e1f276569a61e388d13c49e;hb=31f22f244be7c37cc7a22f390d3483c9680b6b58;hp=bdb938c40781f6ac208efc9bf3f4ea29f6eeb057;hpb=d726a96b1f5008f29097f1efbea9a987015af641;p=jquery.git

diff --git a/test/data/testrunner.js b/test/data/testrunner.js
index bdb938c..d4fdcf5 100644
--- a/test/data/testrunner.js
+++ b/test/data/testrunner.js
@@ -81,6 +81,7 @@ function runTest() {
 	_config.blocking = false;
 	var time = new Date();
 	_config.fixture = document.getElementById('main').innerHTML;
+	_config.ajaxSettings = $.ajaxSettings;
 	synchronize(function() {
 		time = new Date() - time;
 		$("<div>").html(['<p class="result">Tests completed in ',
@@ -109,7 +110,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() {
@@ -185,6 +186,7 @@ function expect(asserts) {
 function reset() {
 	$("#main").html( _config.fixture );
 	$.event.global = {};
+	$.ajaxSettings = $.extend({}, _config.ajaxSettings);
 }
 
 /**