X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=61992706d59dbef8e17760f9706844b73a74b77b;hb=e63fa8beb8e285fe19fc0a1557045b80e3c63c66;hp=0464c7b5fbb9b72f31d144f2bcc61ee3fdcc2ab4;hpb=3c5b1ca03ba6ca8504e7ba1c61c4d639814f4233;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 0464c7b..6199270 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -14,30 +14,28 @@ test("jQuery.ajax() - success callbacks", function() {
 
 	stop();
 
-	setTimeout(function(){
-		jQuery('#foo').ajaxStart(function(){
-			ok( true, "ajaxStart" );
-		}).ajaxStop(function(){
-			ok( true, "ajaxStop" );
-			start();
-		}).ajaxSend(function(){
-			ok( true, "ajaxSend" );
-		}).ajaxComplete(function(){
-			ok( true, "ajaxComplete" );
-		}).ajaxError(function(){
-			ok( false, "ajaxError" );
-		}).ajaxSuccess(function(){
-			ok( true, "ajaxSuccess" );
-		});
+	jQuery('#foo').ajaxStart(function(){
+		ok( true, "ajaxStart" );
+	}).ajaxStop(function(){
+		ok( true, "ajaxStop" );
+		start();
+	}).ajaxSend(function(){
+		ok( true, "ajaxSend" );
+	}).ajaxComplete(function(){
+		ok( true, "ajaxComplete" );
+	}).ajaxError(function(){
+		ok( false, "ajaxError" );
+	}).ajaxSuccess(function(){
+		ok( true, "ajaxSuccess" );
+	});
 
-		jQuery.ajax({
-			url: url("data/name.html"),
-			beforeSend: function(){ ok(true, "beforeSend"); },
-			success: function(){ ok(true, "success"); },
-			error: function(){ ok(false, "error"); },
-			complete: function(){ ok(true, "complete"); }
-		});
-	}, 13);
+	jQuery.ajax({
+		url: url("data/name.html"),
+		beforeSend: function(){ ok(true, "beforeSend"); },
+		success: function(){ ok(true, "success"); },
+		error: function(){ ok(false, "error"); },
+		complete: function(){ ok(true, "complete"); }
+	});
 });
 
 test("jQuery.ajax() - error callbacks", function() {
@@ -70,6 +68,47 @@ test("jQuery.ajax() - error callbacks", function() {
 	});
 });
 
