X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2FajaxTest.js;h=851be5163d1dd49865dc5a75cf83e9741844f5ba;hb=13d2ef9282db6be4a0030ce1319948410f0bd2b6;hp=23a76fd49c74297735d853654939866b5ac395f8;hpb=32f688d303ed3cbb942df421c5bb2ed7a5d5244c;p=jquery.git

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index 23a76fd..851be51 100644
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -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();
+		}
+	});
+});
+
 }