X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2FajaxTest.js;h=851be5163d1dd49865dc5a75cf83e9741844f5ba;hb=f025ed878bcf610971f294fd931edfe30aa18a9e;hp=7785a97a9b34f5b630c798143156f5e4da6bd43a;hpb=12e63353391f1a556a73fe92bcd8e5f0ac277726;p=jquery.git

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index 7785a97..851be51 100644
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -70,8 +70,8 @@ test("load(String, Object, Function) - inject without callback", function() {
 test("load(String, Object, Function) - check scripts", function() {
 	expect(7);
 	stop();
-	testFoo = undefined;
-	foobar = null;
+	window.testFoo = undefined;
+	window.foobar = null;
 	var verifyEvaluation = function() {
 	  ok( foobar == "bar", 'Check if script src was evaluated after load' );
 	  ok( $('#ap').html() == 'bar', 'Check if script evaluation has modified DOM');
@@ -379,4 +379,17 @@ test("evalScripts() with no script elements", function() {
     ok ( true, 'after evalScripts()');
 });
 
+test("custom timeout does not set error message when timeout occurs, see #970", function() {
+	stop();
+	$.ajax({
+		url: "data/name.php?wait=10",
+		timeout: 500,
+		error: function(request, status) {
+			ok( status != null, "status shouldn't be null in error handler" );
+			equals( "timeout", status );
+			start();
+		}
+	});
+});
+
 }