+test(".ajax() - hash", function() {
+	expect(3);
+
+	jQuery.ajax({
+		url: "data/name.html#foo",
+		beforeSend: function( xhr, settings ) {
+			equals(settings.url, "data/name.html", "Make sure that the URL is trimmed.");
+			return false;
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/name.html?abc#foo",
+		beforeSend: function( xhr, settings ) {
+			equals(settings.url, "data/name.html?abc", "Make sure that the URL is trimmed.");
+			return false;
+		}
+	});
+
+	jQuery.ajax({
+		url: "data/name.html?abc#foo",
+		data: { "test": 123 },
+		beforeSend: function( xhr, settings ) {
+			equals(settings.url, "data/name.html?abc&test=123", "Make sure that the URL is trimmed.");
+			return false;
+		}
+	});
+});
+
+test(".ajax() - 304", function() {
+	expect( 1 );
+	stop();
+
+	jQuery.ajax({
+		url: url("data/notmodified.php"),
+		success: function(){ ok(true, "304 ok"); },
+		error: function(){ ok(false, "304 not ok "); },
+		complete: function(xhr){ start(); }
+	});
+});
+
 test(".load()) - 404 error callbacks", function() {
 	expect( 6 );
 	stop();
@@ -351,7 +390,7 @@ test("serialize()", function() {
 });
 
 test("jQuery.param()", function() {
-	expect(19);
+	expect(22);
 	
 	equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" );
   
@@ -380,6 +419,11 @@ test("jQuery.param()", function() {
 	equals( jQuery.param(params,true), "a=1&a=2&b=%5Bobject+Object%5D&i=10&i=11&j=true&k=false&l=undefined&l=0&m=cowboy+hat%3F", "huge structure, forced traditional" );
 
 	equals( decodeURIComponent( jQuery.param({ a: [1,2,3], 'b[]': [4,5,6], 'c[d]': [7,8,9], e: { f: [10], g: [11,12], h: 13 } }) ), "a[]=1&a[]=2&a[]=3&b[]=4&b[]=5&b[]=6&c[d][]=7&c[d][]=8&c[d][]=9&e[f][]=10&e[g][]=11&e[g][]=12&e[h]=13", "Make sure params are not double-encoded." );
+
+	// Make sure empty arrays and objects are handled #6481
+	equals( jQuery.param({"foo": {"bar": []} }), "foo%5Bbar%5D=", "Empty array param" );
+	equals( jQuery.param({"foo": {"bar": [], foo: 1} }), "foo%5Bbar%5D=&foo%5Bfoo%5D=1", "Empty array param" );
+	equals( jQuery.param({"foo": {"bar": {}} }), "foo%5Bbar%5D=", "Empty object param" );
 	
 	jQuery.ajaxSetup({ traditional: true });
 	
@@ -776,7 +820,7 @@ test("jQuery.ajax() - JSONP, Remote", function() {
 	var count = 0;
 	function plus(){ if ( ++count == 4 ) start(); }
 
-	var base = window.location.href.replace(/\?.*$/, "");
+	var base = window.location.href.replace(/[^\/]*$/, "");
 
 	stop();
 
@@ -838,7 +882,7 @@ test("jQuery.ajax() - JSONP, Remote", function() {
 test("jQuery.ajax() - script, Remote", function() {
 	expect(2);
 
-	var base = window.location.href.replace(/\?.*$/, "");
+	var base = window.location.href.replace(/[^\/]*$/, "");
 
 	stop();
 
@@ -855,7 +899,7 @@ test("jQuery.ajax() - script, Remote", function() {
 test("jQuery.ajax() - script, Remote with POST", function() {
 	expect(3);
 
-	var base = window.location.href.replace(/\?.*$/, "");
+	var base = window.location.href.replace(/[^\/]*$/, "");
 
 	stop();
 
@@ -878,7 +922,7 @@ test("jQuery.ajax() - script, Remote with POST", function() {
 test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
 	expect(2);
 
-	var base = window.location.href.replace(/\?.*$/, "");
+	var base = window.location.href.replace(/[^\/]*$/, "");
 	base = base.replace(/^.*?\/\//, "//");
 
 	stop();
@@ -993,7 +1037,7 @@ test("jQuery.getJSON - Using Native JSON", function() {
 test("jQuery.getJSON(String, Function) - JSON object with absolute url to local content", function() {
 	expect(2);
 
-	var base = window.location.href.replace(/\?.*$/, "");
+	var base = window.location.href.replace(/[^\/]*$/, "");
 
 	stop();
 	jQuery.getJSON(url(base + "data/json.php"), function(json) {
@@ -1165,6 +1209,19 @@ test("data option: evaluate function values (#2806)", function() {
 	})
 });
 
+test("data option: empty bodies for non-GET requests", function() {
+	stop();
+	jQuery.ajax({
+		url: "data/echoData.php",
+		data: undefined,
+		type: "post",
+		success: function(result) {
+			equals( result, "" );
+			start();
+		}
+	})
+});
+
 test("jQuery.ajax - If-Modified-Since support", function() {
 	expect( 3 );
 
@@ -1190,8 +1247,16 @@ test("jQuery.ajax - If-Modified-Since support", function() {
 						ok(data == null, "response body should be empty")
 					}
 					start();
+				},
+				error: function() {
+					equals(false, "error");
+					start();
 				}
 			});
+		},
+		error: function() {
+			equals(false, "error");
+			start();
 		}
 	});
 });
@@ -1221,12 +1286,25 @@ test("jQuery.ajax - Etag support", function() {
 						ok(data == null, "response body should be empty")
 					}
 					start();
+				},
+				error: function() {
+					equals(false, "error");
+					start();
 				}
 			});
+		},
+		error: function() {
+			equals(false, "error");
+			start();
 		}
 	});
 });
 
+test("jQuery.ajax - active counter", function() {
+    ok( jQuery.ajax.active == 0, "ajax active counter should be zero: " + jQuery.ajax.active );
+});
+
+
 }
 
 //}