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

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index 48010a2..24afb5e 100644
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -1,124 +1,313 @@
 module("ajax");
 
+// Safari 3 randomly crashes when running these tests,
+// but only in the full suite - you can run just the Ajax
+// tests and they'll pass
+//if ( !jQuery.browser.safari ) {
+
+test("$.ajax() - success callbacks", function() {
+	expect( 8 );
+	
+	$.ajaxSetup({ timeout: 0 });
+	
+	stop();
+	
+	setTimeout(function(){	
+        $('#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" );
+        });
+        
+        $.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);
+});
+
+if ( !isLocal ) {
+	test("$.ajax() - error callbacks", function() {
+		expect( 8 );
+		stop();
+		
+		$('#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( true, "ajaxError" );
+		}).ajaxSuccess(function(){
+			ok( false, "ajaxSuccess" );
+		});
+		
+		$.ajaxSetup({ timeout: 500 });
+		
+		$.ajax({
+			url: url("data/name.php?wait=5"),
+			beforeSend: function(){ ok(true, "beforeSend"); },
+			success: function(){ ok(false, "success"); },
+			error: function(){ ok(true, "error"); },
+			complete: function(){ ok(true, "complete"); }
+		});
+	});
+}
+
+test("$.ajax() - disabled globals", function() {
+	expect( 3 );
+	stop();
+	
+	$('#foo').ajaxStart(function(){
+		ok( false, "ajaxStart" );
+	}).ajaxStop(function(){
+		ok( false, "ajaxStop" );
+	}).ajaxSend(function(){
+		ok( false, "ajaxSend" );
+	}).ajaxComplete(function(){
+		ok( false, "ajaxComplete" );
+	}).ajaxError(function(){
+		ok( false, "ajaxError" );
+	}).ajaxSuccess(function(){
+		ok( false, "ajaxSuccess" );
+	});
+	
+	$.ajax({
+		global: false,
+		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");
+		  setTimeout(function(){ start(); }, 13);
+        }
+	});
+});
+
+test("$.ajax - xml: non-namespace elements inside namespaced elements", function() {
+	expect(3);
+	stop();
+	$.ajax({
+	  url: url("data/with_fries.xml"),
+	  dataType: "xml",
+	  success: function(resp) {
+	    equals( $("properties", resp).length, 1, 'properties in responseXML' );
+	    equals( $("jsconf", resp).length, 1, 'jsconf in responseXML' );
+	    equals( $("thing", resp).length, 2, 'things in responseXML' );
+	    start();
+	  }
+	});
+});
+
+test("$.ajax - beforeSend", function() {
+	expect(1);
+	stop();
+	
+	var check = false;
+	
+	$.ajaxSetup({ timeout: 0 });
+	
+	$.ajax({
+		url: url("data/name.html"), 
+		beforeSend: function(xml) {
+			check = true;
+		},
+		success: function(data) {
+			ok( check, "check beforeSend was executed" );
+			start();
+		}
+	});
+});
+
+var foobar;
+
+test("$.ajax - dataType html", function() {
+	expect(5);
+	stop();
+	
+	foobar = null;
+	testFoo = undefined;
+	
+	var verifyEvaluation = function() {
+	  ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
+	  ok( foobar == "bar", 'Check if script src was evaluated for datatype html' );
+	  start();
+	};
+
+	$.ajax({
+	  dataType: "html",
+	  url: url("data/test.html"),
+	  success: function(data) {
+	  	$("#ap").html(data);
+	    ok( data.match(/^html text/), 'Check content for datatype html' );
+	    setTimeout(verifyEvaluation, 600);
+	  }
+	});
+});
+
 test("serialize()", function() {
 	expect(1);
-	var data = $(':input').not('button').serialize();
 	// ignore button, IE takes text content as value, not relevant for this test
-	ok( data == 'action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo[bar]=&name=name&=foobar&select1=&select2=3&select3=1', 'Check form serialization as query string' );
+	equals( $(':input').not('button').serialize(), 
+		'action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo%5Bbar%5D=&name=name&=foobar&select1=&select2=3&select3=1&test=&id=', 
+		'Check form serialization as query string');
 });
 
