Ajax: HTTP 304 status code should not be treated as error.

This adds a test for issue madrobby#386.
HPZhang · Apr 9, 2012 · b8f4762 · b8f4762
1 parent 4e2690f
commit b8f4762
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/ajax.js b/src/ajax.js
@@ -192,7 +192,7 @@
       if (xhr.readyState == 4) {
         clearTimeout(abortTimeout)
         var result, error = false
-        if ((xhr.status >= 200 && xhr.status < 300) || (xhr.status == 0 && protocol == 'file:')) {
+        if ((xhr.status >= 200 && xhr.status < 300) || xhr.status == 304 || (xhr.status == 0 && protocol == 'file:')) {
           dataType = dataType || mimeToDataType(xhr.getResponseHeader('content-type'))
           result = xhr.responseText
 

diff --git a/test/ajax.html b/test/ajax.html
@@ -452,6 +452,17 @@ <h1>Zepto Ajax unit tests</h1>
         t.refute(errorFired)
       },
 
+      test304ResponseIsSuccess: function(t) {
+        var successFired, errorFired
+        $.ajax({
+          success: function() { successFired = true },
+          error: function() { errorFired = true }
+        })
+
+        MockXHR.last.ready(4, 304, 'Not Modified')
+        t.assert(successFired)
+        t.refute(errorFired)
+      },
       testXHRParameterInSuccessCallback: function(t) {
         var body, status, xhr
         $.ajax({