X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=sidebyside;f=test%2Funit%2Fajax.js;h=be4b3f0219b656356737aaf6eb6598f03de46864;hb=1ba2df02d6242d734297344a85b7bea3788a0671;hp=f6809d539e5ded464c952946099f44dd9001978e;hpb=ca90ffb332eafc93b8107aeb2afa7473132392fd;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index f6809d5..be4b3f0 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() {
@@ -351,9 +349,9 @@ test("serialize()", function() {
 });
 
 test("jQuery.param()", function() {
-	expect(18);
+	expect(19);
 	
-  equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" );
+	equals( !jQuery.ajaxSettings.traditional, true, "traditional flag, falsy by default" );
   
 	var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
 	equals( jQuery.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" );
@@ -378,6 +376,8 @@ test("jQuery.param()", function() {
 	
 	params = { a:[1,2], b:{ c:3, d:[4,5], e:{ x:[6], y:7, z:[8,9] }, f:true, g:false, h:undefined }, i:[10,11], j:true, k:false, l:[undefined,0], m:"cowboy hat?" };
 	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." );
 	
 	jQuery.ajaxSetup({ traditional: true });
 	
@@ -774,7 +774,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();
 
@@ -836,7 +836,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();
 
@@ -853,7 +853,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();
 
@@ -876,7 +876,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();
@@ -991,7 +991,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) {