X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fajax%2FajaxTest.js;h=1cd072f9ab053c40fcb0563db36e0b893c322596;hb=98b1b580c7298c1ced00f9ec4d65452b4d559da7;hp=ad705a10c727eb8f1ef073311f0fd8d48f7022f7;hpb=898ca3198b3297f68eb77ad128450ad8f952e15e;p=jquery.git

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index ad705a1..1cd072f 100644
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -24,7 +24,7 @@ test("param", function() {
 
 test("pass-through request object", function() {
 	expect(7);
-	stop();
+	stop(true);
 	var count = 0;
 	var success = function() {
 		if(count++ == 6)
@@ -43,6 +43,12 @@ test("synchronous request", function() {
 	ok( /^{ "data"/.test( $.ajax({url: "data/json.php", async: false}).responseText ), "check returned text" );
 });
 
+test("synchronous request with callbacks", function() {
+	var result;
+	$.ajax({url: "data/json.php", async: false, success: function(data) { result = data; } });
+	ok( /^{ "data"/.test( result ), "check returned text" );
+});
+
 test("load(String, Object, Function) - simple: inject text into DOM", function() {
 	expect(2);
 	stop();
@@ -54,7 +60,7 @@ test("load(String, Object, Function) - simple: inject text into DOM", function()
 
 test("load(String, Object, Function) - inject without callback", function() {
 	expect(1);
-	stop(); // check if load can be called with only url
+	stop(true); // check if load can be called with only url
 	$('#first').load("data/name.php");
 });
 
@@ -164,7 +170,7 @@ test("$.getScript(String, Function) - with callback", function() {
 
 test("$.getScript(String, Function) - no callback", function() {
 	expect(1);
-	stop();
+	stop(true);
 	$.getScript("data/test.js");
 });
 
@@ -228,6 +234,8 @@ test("$.ajaxTimeout(Number) - with global timeout", function() {
 	  error: pass,
 	  success: fail
 	});
+	// reset timeout
+	$.ajaxTimeout(0);
 });
 
 test("$.ajaxTimeout(Number) with localtimeout", function() {
@@ -311,15 +319,15 @@ test("$.ajax - xml: non-namespace elements inside namespaced elements", function
 test("$.ajax - beforeSend", function() {
 	expect(1);
 	stop();
-	var customHeader = "value";
+	var check = false;
 	$.ajax({
 		url: "data/name.php", 
 		data: {'req': true},
 		beforeSend: function(xml) {
-			xml.setRequestHeader('X-Custom-Header', customHeader);
+			check = true
 		},
 		success: function(data) {
-			ok( data == customHeader, "check return value, should be the custom header sent" );
+			ok( check, "check beforeSend was executed" );
 			start();
 		}
 	});