Remove an invalid ajax test and some code that is no longer used by any test.

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

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index b810313..c2d5729 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -524,21 +524,6 @@ test("jQuery ajax - cross-domain detection", function() {
 
 });
 
-test(".ajax() - 304", function() {
-       expect( 1 );
-       stop();
-
-       jQuery.ajax({
-               url: url("data/notmodified.php"),
-               success: function(){ ok(true, "304 ok"); },
-               // Do this because opera simply refuses to implement 304 handling :(
-               // A feature-driven way of detecting this would be appreciated
-               // See: http://gist.github.com/599419
-               error: function(){ ok(jQuery.browser.opera, "304 not ok "); },
-               complete: function(xhr){ start(); }
-       });
-});
-
 test(".load()) - 404 error callbacks", function() {
        expect( 6 );
        stop();
@@ -2177,6 +2162,25 @@ test("jQuery.ajax - transitive conversions", function() {
 
 });
 
+test("jQuery.ajax - abort in prefilter", function() {
+
+       expect( 1 );
+
+       jQuery.ajaxPrefilter(function( options, _, jqXHR ) {
+               if ( options.abortInPrefilter ) {
+                       jqXHR.abort();
+               }
+       });
+
+       strictEqual( jQuery.ajax({
+               abortInPrefilter: true,
+               error: function() {
+                       ok( false, "error callback called" );
+               }
+       }), false, "Request was properly aborted early by the prefilter" );
+
+});
+
 test("jQuery.ajax - active counter", function() {
     ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
 });