X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=5704d73e0deddbb912e51d8988fe9b01b0462455;hb=f3d610e06499192509f482dbb72a1edf861827e0;hp=85c7380d71b0965c1017e06f3918511a9e80af95;hpb=57c046f91cbc3caf174ecc993fe883c027340901;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 85c7380..5704d73 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -104,7 +104,10 @@ test(".ajax() - 304", function() {
 	jQuery.ajax({
 		url: url("data/notmodified.php"),
 		success: function(){ ok(true, "304 ok"); },
-		error: function(){ ok(false, "304 not 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(); }
 	});
 });
@@ -1249,13 +1252,20 @@ test("jQuery.ajax - If-Modified-Since support", function() {
 					start();
 				},
 				error: function() {
-					equals(false, "error");
+					// 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
+					ok(jQuery.browser.opera, "error");
+					ok(jQuery.browser.opera, "error");
 					start();
 				}
 			});
 		},
 		error: function() {
-			equals(false, "error");
+			// 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
+			ok(jQuery.browser.opera, "error");
 			start();
 		}
 	});
@@ -1288,20 +1298,27 @@ test("jQuery.ajax - Etag support", function() {
 					start();
 				},
 				error: function() {
-					equals(false, "error");
+					// 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
+					ok(jQuery.browser.opera, "error");
+					ok(jQuery.browser.opera, "error");
 					start();
 				}
 			});
 		},
 		error: function() {
-			equals(false, "error");
+			// 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
+			ok(jQuery.browser.opera, "error");
 			start();
 		}
 	});
 });
 
 test("jQuery.ajax - active counter", function() {
-    ok( jQuery.ajax.active == 0, "ajax active counter should be zero: " + jQuery.ajax.active );
+    ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
 });