X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=9f46c4134aa1b185a5357d22b935d2ac79a0d8c5;hb=84319aa4a32c1221110419cbe9e427dc9e184555;hp=270d32f8b314438f9e176a27ce53ac69b6763c2f;hpb=eed3803c98bf5c074e40aad12f2e91435bf81154;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 270d32f..9f46c41 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -135,7 +135,7 @@ test("jQuery.ajax() - success callbacks (oncomplete binding)", function() {
 				.error(function(){ ok(false, "error"); })
 				.complete(function(){ start(); });
 			}
-		})
+		});
 	}, 13);
 });
 
@@ -173,7 +173,7 @@ test("jQuery.ajax() - success callbacks (very late binding)", function() {
 					.complete(function(){ start(); });
 				},100);
 			}
-		})
+		});
 	}, 13);
 });
 
@@ -240,6 +240,46 @@ test("jQuery.ajax() - error callbacks", function() {
 	});
 });
 
+test("jQuery.ajax() - responseText on error", function() {
+
+	expect( 1 );
+
+	stop();
+
+	jQuery.ajax({
+		url: url("data/errorWithText.php"),
+		error: function(xhr) {
+			strictEqual( xhr.responseText , "plain text message" , "Test jXHR.responseText is filled for HTTP errors" );
+		},
+		complete: function() {
+			start();
+		}
+	});
+});
+
+test(".ajax() - retry with jQuery.ajax( this )", function() {
+
+	expect( 1 );
+
+	stop();
+
+	var firstTime = 1;
+
+	jQuery.ajax({
+		url: url("data/errorWithText.php"),
+		error: function() {
+			if ( firstTime ) {
+				firstTime = 0;
+				jQuery.ajax( this );
+			} else {
+				ok( true , "Test retrying with jQuery.ajax(this) works" );
+				start();
+			}
+		}
+	})
+
+});
+
 test(".ajax() - headers" , function() {
 
 	expect( 2 );
@@ -276,6 +316,42 @@ test(".ajax() - headers" , function() {
 
 });
 
+test(".ajax() - contentType" , function() {
+
+	expect( 2 );
+
+	stop();
+
+	var count = 2;
+
+	function restart() {
+		if ( ! --count ) {
+			start();
+		}
+	}
+
+	jQuery.ajax(url("data/headers.php?keys=content-type" ), {
+		contentType: "test",
+		success: function( data ) {
+			strictEqual( data , "content-type: test\n" , "Test content-type is sent when options.contentType is set" );
+		},
+		complete: function() {
+			restart();
+		}
+	});
+
+	jQuery.ajax(url("data/headers.php?keys=content-type" ), {
+		contentType: false,
+		success: function( data ) {
+			strictEqual( data , "content-type: \n" , "Test content-type is not sent when options.contentType===false" );
+		},
+		complete: function() {
+			restart();
+		}
+	});
+
+});
+
 test(".ajax() - hash", function() {
 	expect(3);
 
@@ -305,6 +381,53 @@ test(".ajax() - hash", function() {
 	});
 });
 
+test("jQuery ajax - cross-domain detection", function() {
+
+	expect( 4 );
+
+	var loc = document.location,
+		otherPort = loc.port === 666 ? 667 : 666,
+		otherProtocol = loc.protocol === "http:" ? "https:" : "http:";
+
+	jQuery.ajax({
+		dataType: "jsonp",
+		url: otherProtocol + "//" + loc.host,
+		beforeSend: function( _ , s ) {
+			ok( s.crossDomain , "Test different protocols are detected as cross-domain" );
+			return false;
+		}
+	});
+
+	jQuery.ajax({
+		dataType: "jsonp",
+		url: loc.protocol + '//somewebsitethatdoesnotexist-656329477541.com:' + ( loc.port || 80 ),
+		beforeSend: function( _ , s ) {
+			ok( s.crossDomain , "Test different hostnames are detected as cross-domain" );
+			return false;
+		}
+	});
+
+	jQuery.ajax({
+		dataType: "jsonp",
+		url: loc.protocol + "//" + loc.hostname + ":" + otherPort,
+		beforeSend: function( _ , s ) {
+			ok( s.crossDomain , "Test different ports are detected as cross-domain" );
+			return false;
+		}
+	});
+
+	jQuery.ajax({
+		dataType: "jsonp",
+		url: loc.protocol + "//" + loc.host,
+		crossDomain: true,
+		beforeSend: function( _ , s ) {
+			ok( s.crossDomain , "Test forced crossDomain is detected as cross-domain" );
+			return false;
+		}
+	});
+
+});
+
 test(".ajax() - 304", function() {
 	expect( 1 );
 	stop();
@@ -438,7 +561,7 @@ test("jQuery.ajax context modification", function() {
 
 	stop();
 
-	var obj = {}
+	var obj = {};
 
 	jQuery.ajax({
 		url: url("data/name.html"),
@@ -958,10 +1081,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 });
 
 test("jQuery.ajax() - JSONP, Local", function() {
-	expect(9);
+	expect(10);
 
 	var count = 0;
-	function plus(){ if ( ++count == 9 ) start(); }
+	function plus(){ if ( ++count == 10 ) start(); }
 
 	stop();
 
@@ -1008,6 +1131,22 @@ test("jQuery.ajax() - JSONP, Local", function() {
 	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",
+		data: {
+			callback: "?"
+		},
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, processed data callback)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, processed data callback)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
 		jsonp: "callback",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, data obj callback)" );
@@ -1522,7 +1661,7 @@ test("data option: evaluate function values (#2806)", function() {
 			equals( result, "key=value" );
 			start();
 		}
-	})
+	});
 });
 
 test("data option: empty bodies for non-GET requests", function() {
@@ -1535,7 +1674,7 @@ test("data option: empty bodies for non-GET requests", function() {
 			equals( result, "" );
 			start();
 		}
-	})
+	});
 });
 
 test("jQuery.ajax - If-Modified-Since support", function() {
@@ -1560,7 +1699,7 @@ test("jQuery.ajax - If-Modified-Since support", function() {
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-Modified-Since').");
 					} else {
 						equals(status, "notmodified");
-						ok(data == null, "response body should be empty")
+						ok(data == null, "response body should be empty");
 					}
 					start();
 		        },
@@ -1607,7 +1746,7 @@ test("jQuery.ajax - Etag support", function() {
 						ok(true, "Opera is incapable of doing .setRequestHeader('If-None-Match').");
 					} else {
 						equals(status, "notmodified");
-						ok(data == null, "response body should be empty")
+						ok(data == null, "response body should be empty");
 					}
 					start();
 		        },
@@ -1638,7 +1777,7 @@ test("jQuery ajax - failing cross-domain", function() {
 	stop();
 
 	var i = 2;
-	
+
 	if ( jQuery.ajax({
 		url: 'http://somewebsitethatdoesnotexist-67864863574657654.com',
 		success: function(){ ok( false , "success" ); },
@@ -1648,7 +1787,7 @@ test("jQuery ajax - failing cross-domain", function() {
 		ok( true , "no transport" );
 		if ( ! --i ) start();
 	}
-	
+
 	if ( jQuery.ajax({
 		url: 'http://www.google.com',
 		success: function(){ ok( false , "success" ); },
@@ -1658,7 +1797,7 @@ test("jQuery ajax - failing cross-domain", function() {
 		ok( true , "no transport" );
 		if ( ! --i ) start();
 	}
-	
+
 });
 
 test("jQuery ajax - atom+xml", function() {