From: Dan Heberden <danheberden@gmail.com>
Date: Tue, 1 Feb 2011 08:18:16 +0000 (-0800)
Subject: Improve $.ajax method signature unit test and placement
X-Git-Tag: 1.5.1rc1~75
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F219%2Fhead;p=jquery.git

Improve $.ajax method signature unit test and placement
---

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 25e021873..ad14d0a98 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -38,6 +38,21 @@ test("jQuery.ajax() - success 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() - success callbacks - (url, options) syntax", function() {
 	expect( 8 );
 
@@ -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