X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=49196cbbb17cae6b40642e12a0856dd627006e61;hb=8ab23aec2c333834a6e442fa15b73125ba857afe;hp=c7803f857acb5bf6c40448683b4a1fcac0ec385a;hpb=6504d4f7005c99ea4064068f3d712322a064b97a;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index c7803f8..49196cb 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -276,7 +276,7 @@ test(".ajax() - retry with jQuery.ajax( this )", function() {
 				start();
 			}
 		}
-	})
+	});
 
 });
 
@@ -1115,10 +1115,10 @@ test("jQuery.getScript(String, Function) - no callback", function() {
 });
 
 test("jQuery.ajax() - JSONP, Local", function() {
-	expect(10);
+	expect(14);
 
 	var count = 0;
-	function plus(){ if ( ++count == 10 ) start(); }
+	function plus(){ if ( ++count == 14 ) start(); }
 
 	stop();
 
@@ -1163,6 +1163,59 @@ test("jQuery.ajax() - JSONP, Local", function() {
 	});
 
 	jQuery.ajax({
+		url: "data/jsonp.php?callback=??",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, url context-free callback)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, url context-free callback)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		data: "callback=??",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, data context-free callback)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, data context-free callback)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php/??",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, REST-like)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, REST-like)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/jsonp.php/???json=1",
+		dataType: "jsonp",
+		success: function(data){
+			strictEqual( jQuery.type(data), "array", "JSON results returned (GET, REST-like with param)" );
+			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, REST-like with param)" );
+			plus();
+		}
+	});
+
+	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",
 		data: {
@@ -1812,25 +1865,19 @@ test("jQuery ajax - failing cross-domain", function() {
 
 	var i = 2;
 
-	if ( jQuery.ajax({
+	jQuery.ajax({
 		url: 'http://somewebsitethatdoesnotexist-67864863574657654.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "file not found: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
-	}) === false ) {
-		ok( true , "no transport" );
-		if ( ! --i ) start();
-	}
+	});
 
-	if ( jQuery.ajax({
+	jQuery.ajax({
 		url: 'http://www.google.com',
 		success: function(){ ok( false , "success" ); },
 		error: function(xhr,_,e){ ok( true , "access denied: " + xhr.status + " => " + e ); },
 		complete: function() { if ( ! --i ) start(); }
-	}) === false ) {
-		ok( true , "no transport" );
-		if ( ! --i ) start();
-	}
+	});
 
 });
 
@@ -1862,6 +1909,76 @@ test( "jQuery.ajax - Location object as url (#7531)", 1, function () {
 	ok( success, "document.location did not generate exception" );
 });
 
+test( "jQuery.ajax - statusCode" , function() {
+
+	var count = 10;
+
+	expect( 16 );
+	stop();
+
+	function countComplete() {
+		if ( ! --count ) {
+			start();
+		}
+	}
+
+	function createStatusCodes( name , isSuccess ) {
+		name = "Test " + name + " " + ( isSuccess ? "success" : "error" );
+		return {
+			200: function() {
+				ok( isSuccess , name );
+			},
+			404: function() {
+				ok( ! isSuccess , name );
+			}
+		};
+	}
+
+	jQuery.each( {
+		"data/name.html": true,
+		"data/someFileThatDoesNotExist.html": false
+	} , function( uri , isSuccess ) {
+
+		jQuery.ajax( url( uri ) , {
+			statusCode: createStatusCodes( "in options" , isSuccess ),
+			complete: countComplete
+		});
+
+		jQuery.ajax( url( uri ) , {
+			complete: countComplete
+		}).statusCode( createStatusCodes( "immediately with method" , isSuccess ) );
+
+		jQuery.ajax( url( uri ) , {
+			complete: function(jXHR) {
+				jXHR.statusCode( createStatusCodes( "on complete" , isSuccess ) );
+				countComplete();
+			}
+		});
+
+		jQuery.ajax( url( uri ) , {
+			complete: function(jXHR) {
+				setTimeout( function() {
+					jXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) );
+					countComplete();
+				} , 100 );
+			}
+		});
+
+		jQuery.ajax( url( uri ) , {
+			statusCode: createStatusCodes( "all (options)" , isSuccess ),
+			complete: function(jXHR) {
+				jXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) );
+				setTimeout( function() {
+					jXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) );
+					countComplete();
+				} , 100 );
+			}
+		}).statusCode( createStatusCodes( "all (immediately with method)" , isSuccess ) );
+
+	});
+
+});
+
 }
 
 //}
\ No newline at end of file