X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=3041834751d375679170959975c99778cde9a610;hb=cb49b4a1b648dea8ce5b1e5dbb2ab5432a84cb63;hp=25e0218737133eab3b9be72e414cc65667aba517;hpb=31949fa528141dad4b92851212677b039cb23cfb;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 25e0218..3041834 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -240,6 +240,21 @@ test("jQuery.ajax() - error callbacks", function() {
 	});
 });
 
+test( "jQuery.ajax - multiple method signatures introduced in 1.5 ( #8107)", function() {
+
+	expect( 4 );
+
+	stop();
+
+	jQuery.when(
+		jQuery.ajax().success(function() { ok( true, 'With no arguments' ); }),
+		jQuery.ajax('data/name.html').success(function() { ok( true, 'With only string URL argument' ); }),
+		jQuery.ajax('data/name.html', {} ).success(function() { ok( true, 'With string URL param and map' ); }),
+		jQuery.ajax({ url: 'data/name.html'} ).success(function() { ok( true, 'With only map' ); })
+	).then( start, start );
+
+});
+
 test("jQuery.ajax() - textStatus and errorThrown values", function() {
 
 	var nb = 2;
@@ -296,7 +311,7 @@ test("jQuery.ajax() - responseText on error", function() {
 	jQuery.ajax({
 		url: url("data/errorWithText.php"),
 		error: function(xhr) {
-			strictEqual( xhr.responseText , "plain text message" , "Test jXHR.responseText is filled for HTTP errors" );
+			strictEqual( xhr.responseText , "plain text message" , "Test jqXHR.responseText is filled for HTTP errors" );
 		},
 		complete: function() {
 			start();
@@ -1203,9 +1218,9 @@ test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", f
 test("jQuery.getScript(String, Function) - with callback", function() {
 	expect(3);
 	stop();
-	jQuery.getScript(url("data/test.js"), function( data, _, jXHR ) {
+	jQuery.getScript(url("data/test.js"), function( data, _, jqXHR ) {
 		equals( foobar, "bar", 'Check if script was evaluated' );
-		strictEqual( data, jXHR.responseText, "Same-domain script requests returns the source of the script (#8082)" );
+		strictEqual( data, jqXHR.responseText, "Same-domain script requests returns the source of the script (#8082)" );
 		setTimeout(start, 100);
 	});
 });
@@ -1379,8 +1394,8 @@ jQuery.each( [ "Same Domain", "Cross Domain" ] , function( crossDomain , label )
 					dataType: "jsonp",
 					crossDomain: crossDomain,
 					jsonpCallback: "functionToCleanUp",
-					beforeSend: function( jXHR ) {
-						xhr = jXHR;
+					beforeSend: function( jqXHR ) {
+						xhr = jqXHR;
 						return false;
 					}
 				});
@@ -2057,16 +2072,16 @@ test( "jQuery.ajax - statusCode" , function() {
 		}).statusCode( createStatusCodes( "immediately with method" , isSuccess ) );
 
 		jQuery.ajax( url( uri ) , {
-			complete: function(jXHR) {
-				jXHR.statusCode( createStatusCodes( "on complete" , isSuccess ) );
+			complete: function(jqXHR) {
+				jqXHR.statusCode( createStatusCodes( "on complete" , isSuccess ) );
 				countComplete();
 			}
 		});
 
 		jQuery.ajax( url( uri ) , {
-			complete: function(jXHR) {
+			complete: function(jqXHR) {
 				setTimeout( function() {
-					jXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) );
+					jqXHR.statusCode( createStatusCodes( "very late binding" , isSuccess ) );
 					countComplete();
 				} , 100 );
 			}
@@ -2074,10 +2089,10 @@ test( "jQuery.ajax - statusCode" , function() {
 
 		jQuery.ajax( url( uri ) , {
 			statusCode: createStatusCodes( "all (options)" , isSuccess ),
-			complete: function(jXHR) {
-				jXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) );
+			complete: function(jqXHR) {
+				jqXHR.statusCode( createStatusCodes( "all (on complete)" , isSuccess ) );
 				setTimeout( function() {
-					jXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) );
+					jqXHR.statusCode( createStatusCodes( "all (very late binding)" , isSuccess ) );
 					countComplete();
 				} , 100 );
 			}
@@ -2086,22 +2101,22 @@ test( "jQuery.ajax - statusCode" , function() {
 		var testString = "";
 
 		jQuery.ajax( url( uri ), {
-			success: function( a , b , jXHR ) {
+			success: function( a , b , jqXHR ) {
 				ok( isSuccess , "success" );
 				var statusCode = {};
-				statusCode[ jXHR.status ] = function() {
+				statusCode[ jqXHR.status ] = function() {
 					testString += "B";
 				};
-				jXHR.statusCode( statusCode );
+				jqXHR.statusCode( statusCode );
 				testString += "A";
 			},
-			error: function( jXHR ) {
+			error: function( jqXHR ) {
 				ok( ! isSuccess , "error" );
 				var statusCode = {};
-				statusCode[ jXHR.status ] = function() {
+				statusCode[ jqXHR.status ] = function() {
 					testString += "B";
 				};
-				jXHR.statusCode( statusCode );
+				jqXHR.statusCode( statusCode );
 				testString += "A";
 			},
 			complete: function() {
@@ -2161,25 +2176,6 @@ test("jQuery.ajax - active counter", function() {
     ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
 });
 
-test( "jQuery.ajax - multiple method signatures introduced in 1.5 ( #8107)", 4, function() {
-	
-	expect( 3 );
-	
-	var i = 3;
-	
-	jQuery.ajaxSetup({success: function() { 
-		ok( true, "Success");
-		if ( ! --i ) start(); 
-	}});
-	
-	stop();
-	jQuery.ajax('data/name.html');
-	jQuery.ajax('data/name.html', {} );
-    jQuery.ajax({ url: 'data/name.html'} );	
-
-	jQuery.ajaxSetup({ success: null });
-});
-
 }
 
 //}
\ No newline at end of file