X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=a0f3d49f2d4c5b4031eab9bde53fd138426b9779;hb=a13089d5b4af876a3184cdbc1850d3687a75332d;hp=2ded1277644e2ec9dd8728a55e4b1c186b2a3539;hpb=26db3f09331d0d69340d745a1e51d5e03a6eddb9;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 2ded127..a0f3d49 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -137,7 +137,7 @@ test(".load()) - 404 error callbacks", function() {
 });
 
 test("jQuery.ajax() - abort", function() {
-	expect( 6 );
+	expect( 8 );
 	stop();
 
 	jQuery('#foo').ajaxStart(function(){
@@ -157,7 +157,10 @@ test("jQuery.ajax() - abort", function() {
 		complete: function(){ ok(true, "complete"); }
 	});
 
+	equals( xhr.readyState, 1, "XHR readyState indicates successful dispatch" );
+
 	xhr.abort();
+	equals( xhr.readyState, 0, "XHR readyState indicates successful abortion" );
 });
 
 test("Ajax events with context", function() {
@@ -289,6 +292,32 @@ test("jQuery.ajax - xml: non-namespace elements inside namespaced elements", fun
 	});
 });
 
+test("jQuery.ajax - HEAD requests", function() {
+	expect(2);
+
+	stop();
+	jQuery.ajax({
+		url: url("data/name.html"),
+		type: "HEAD",
+		success: function(data, status, xhr){
+			var h = xhr.getAllResponseHeaders();
+			ok( /Date/i.test(h), 'No Date in HEAD response' );
+			
+			jQuery.ajax({
+				url: url("data/name.html"),
+				data: { whip_it: "good" },
+				type: "HEAD",
+				success: function(data, status, xhr){
+					var h = xhr.getAllResponseHeaders();
+					ok( /Date/i.test(h), 'No Date in HEAD response with data' );
+					start();
+				}
+			});
+		}
+	});
+	
+});
+
 test("jQuery.ajax - beforeSend", function() {
 	expect(1);
 	stop();
@@ -681,10 +710,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 });
 
 test("jQuery.ajax() - JSONP, Local", function() {
-	expect(8);
+	expect(9);
 
 	var count = 0;
-	function plus(){ if ( ++count == 8 ) start(); }
+	function plus(){ if ( ++count == 9 ) start(); }
 
 	stop();
 
@@ -799,6 +828,17 @@ test("jQuery.ajax() - JSONP, Local", function() {
 			plus();
 		}
 	});
+
+	//#7578
+	jQuery.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		beforeSend: function(){
+			strictEqual( this.cache, false, "cache must be false on JSON request" );
+			plus();
+			return false;
+		}
+	});
 });
 
 test("JSONP - Custom JSONP Callback", function() {
@@ -1318,9 +1358,19 @@ test("jQuery.ajax - Etag support", function() {
 });
 
 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 );
 });
 
+test( "jQuery.ajax - Location object as url (#7531)", 1, function () {
+	var success = false;
+	try {
+		var xhr = jQuery.ajax({ url: document.location });
+		success = true;
+		xhr.abort();
+	} catch (e) {}
+
+	ok( success, "document.location did not generate exception" );
+});
 
 }