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

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index 98f7cfc..1cd072f 100644
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -22,6 +22,33 @@ test("param", function() {
 	ok( $.param(params) == "foo[bar]=baz&foo[beep]=42&foo[quux]=All%20your%20base%20are%20belong%20to%20us", "even more arrays" );
 });
 
+test("pass-through request object", function() {
+	expect(7);
+	stop(true);
+	var count = 0;
+	var success = function() {
+		if(count++ == 6)
+			start();
+	}
+	var url = "data/name.php";
+	ok( $.get(url, success), "get" );
+	ok( $.getIfModified(url, success), "getIfModified" );
+	ok( $.post(url, success), "post" );
+	ok( $.getScript("data/test.js", success), "script" );
+	ok( $.getJSON("data/json.php", success), "json" );
+	ok( $.ajax({url: url, success: success}), "generic" );
+});
+
+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();
@@ -33,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");
 });
 
@@ -55,47 +82,55 @@ test("load(String, Object, Function) - check scripts", function() {
 });
 
 test("test global handlers - success", function() {
-	expect(6);
+	expect(8);
 	stop();
-	var counter = { complete: 0, success: 0, error: 0 },
+	var counter = { complete: 0, success: 0, error: 0, send: 0 },
 		success = function() { counter.success++ },
 		error = function() { counter.error++ },
-		complete = function() { counter.complete++ };
+		complete = function() { counter.complete++ },
+		send = function() { counter.send++ };
 
-	$('#foo').ajaxStart(complete).ajaxStop(complete).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
+	$('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
 	// start with successful test
-	$.ajax({url: "data/name.php", success: success, error: error, complete: function() {
+	$.ajax({url: "data/name.php", beforeSend: send, success: success, error: error, complete: function() {
 	  ok( counter.error == 0, 'Check succesful request' );
 	  ok( counter.success == 2, 'Check succesful request' );
 	  ok( counter.complete == 3, 'Check succesful request' );
-	  counter.error = counter.success = counter.complete = 0;
+	  ok( counter.send == 2, 'Check succesful request' );
+	  counter.error = counter.success = counter.complete = counter.send = 0;
 	  $.ajaxTimeout(500);
-	  $.ajax({url: "data/name.php?wait=5", success: success, error: error, complete: function() {
+	  $.ajax({url: "data/name.php?wait=5", beforeSend: send, success: success, error: error, complete: function() {
 	    ok( counter.error == 2, 'Check failed request' );
 	    ok( counter.success == 0, 'Check failed request' );
 	    ok( counter.complete == 3, 'Check failed request' );
+	    ok( counter.send == 2, 'Check failed request' );
 	    start();
 	  }});
 	}});
 });
 
 test("test global handlers - failure", function() {
-	expect(6);
+	expect(8);
 	stop();
-	var counter = { complete: 0, success: 0, error: 0 },
+	var counter = { complete: 0, success: 0, error: 0, send: 0 },
 		success = function() { counter.success++ },
-		error = function() { counter.error++ };
+		error = function() { counter.error++ },
+		complete = function() { counter.complete++ },
+		send = function() { counter.send++ };
 	$.ajaxTimeout(0);
-	$.ajax({url: "data/name.php", global: false, success: success, error: error, complete: function() {
+	$('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
+	$.ajax({url: "data/name.php", global: false, beforeSend: send, success: success, error: error, complete: function() {
 	  ok( counter.error == 0, 'Check sucesful request without globals' );
 	  ok( counter.success == 1, 'Check sucesful request without globals' );
 	  ok( counter.complete == 0, 'Check sucesful request without globals' );
-	  counter.error = counter.success = counter.complete = 0;
+	  ok( counter.send == 1, 'Check sucesful request without globals' );
+	  counter.error = counter.success = counter.complete = counter.send = 0;
 	  $.ajaxTimeout(500);
-	  $.ajax({url: "data/name.php?wait=5", global: false, success: success, error: error, complete: function() {
+	  $.ajax({url: "data/name.php?wait=5", global: false, beforeSend: send, success: success, error: error, complete: function() {
 	     ok( counter.error == 1, 'Check failed request without globals' );
 	     ok( counter.success == 0, 'Check failed request without globals' );
 	     ok( counter.complete == 0, 'Check failed request without globals' );
+	     ok( counter.send == 1, 'Check failed request without globals' );
 	     start();
 	  }});
 	}});
@@ -135,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");
 });
 
@@ -199,6 +234,8 @@ test("$.ajaxTimeout(Number) - with global timeout", function() {
 	  error: pass,
 	  success: fail
 	});
+	// reset timeout
+	$.ajaxTimeout(0);
 });
 
 test("$.ajaxTimeout(Number) with localtimeout", function() {
@@ -277,4 +314,21 @@ test("$.ajax - xml: non-namespace elements inside namespaced elements", function
 	    start();
 	  }
 	});
+});
+
+test("$.ajax - beforeSend", function() {
+	expect(1);
+	stop();
+	var check = false;
+	$.ajax({
+		url: "data/name.php", 
+		data: {'req': true},
+		beforeSend: function(xml) {
+			check = true
+		},
+		success: function(data) {
+			ok( check, "check beforeSend was executed" );
+			start();
+		}
+	});
 });
\ No newline at end of file