-test("param", function() {
+test("$.param()", function() {
 	expect(4);
 	var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
-	ok( $.param(params) == "foo=bar&baz=42&quux=All%20your%20base%20are%20belong%20to%20us", "simple" );
+	equals( $.param(params), "foo=bar&baz=42&quux=All%20your%20base%20are%20belong%20to%20us", "simple" );
 	
 	params = {someName: [1, 2, 3], regularThing: "blah" };
-	ok( $.param(params) == "someName=1&someName=2&someName=3&regularThing=blah", "with array" );
+	equals( $.param(params), "someName=1&someName=2&someName=3&regularThing=blah", "with array" );
 	
 	params = {"foo[]":["baz", 42, "All your base are belong to us"]};
-	ok( $.param(params) == "foo[]=baz&foo[]=42&foo[]=All%20your%20base%20are%20belong%20to%20us", "more array" );
+	equals( $.param(params), "foo%5B%5D=baz&foo%5B%5D=42&foo%5B%5D=All%20your%20base%20are%20belong%20to%20us", "more array" );
 	
 	params = {"foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us"};
-	ok( $.param(params) == "foo[bar]=baz&foo[beep]=42&foo[quux]=All%20your%20base%20are%20belong%20to%20us", "even more arrays" );
+	equals( $.param(params), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" );
 });
 
-test("load(String, Object, Function) - simple: inject text into DOM", function() {
+test("synchronous request", function() {
+	expect(1);
+	ok( /^{ "data"/.test( $.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
+});
+
+test("synchronous request with callbacks", function() {
 	expect(2);
-	stop();
-	$('#first').load("data/name.php", function() {
-		ok( /^ERROR/.test($('#first').text()), 'Check if content was injected into the DOM' );
+	var result;
+	$.ajax({url: url("data/json_obj.js"), async: false, success: function(data) { ok(true, "sucess callback executed"); result = data; } });
+	ok( /^{ "data"/.test( result ), "check returned text" );
+});
+
+test("pass-through request object", function() {
+	expect(1);
+	stop(true);
+	
+	var target = "data/name.html";
+	var count = 0;
+	var success = function() {
+		// Disabled
+		//if(count++ == 5)
 		start();
-	});
+	};
+	
+	/* Test disabled, too many simultaneous requests
+	ok( $.get(url(target), success), "get" );
+	ok( $.getIfModified(url(target), success), "getIfModified" );
+	ok( $.post(url(target), success), "post" );
+	ok( $.getScript(url("data/test.js"), success), "script" );
+	ok( $.getJSON(url("data/json_obj.js"), success), "json" );
+	*/
+	ok( $.ajax({url: url(target), success: success}), "generic" );
+});
+
+test("global ajaxSettings", function() {
+	expect(3);
+
+	var tmp = jQuery.extend({}, jQuery.ajaxSettings);
+    var orig = { url: "data/with_fries.xml", data: null };
+	var t;
+
+	$.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
+
+    t = jQuery.extend({}, orig);
+    $.ajax(t);
+	ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending null" );
+
+    t = jQuery.extend({}, orig);
+	t.data = {};
+    $.ajax(t);
+	ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" );
+
+    t = jQuery.extend({}, orig);
+	t.data = { zoo: 'a', ping: 'b' };
+    $.ajax(t);
+	ok( t.url.indexOf('ping') > -1 && t.url.indexOf('zoo') > -1 && t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending { zoo: 'a', ping: 'b' }" );
+	
+	jQuery.ajaxSettings = tmp;
 });
 
-test("load(String, Object, Function) - inject without callback", function() {
+test("load(String)", function() {
 	expect(1);
-	stop(); // check if load can be called with only url
-	$('#first').load("data/name.php");
+	stop(true); // check if load can be called with only url
+	$('#first').load("data/name.html", start);
+});
+
+test("load('url selector')", function() {
+	expect(1);
+	stop(true); // check if load can be called with only url
+	$('#first').load("data/test3.html div.user", function(){
+		equals( $(this).children("div").length, 2, "Verify that specific elements were injected" );
+		start();
+	});
+});
+
+test("load(String, Function) - simple: inject text into DOM", function() {
+	expect(2);
+	stop();
+	$('#first').load(url("data/name.html"), function() {
+		ok( /^ERROR/.test($('#first').text()), 'Check if content was injected into the DOM' );
+		start();
+	});
 });
 
-test("load(String, Object, Function) - check scripts", function() {
+test("load(String, Function) - check scripts", function() {
 	expect(7);
 	stop();
-	testFoo = undefined;
+	window.testFoo = undefined;
+	window.foobar = null;
 	var verifyEvaluation = function() {
-	  ok( foobar == "bar", 'Check if script src was evaluated after load' );
-	  ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
-	  ok( $('#ap').html() == 'bar', 'Check if script evaluation has modified DOM');
+	  equals( foobar, "bar", 'Check if script src was evaluated after load' );
+	  equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
 	  start();
 	};
-	$('#first').load('data/test.html', function() {
+	$('#first').load(url('data/test.html'), function() {
 	  ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
-	  ok( testFoo == "foo", 'Check if script was evaluated after load' );
+	  equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+	  equals( testFoo, "foo", 'Check if script was evaluated after load' );
 	  setTimeout(verifyEvaluation, 600);
 	});
 });
 
-test("test global handlers - success", function() {
-	expect(8);
-	stop();
-	var counter = { complete: 0, success: 0, error: 0, send: 0 },
-		success = function() { counter.success++ },
-		error = function() { counter.error++ },
-		complete = function() { counter.complete++ },
-		send = function() { counter.send++ };
-
-	$('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
-	// start with successful test
-	$.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' );
-	  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", 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(8);
+test("load(String, Function) - check file with only a script tag", function() {
+	expect(3);
 	stop();
-	var counter = { complete: 0, success: 0, error: 0, send: 0 },
-		success = function() { counter.success++ },
-		error = function() { counter.error++ },
-		complete = function() { counter.complete++ },
-		send = function() { counter.send++ };
-	$.ajaxTimeout(0);
-	$('#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' );
-	  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, 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();
-	  }});
-	}});
+	testFoo = undefined;
+	$('#first').load(url('data/test2.html'), function() {
+	  ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
+	  ok( testFoo == "foo", 'Check if script was evaluated after load' );
+	  start();
+	});
 });
 
 test("$.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
 	expect(2);
 	stop();
-	$.get('data/dashboard.xml', function(xml) {
+	$.get(url('data/dashboard.xml'), function(xml) {
 		var content = [];
 		$('tab', xml).each(function() {
 			content.push($(this).text());
 		});
-		ok( content[0] == 'blabla', 'Check first tab');
-		ok( content[1] == 'blublu', 'Check second tab');
+		equals( content[0], 'blabla', 'Check first tab');
+		equals( content[1], 'blublu', 'Check second tab');
 		start();
 	});
 });
@@ -126,7 +315,7 @@ test("$.get(String, Hash, Function) - parse xml and use text() on nodes", functi
 test("$.getIfModified(String, Hash, Function)", function() {
 	expect(1);
 	stop();
-	$.getIfModified("data/name.php", function(msg) {
+	$.getIfModified(url("data/name.html"), function(msg) {
 	    ok( /^ERROR/.test(msg), 'Check ifModified' );
 	    start();
 	});
@@ -135,22 +324,169 @@ test("$.getIfModified(String, Hash, Function)", function() {
 test("$.getScript(String, Function) - with callback", function() {
 	expect(2);
 	stop();
-	$.getScript("data/test.js", function() {
-		ok( foobar == "bar", 'Check if script was evaluated' );
+	$.getScript(url("data/test.js"), function() {
+		equals( foobar, "bar", 'Check if script was evaluated' );
 		setTimeout(start, 100);
 	});
 });
 
 test("$.getScript(String, Function) - no callback", function() {
 	expect(1);
+	stop(true);
+	$.getScript(url("data/test.js"), start);
+});
+
+if ( !isLocal ) {
+
+test("$.ajax() - JSONP, Local", function() {
+	expect(7);
+
+	var count = 0;
+	function plus(){ if ( ++count == 7 ) start(); }
+
+	stop();
+
+	$.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, no callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		url: "data/jsonp.php?callback=?",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, url callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		data: "callback=?",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, data callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		data: { callback: "?" },
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, data obj callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		type: "POST",
+		url: "data/jsonp.php",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (POST, no callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		type: "POST",
+		url: "data/jsonp.php",
+		data: "callback=?",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (POST, data callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		type: "POST",
+		url: "data/jsonp.php",
+		data: { callback: "?" },
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (POST, data obj callback)" );
+			plus();
+		}
+	});
+});
+
+test("$.ajax() - JSONP, Remote", function() {
+	expect(4);
+
+	var count = 0;
+	function plus(){ if ( ++count == 4 ) start(); }
+
+	var base = window.location.href.replace(/\?.*$/, "");
+
+	stop();
+
+	$.ajax({
+		url: base + "data/jsonp.php",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, no callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		url: base + "data/jsonp.php?callback=?",
+		dataType: "jsonp",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, url callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		url: base + "data/jsonp.php",
+		dataType: "jsonp",
+		data: "callback=?",
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, data callback)" );
+			plus();
+		}
+	});
+
+	$.ajax({
+		url: base + "data/jsonp.php",
+		dataType: "jsonp",
+		data: { callback: "?" },
+		success: function(data){
+			ok( data.data, "JSON results returned (GET, data obj callback)" );
+			plus();
+		}
+	});
+});
+
+test("$.ajax() - script, Remote", function() {
+	expect(2);
+
+	var base = window.location.href.replace(/\?.*$/, "");
+
 	stop();
-	$.getScript("data/test.js");
+
+	$.ajax({
+		url: base + "data/test.js",
+		dataType: "script",
+		success: function(data){
+			ok( foobar, "Script results returned (GET, no callback)" );
+			start();
+		}
+	});
 });
 
 test("$.getJSON(String, Hash, Function) - JSON array", function() {
 	expect(4);
 	stop();
-	$.getJSON("data/json.php", {json: "array"}, function(json) {
+	$.getJSON(url("data/json.php"), {json: "array"}, function(json) {
 	  ok( json[0].name == 'John', 'Check JSON: first, name' );
 	  ok( json[0].age == 21, 'Check JSON: first, age' );
 	  ok( json[1].name == 'Peter', 'Check JSON: second, name' );
@@ -159,10 +495,10 @@ test("$.getJSON(String, Hash, Function) - JSON array", function() {
 	});
 });
 
-test("$.getJSON(String, Hash, Function) - JSON object", function() {
+test("$.getJSON(String, Function) - JSON object", function() {
 	expect(2);
 	stop();
-	$.getJSON("data/json.php", function(json) {
+	$.getJSON(url("data/json.php"), function(json) {
 	  ok( json.data.lang == 'en', 'Check JSON: lang' );
 	  ok( json.data.length == 25, 'Check JSON: length' );
 	  start();
@@ -172,7 +508,7 @@ test("$.getJSON(String, Hash, Function) - JSON object", function() {
 test("$.post(String, Hash, Function) - simple with xml", function() {
 	expect(2);
 	stop();
-	$.post("data/name.php", {xml: "5-2"}, function(xml){
+	$.post(url("data/name.php"), {xml: "5-2"}, function(xml){
 	  $('math', xml).each(function() {
 		    ok( $('calculation', this).text() == '5-2', 'Check for XML' );
 		    ok( $('result', this).text() == '3', 'Check for XML' );
@@ -183,30 +519,36 @@ test("$.post(String, Hash, Function) - simple with xml", function() {
 
 test("$.ajaxTimeout(Number) - with global timeout", function() {
 	stop();
+	
 	var passed = 0;
-	var timeout;
+
 	$.ajaxTimeout(1000);
+	
 	var pass = function() {
 		passed++;
-		if(passed == 2) {
+		if ( passed == 2 ) {
 			ok( true, 'Check local and global callbacks after timeout' );
-			clearTimeout(timeout);
-	     $('#main').unbind("ajaxError");
+	     	$('#main').unbind("ajaxError");
 			start();
 		}
 	};
-	var fail = function() {
-		ok( false, 'Check for timeout failed' );
+	
+	var fail = function(a,b,c) {
+		ok( false, 'Check for timeout failed ' + a + ' ' + b );
 		start();
 	};
-	timeout = setTimeout(fail, 1500);
+	
 	$('#main').ajaxError(pass);
+	
 	$.ajax({
 	  type: "GET",
-	  url: "data/name.php?wait=5",
+	  url: url("data/name.php?wait=5"),
 	  error: pass,
 	  success: fail
 	});
+	
+	// reset timeout
+	$.ajaxTimeout(0);
 });
 
 test("$.ajaxTimeout(Number) with localtimeout", function() {
@@ -214,7 +556,7 @@ test("$.ajaxTimeout(Number) with localtimeout", function() {
 	$.ajax({
 	  type: "GET",
 	  timeout: 5000,
-	  url: "data/name.php?wait=1",
+	  url: url("data/name.php?wait=1"),
 	  error: function() {
 		   ok( false, 'Check for local timeout failed' );
 		   start();
@@ -233,7 +575,7 @@ test("$.ajax - simple get", function() {
 	stop();
 	$.ajax({
 	  type: "GET",
-	  url: "data/name.php?name=foo",
+	  url: url("data/name.php?name=foo"),
 	  success: function(msg){
 	    ok( msg == 'bar', 'Check for GET' );
 	    start();
@@ -246,7 +588,7 @@ test("$.ajax - simple post", function() {
 	stop();
 	$.ajax({
 	  type: "POST",
-	  url: "data/name.php",
+	  url: url("data/name.php"),
 	  data: "name=peter",
 	  success: function(msg){
 	    ok( msg == 'pan', 'Check for POST' );
@@ -254,52 +596,33 @@ test("$.ajax - simple post", function() {
 	  }
 	});
 });
-	
-test("$.ajax - dataType html", function() {
-	expect(5);
-	stop();
-	testFoo = undefined;
-	var verifyEvaluation = function() {
-	  ok( foobar == "bar", 'Check if script src was evaluated for datatype html' );
-	  start();
-	};
-	$.ajax({
-	  dataType: "html",
-	  url: "data/test.html",
-	  success: function(data) {
-	    ok( data.match(/^html text/), 'Check content for datatype html' );
-	    ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
-	    setTimeout(verifyEvaluation, 600);
-	  }
-	});
-});
-	
-test("$.ajax - xml: non-namespace elements inside namespaced elements", function() {
-	expect(3);
+
+test("ajaxSetup()", function() {
+	expect(1);
 	stop();
-	$.ajax({
-	  url: "data/with_fries.xml", dataType: "xml", type: "GET", data: "", success: function(resp) {
-	    ok( $("properties", resp).length == 1, 'properties in responseXML' );
-	    ok( $("jsconf", resp).length == 1, 'jsconf in responseXML' );
-	    ok( $("thing", resp).length == 2, 'things in responseXML' );
-	    start();
-	  }
+	$.ajaxSetup({
+		url: url("data/name.php?name=foo"),
+		success: function(msg){
+	    	ok( msg == 'bar', 'Check for GET' );
+			start();
+		}
 	});
+	$.ajax();
 });
 
-test("$.ajax - beforeSend", function() {
-	expect(1);
+test("custom timeout does not set error message when timeout occurs, see #970", function() {
 	stop();
-	var customHeader = "value";
 	$.ajax({
-		url: "data/name.php", 
-		data: {'req': true},
-		beforeSend: function(xml) {
-			xml.setRequestHeader('X-Custom-Header', customHeader);
-		},
-		success: function(data) {
-			ok( data == customHeader, "check return value, should be the custom header sent" );
+		url: "data/name.php?wait=10",
+		timeout: 500,
+		error: function(request, status) {
+			ok( status != null, "status shouldn't be null in error handler" );
+			equals( "timeout", status );
 			start();
 		}
 	});
-});
\ No newline at end of file
+});
+
+}
+
+//}