X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2FajaxTest.js;h=f530c1ce6ff0fb6a10aba83185daa9fb5aa9ae45;hb=8937e088b6f06a0dbef36348aef5d7c10f3af340;hp=48010a255326aba78263c45d2d428c707615c451;hpb=010a112e048f932aff7feeb9987eec7a64e5328b;p=jquery.git

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index 48010a2..f530c1c 100644
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -22,6 +22,34 @@ 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() {
+	expect(2);
+	var result;
+	$.ajax({url: "data/json.php", async: false, success: function(data) { ok(true, "sucess callback executed"); 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 +61,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");
 });
 
@@ -100,6 +128,7 @@ test("test global handlers - failure", function() {
 	  counter.error = counter.success = counter.complete = counter.send = 0;
 	  $.ajaxTimeout(500);
 	  $.ajax({url: "data/name.php?wait=5", global: false, beforeSend: send, success: success, error: error, complete: function() {
+	  	 var x = counter;
 	     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' );
@@ -143,7 +172,7 @@ test("$.getScript(String, Function) - with callback", function() {
 
 test("$.getScript(String, Function) - no callback", function() {
 	expect(1);
-	stop();
+	stop(true);
 	$.getScript("data/test.js");
 });
 
@@ -207,6 +236,8 @@ test("$.ajaxTimeout(Number) - with global timeout", function() {
 	  error: pass,
 	  success: fail
 	});
+	// reset timeout
+	$.ajaxTimeout(0);
 });
 
 test("$.ajaxTimeout(Number) with localtimeout", function() {
@@ -290,16 +321,29 @@ 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();
+		}
+	});
+});
+
+test("ajaxSetup()", function() {
+	expect(1);
+	stop();
+	$.ajaxSetup({
+		url: "data/name.php?name=foo",
+		success: function(msg){
+	    	ok( msg == 'bar', 'Check for GET' );
 			start();
 		}
 	});
-});
\ No newline at end of file
+	$.ajax();
+});