Exaggerate the times for the localtimeout ajax test.

[jquery.git] / test / unit / ajax.js

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index fbff2d8..2a6bc32 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -787,7 +787,7 @@ test("jQuery.ajaxSetup({timeout: Number}) with localtimeout", function() {
 
        jQuery.ajax({
          type: "GET",
-         timeout: 5000,
+         timeout: 15000,
          url: url("data/name.php?wait=1"),
          error: function() {
                   ok( false, 'Check for local timeout failed' );
@@ -874,6 +874,68 @@ test("data option: evaluate function values (#2806)", function() {
        })
 });
 
+test("jQuery.ajax - If-Modified-Since support", function() {
+       expect( 3 );
+
+       stop();
+
+       var url = "data/if_modified_since.php?ts=" + new Date();
+
+       jQuery.ajax({
+               url: url,
+               ifModified: true,
+               success: function(data, status) { 
+                       equals(status, "success");
+                       
+                       jQuery.ajax({
+                               url: url,
+                               ifModified: true,
+                               success: function(data, status) { 
+                                       if ( data === "FAIL" ) {
+                                               ok(true, "Opera is incapable of doing .setRequestHeader('If-Modified-Since').");
+                                               ok(true, "Opera is incapable of doing .setRequestHeader('If-Modified-Since').");
+                                       } else {
+                                               equals(status, "notmodified");
+                                               ok(data == null, "response body should be empty")
+                                       }
+                                       start();
+                               }
+                       });
+               }
+       });
+});
+
+test("jQuery.ajax - Etag support", function() {
+       expect( 3 );
+
+       stop();
+
+       var url = "data/etag.php?ts=" + new Date();
+
+       jQuery.ajax({
+               url: url,
+               ifModified: true,
+               success: function(data, status) { 
+                       equals(status, "success");
+                       
+                       jQuery.ajax({
+                               url: url,
+                               ifModified: true,
+                               success: function(data, status) { 
+                                       if ( data === "FAIL" ) {
+                                               ok(true, "Opera is incapable of doing .setRequestHeader('If-None-Match').");
+                                               ok(true, "Opera is incapable of doing .setRequestHeader('If-None-Match').");
+                                       } else {
+                                               equals(status, "notmodified");
+                                               ok(data == null, "response body should be empty")
+                                       }
+                                       start();
+                               }
+                       });
+               }
+       });
+});
+
 }
 
 //}