X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=677838b54bc17a719652d2c0882aced8680e4906;hb=12bb969411716dcad3237f3403e83744add3f84c;hp=5274b6850205cabb0f854dbc38c41bd5e270d75f;hpb=aee221d33c2db2c76639dabeca2b1e3d022e348e;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 5274b68..677838b 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -7,15 +7,15 @@ module("ajax");
 
 if ( !isLocal ) {
 
-test("$.ajax() - success callbacks", function() {
+test("jQuery.ajax() - success callbacks", function() {
 	expect( 8 );
 	
-	$.ajaxSetup({ timeout: 0 });
+	jQuery.ajaxSetup({ timeout: 0 });
 	
 	stop();
 	
 	setTimeout(function(){	
-        $('#foo').ajaxStart(function(){
+        jQuery('#foo').ajaxStart(function(){
             ok( true, "ajaxStart" );
         }).ajaxStop(function(){
             ok( true, "ajaxStop" );
@@ -30,7 +30,7 @@ test("$.ajax() - success callbacks", function() {
             ok( true, "ajaxSuccess" );
         });
         
-        $.ajax({
+        jQuery.ajax({
             url: url("data/name.html"),
             beforeSend: function(){ ok(true, "beforeSend"); },
             success: function(){ ok(true, "success"); },
@@ -40,11 +40,11 @@ test("$.ajax() - success callbacks", function() {
     }, 13);
 });
 
-test("$.ajax() - error callbacks", function() {
+test("jQuery.ajax() - error callbacks", function() {
     expect( 8 );
     stop();
     
-    $('#foo').ajaxStart(function(){
+    jQuery('#foo').ajaxStart(function(){
         ok( true, "ajaxStart" );
     }).ajaxStop(function(){
         ok( true, "ajaxStop" );
@@ -59,9 +59,9 @@ test("$.ajax() - error callbacks", function() {
         ok( false, "ajaxSuccess" );
     });
     
-    $.ajaxSetup({ timeout: 500 });
+    jQuery.ajaxSetup({ timeout: 500 });
     
-    $.ajax({
+    jQuery.ajax({
         url: url("data/name.php?wait=5"),
         beforeSend: function(){ ok(true, "beforeSend"); },
         success: function(){ ok(false, "success"); },
@@ -70,11 +70,11 @@ test("$.ajax() - error callbacks", function() {
     });
 });
 
-test("$.ajax() - disabled globals", function() {
+test("jQuery.ajax() - disabled globals", function() {
 	expect( 3 );
 	stop();
 	
-	$('#foo').ajaxStart(function(){
+	jQuery('#foo').ajaxStart(function(){
 		ok( false, "ajaxStart" );
 	}).ajaxStop(function(){
 		ok( false, "ajaxStop" );
@@ -88,7 +88,7 @@ test("$.ajax() - disabled globals", function() {
 		ok( false, "ajaxSuccess" );
 	});
 	
-	$.ajax({
+	jQuery.ajax({
 		global: false,
 		url: url("data/name.html"),
 		beforeSend: function(){ ok(true, "beforeSend"); },
@@ -101,30 +101,30 @@ test("$.ajax() - disabled globals", function() {
 	});
 });
 
-test("$.ajax - xml: non-namespace elements inside namespaced elements", function() {
+test("jQuery.ajax - xml: non-namespace elements inside namespaced elements", function() {
 	expect(3);
 	stop();
-	$.ajax({
+	jQuery.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' );
+	    equals( jQuery("properties", resp).length, 1, 'properties in responseXML' );
+	    equals( jQuery("jsconf", resp).length, 1, 'jsconf in responseXML' );
+	    equals( jQuery("thing", resp).length, 2, 'things in responseXML' );
 	    start();
 	  }
 	});
 });
 
-test("$.ajax - beforeSend", function() {
+test("jQuery.ajax - beforeSend", function() {
 	expect(1);
 	stop();
 	
 	var check = false;
 	
-	$.ajaxSetup({ timeout: 0 });
+	jQuery.ajaxSetup({ timeout: 0 });
 	
-	$.ajax({
+	jQuery.ajax({
 		url: url("data/name.html"), 
 		beforeSend: function(xml) {
 			check = true;
@@ -136,9 +136,30 @@ test("$.ajax - beforeSend", function() {
 	});
 });
 
+test("jQuery.ajax - beforeSend, cancel request (#2688)", function() {
+	expect(2);
+	var request = jQuery.ajax({
+		url: url("data/name.html"), 
+		beforeSend: function() {
+			ok( true, "beforeSend got called, canceling" );
+			return false;
+		},
+		success: function() {
+			ok( false, "request didn't get canceled" );
+		},
+		complete: function() {
+			ok( false, "request didn't get canceled" );
+		},
+		error: function() {
+			ok( false, "request didn't get canceled" );
+		}
+	});
+	ok( request === false, "canceled request must return false instead of XMLHttpRequest instance" );
+});
+
 var foobar;
 
-test("$.ajax - dataType html", function() {
+test("jQuery.ajax - dataType html", function() {
 	expect(5);
 	stop();
 	
@@ -146,16 +167,16 @@ test("$.ajax - dataType html", function() {
 	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' );
+	  equals( testFoo, "foo", 'Check if script was evaluated for datatype html' );
+	  equals( foobar, "bar", 'Check if script src was evaluated for datatype html' );
 	  start();
 	};
 
-	$.ajax({
+	jQuery.ajax({
 	  dataType: "html",
 	  url: url("data/test.html"),
 	  success: function(data) {
-	  	$("#ap").html(data);
+	  	jQuery("#ap").html(data);
 	    ok( data.match(/^html text/), 'Check content for datatype html' );
 	    setTimeout(verifyEvaluation, 600);
 	  }
@@ -165,75 +186,85 @@ test("$.ajax - dataType html", function() {
 test("serialize()", function() {
 	expect(6);
 	
-	equals( $('#form').serialize(),
+	equals( jQuery('#form').serialize(),
 		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=1&select3=2",
 		'Check form serialization as query string');
 		
-	equals( $('#form :input').serialize(),
+	equals( jQuery('#form :input').serialize(),
 		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=1&select3=2",
 		'Check input serialization as query string');
 	
-	equals( $('#testForm').serialize(), 
+	equals( jQuery('#testForm').serialize(), 
 		'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=', 
 		'Check form serialization as query string');
 		
-	equals( $('#testForm :input').serialize(), 
+	equals( jQuery('#testForm :input').serialize(), 
 		'T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=', 
 		'Check input serialization as query string');
 		
-	equals( $('#form, #testForm').serialize(),
+	equals( jQuery('#form, #testForm').serialize(),
 		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=1&select3=2&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
 		'Multiple form serialization as query string');
 		
-	equals( $('#form, #testForm :input').serialize(),
+	equals( jQuery('#form, #testForm :input').serialize(),
 		"action=Test&radio2=on&check=on&hidden=&foo%5Bbar%5D=&name=name&select1=&select2=3&select3=1&select3=2&T3=%3F%0AZ&H1=x&H2=&PWD=&T1=&T2=YES&My+Name=me&S1=abc&S3=YES&S4=",
 		'Mixed form/input serialization as query string');
 });
 
-test("$.param()", function() {
+test("jQuery.param()", function() {
 	expect(4);
 	var params = {foo:"bar", baz:42, quux:"All your base are belong to us"};
-	equals( $.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" );
+	equals( jQuery.param(params), "foo=bar&baz=42&quux=All+your+base+are+belong+to+us", "simple" );
 	
 	params = {someName: [1, 2, 3], regularThing: "blah" };
-	equals( $.param(params), "someName=1&someName=2&someName=3&regularThing=blah", "with array" );
+	equals( jQuery.param(params), "someName=1&someName=2&someName=3&regularThing=blah", "with array" );
 	
 	params = {"foo[]":["baz", 42, "All your base are belong to us"]};
-	equals( $.param(params), "foo%5B%5D=baz&foo%5B%5D=42&foo%5B%5D=All+your+base+are+belong+to+us", "more array" );
+	equals( jQuery.param(params), "foo%5B%5D=baz&foo%5B%5D=42&foo%5B%5D=All+your+base+are+belong+to+us", "more array" );
 	
 	params = {"foo[bar]":"baz", "foo[beep]":42, "foo[quux]":"All your base are belong to us"};
-	equals( $.param(params), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All+your+base+are+belong+to+us", "even more arrays" );
+	equals( jQuery.param(params), "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All+your+base+are+belong+to+us", "even more arrays" );
 });
 
 test("synchronous request", function() {
 	expect(1);
-	ok( /^{ "data"/.test( $.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
+	ok( /^{ "data"/.test( jQuery.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
 });
 
 test("synchronous request with callbacks", function() {
 	expect(2);
 	var result;
-	$.ajax({url: url("data/json_obj.js"), async: false, success: function(data) { ok(true, "sucess callback executed"); result = data; } });
+	jQuery.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(6);
-	stop(true);
+	expect(8);
+	stop();
 	
 	var target = "data/name.html";
-	var count = 0;
+	var successCount = 0;
+	var errorCount = 0;
+  var errorEx = "";
 	var success = function() {
-		// Re-enabled because a bug was found in the unit test that probably caused the problem
-		if(++count == 5)
-			start();
+		successCount++;
 	};
+	jQuery("#foo").ajaxError(function (e, xml, s, ex) {
+		errorCount++;
+    errorEx += ": " + xml.status;
+	});
+	jQuery("#foo").one('ajaxStop', function () {
+		equals(successCount, 5, "Check all ajax calls successful");
+		equals(errorCount, 0, "Check no ajax errors (status" + errorEx + ")");
+		jQuery("#foo").unbind('ajaxError');
+		start();
+	});
 	
-	ok( $.get(url(target), success), "get" );
-	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" );
+	ok( jQuery.get(url(target), success), "get" );
+	ok( jQuery.post(url(target), success), "post" );
+	ok( jQuery.getScript(url("data/test.js"), success), "script" );
+	ok( jQuery.getJSON(url("data/json_obj.js"), success), "json" );
+	ok( jQuery.ajax({url: url(target), success: success}), "generic" );
 });
 
 test("ajax cache", function () {
@@ -242,7 +273,7 @@ test("ajax cache", function () {
 	
 	var count = 0;
 
-	$("#firstp").bind("ajaxSuccess", function (e, xml, s) {
+	jQuery("#firstp").bind("ajaxSuccess", function (e, xml, s) {
 		var re = /_=(.*?)(&|$)/g;
     var oldOne = null;
 		for (var i = 0; i < 6; i++) {
@@ -258,35 +289,31 @@ test("ajax cache", function () {
 			start();
 	});
 
-	ok( $.ajax({url: "data/text.php", cache:false}), "test with no parameters" );
-	ok( $.ajax({url: "data/text.php?pizza=true", cache:false}), "test with 1 parameter" );
-	ok( $.ajax({url: "data/text.php?_=tobereplaced555", cache:false}), "test with _= parameter" );
-	ok( $.ajax({url: "data/text.php?pizza=true&_=tobereplaced555", cache:false}), "test with 1 parameter plus _= one" );
-	ok( $.ajax({url: "data/text.php?_=tobereplaced555&tv=false", cache:false}), "test with 1 parameter plus _= one before it" );
-	ok( $.ajax({url: "data/text.php?name=David&_=tobereplaced555&washere=true", cache:false}), "test with 2 parameters surrounding _= one" );
+	ok( jQuery.ajax({url: "data/text.php", cache:false}), "test with no parameters" );
+	ok( jQuery.ajax({url: "data/text.php?pizza=true", cache:false}), "test with 1 parameter" );
+	ok( jQuery.ajax({url: "data/text.php?_=tobereplaced555", cache:false}), "test with _= parameter" );
+	ok( jQuery.ajax({url: "data/text.php?pizza=true&_=tobereplaced555", cache:false}), "test with 1 parameter plus _= one" );
+	ok( jQuery.ajax({url: "data/text.php?_=tobereplaced555&tv=false", cache:false}), "test with 1 parameter plus _= one before it" );
+	ok( jQuery.ajax({url: "data/text.php?name=David&_=tobereplaced555&washere=true", cache:false}), "test with 2 parameters surrounding _= one" );
 });
 
 test("global ajaxSettings", function() {
-	expect(3);
+	expect(2);
 
 	var tmp = jQuery.extend({}, jQuery.ajaxSettings);
-    var orig = { url: "data/with_fries.xml", data: null };
+    var orig = { url: "data/with_fries.xml" };
 	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" );
+	jQuery.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
 
     t = jQuery.extend({}, orig);
 	t.data = {};
-    $.ajax(t);
+    jQuery.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);
+    jQuery.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;
@@ -294,24 +321,37 @@ test("global ajaxSettings", function() {
 
 test("load(String)", function() {
 	expect(1);
-	stop(true); // check if load can be called with only url
-	$('#first').load("data/name.html", start);
+	stop(); // check if load can be called with only url
+	jQuery('#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" );
+	stop(); // check if load can be called with only url
+	jQuery('#first').load("data/test3.html div.user", function(){
+		equals( jQuery(this).children("div").length, 2, "Verify that specific elements were injected" );
 		start();
 	});
 });
 
+test("load(String, Function) with ajaxSetup on dataType json, see #2046", function() {
+	expect(1);
+	stop();
+	jQuery.ajaxSetup({ dataType: "json" });
+	jQuery("#first").ajaxComplete(function (e, xml, s) {
+		equals( s.dataType, "html", "Verify the load() dataType was html" );
+		jQuery("#first").unbind("ajaxComplete");
+		jQuery.ajaxSetup({ dataType: "" });
+		start();
+	});
+	jQuery('#first').load("data/test3.html");
+});
+
 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' );
+	jQuery('#first').load(url("data/name.html"), function() {
+		ok( /^ERROR/.test(jQuery('#first').text()), 'Check if content was injected into the DOM' );
 		start();
 	});
 });
@@ -322,15 +362,15 @@ test("load(String, Function) - check scripts", function() {
 	window.testFoo = undefined;
 	window.foobar = null;
 	var verifyEvaluation = function() {
-	  equals( foobar, "bar", 'Check if script src was evaluated after load' );
-	  equals( $('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
-	  start();
+		equals( foobar, "bar", 'Check if script src was evaluated after load' );
+		equals( jQuery('#ap').html(), 'bar', 'Check if script evaluation has modified DOM');
+		 start();
 	};
-	$('#first').load(url('data/test.html'), function() {
-	  ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
-	  equals( $('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
-	  equals( testFoo, "foo", 'Check if script was evaluated after load' );
-	  setTimeout(verifyEvaluation, 600);
+	jQuery('#first').load(url('data/test.html'), function() {
+		ok( jQuery('#first').html().match(/^html text/), 'Check content after loading html' );
+		equals( jQuery('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+		equals( testFoo, "foo", 'Check if script was evaluated after load' );
+		setTimeout(verifyEvaluation, 600);
 	});
 });
 
@@ -338,20 +378,44 @@ test("load(String, Function) - check file with only a script tag", function() {
 	expect(3);
 	stop();
 	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();
+	jQuery('#first').load(url('data/test2.html'), function() {
+		equals( jQuery('#foo').html(), 'foo', 'Check if script evaluation has modified DOM');
+		equals( testFoo, "foo", 'Check if script was evaluated after load' );
+		start();
+	});
+});
+
+test("load(String, Object, Function)", function() {
+	expect(2);
+	stop();
+	
+	jQuery('<div />').load(url('data/params_html.php'), { foo:3, bar:'ok' }, function() {
+		var $post = jQuery(this).find('#post');		
+		equals( $post.find('#foo').text(), '3', 'Check if a hash of data is passed correctly');
+		equals( $post.find('#bar').text(), 'ok', 'Check if a hash of data is passed correctly');
+		start();
+	});
+});
+
+test("load(String, String, Function)", function() {
+	expect(2);
+	stop();
+	
+	jQuery('<div />').load(url('data/params_html.php'), 'foo=3&bar=ok', function() {
+		var $get = jQuery(this).find('#get');		
+		equals( $get.find('#foo').text(), '3', 'Check if a string of data is passed correctly');
+		equals( $get.find('#bar').text(), 'ok', 'Check if a  of data is passed correctly');
+		start();
 	});
 });
 
-test("$.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
+test("jQuery.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
 	expect(2);
 	stop();
-	$.get(url('data/dashboard.xml'), function(xml) {
+	jQuery.get(url('data/dashboard.xml'), function(xml) {
 		var content = [];
-		$('tab', xml).each(function() {
-			content.push($(this).text());
+		jQuery('tab', xml).each(function() {
+			content.push(jQuery(this).text());
 		});
 		equals( content[0], 'blabla', 'Check first tab');
 		equals( content[1], 'blublu', 'Check second tab');
@@ -359,22 +423,23 @@ test("$.get(String, Hash, Function) - parse xml and use text() on nodes", functi
 	});
 });
 
-test("$.getScript(String, Function) - with callback", function() {
+test("jQuery.getScript(String, Function) - with callback", function() {
 	expect(2);
 	stop();
-	$.getScript(url("data/test.js"), function() {
+	window.foobar = null;
+	jQuery.getScript(url("data/test.js"), function() {
 		equals( foobar, "bar", 'Check if script was evaluated' );
 		setTimeout(start, 100);
 	});
 });
 
-test("$.getScript(String, Function) - no callback", function() {
+test("jQuery.getScript(String, Function) - no callback", function() {
 	expect(1);
-	stop(true);
-	$.getScript(url("data/test.js"), start);
+	stop();
+	jQuery.getScript(url("data/test.js"), start);
 });
 
-test("$.ajax() - JSONP, Local", function() {
+test("jQuery.ajax() - JSONP, Local", function() {
 	expect(7);
 
 	var count = 0;
@@ -382,55 +447,75 @@ test("$.ajax() - JSONP, Local", function() {
 
 	stop();
 
-	$.ajax({
+	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, no callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, no callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		url: "data/jsonp.php?callback=?",
 		dataType: "jsonp",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, url callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, url callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",
 		data: "callback=?",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, data callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, data callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		url: "data/jsonp.php",
 		dataType: "jsonp",
-		data: { callback: "?" },
+		jsonp: "callback",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, data obj callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, data obj callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		type: "POST",
 		url: "data/jsonp.php",
 		dataType: "jsonp",
 		success: function(data){
 			ok( data.data, "JSON results returned (POST, no callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, data obj callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		type: "POST",
 		url: "data/jsonp.php",
 		data: "callback=?",
@@ -438,22 +523,30 @@ test("$.ajax() - JSONP, Local", function() {
 		success: function(data){
 			ok( data.data, "JSON results returned (POST, data callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (POST, data callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		type: "POST",
 		url: "data/jsonp.php",
-		data: { callback: "?" },
+		jsonp: "callback",
 		dataType: "jsonp",
 		success: function(data){
 			ok( data.data, "JSON results returned (POST, data obj callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (POST, data obj callback)" );
+			plus();
 		}
 	});
 });
 
-test("$.ajax() - JSONP, Remote", function() {
+test("jQuery.ajax() - JSONP, Remote", function() {
 	expect(4);
 
 	var count = 0;
@@ -463,53 +556,70 @@ test("$.ajax() - JSONP, Remote", function() {
 
 	stop();
 
-	$.ajax({
+	jQuery.ajax({
 		url: base + "data/jsonp.php",
 		dataType: "jsonp",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, no callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, no callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		url: base + "data/jsonp.php?callback=?",
 		dataType: "jsonp",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, url callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, url callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		url: base + "data/jsonp.php",
 		dataType: "jsonp",
 		data: "callback=?",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, data callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, data callback)" );
+			plus();
 		}
 	});
 
-	$.ajax({
+	jQuery.ajax({
 		url: base + "data/jsonp.php",
 		dataType: "jsonp",
-		data: { callback: "?" },
+		jsonp: "callback",
 		success: function(data){
 			ok( data.data, "JSON results returned (GET, data obj callback)" );
 			plus();
+		},
+		error: function(data){
+			ok( false, "Ajax error JSON (GET, data obj callback)" );
+			plus();
 		}
 	});
 });
 
-test("$.ajax() - script, Remote", function() {
+test("jQuery.ajax() - script, Remote", function() {
 	expect(2);
 
 	var base = window.location.href.replace(/\?.*$/, "");
 
 	stop();
 
-	$.ajax({
+	window.foobar = null;
+	jQuery.ajax({
 		url: base + "data/test.js",
 		dataType: "script",
 		success: function(data){
@@ -519,72 +629,111 @@ test("$.ajax() - script, Remote", function() {
 	});
 });
 
-test("$.getJSON(String, Hash, Function) - JSON array", function() {
+test("jQuery.ajax() - script, Remote with POST", function() {
+	expect(3);
+
+	var base = window.location.href.replace(/\?.*$/, "");
+
+	stop();
+
+	window.foobar = null;
+	jQuery.ajax({
+		url: base + "data/test.js",
+		type: "POST",
+		dataType: "script",
+		success: function(data, status){
+			ok( foobar, "Script results returned (GET, no callback)" );
+			equals( status, "success", "Script results returned (GET, no callback)" );
+			start();
+		}
+	});
+});
+
+test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
+	expect(2);
+
+	var base = window.location.href.replace(/\?.*$/, "");
+	base = base.replace(/^.*?\/\//, "//");
+
+	stop();
+
+	window.foobar = null;
+	jQuery.ajax({
+		url: base + "data/test.js",
+		dataType: "script",
+		success: function(data){
+			ok( foobar, "Script results returned (GET, no callback)" );
+			start();
+		}
+	});
+});
+
+test("jQuery.getJSON(String, Hash, Function) - JSON array", function() {
 	expect(4);
 	stop();
-	$.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' );
-	  ok( json[1].age == 25, 'Check JSON: second, age' );
+	jQuery.getJSON(url("data/json.php"), {json: "array"}, function(json) {
+	  equals( json[0].name, 'John', 'Check JSON: first, name' );
+	  equals( json[0].age, 21, 'Check JSON: first, age' );
+	  equals( json[1].name, 'Peter', 'Check JSON: second, name' );
+	  equals( json[1].age, 25, 'Check JSON: second, age' );
 	  start();
 	});
 });
 
-test("$.getJSON(String, Function) - JSON object", function() {
+test("jQuery.getJSON(String, Function) - JSON object", function() {
 	expect(2);
 	stop();
-	$.getJSON(url("data/json.php"), function(json) {
-	  ok( json.data.lang == 'en', 'Check JSON: lang' );
-	  ok( json.data.length == 25, 'Check JSON: length' );
+	jQuery.getJSON(url("data/json.php"), function(json) {
+	  equals( json.data.lang, 'en', 'Check JSON: lang' );
+	  equals( json.data.length, 25, 'Check JSON: length' );
 	  start();
 	});
 });
 
-test("$.getJSON(String, Function) - Remote JSON object with assignment", function() {
+test("jQuery.getJSON(String, Function) - JSON object with absolute url to local content", function() {
 	expect(2);
 
 	var base = window.location.href.replace(/\?.*$/, "");
 
 	stop();
-	$.getJSON(base + "data/json_assigned_obj.js", function() {
-	  ok( typeof json_assigned_obj == "object", 'Check JSON loaded' );
-	  equals( json_assigned_obj.test, "worked", 'Check JSON obj.test' );
+	jQuery.getJSON(url(base + "data/json.php"), function(json) {
+	  equals( json.data.lang, 'en', 'Check JSON: lang' );
+	  equals( json.data.length, 25, 'Check JSON: length' );
 	  start();
 	});
 });
 
-test("$.post(String, Hash, Function) - simple with xml", function() {
+test("jQuery.post(String, Hash, Function) - simple with xml", function() {
 	expect(4);
 	stop();
-	$.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' );
+	jQuery.post(url("data/name.php"), {xml: "5-2"}, function(xml){
+	  jQuery('math', xml).each(function() {
+		    equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
+		    equals( jQuery('result', this).text(), '3', 'Check for 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' );
+	jQuery.post(url("data/name.php?xml=5-2"), {}, function(xml){
+	  jQuery('math', xml).each(function() {
+		    equals( jQuery('calculation', this).text(), '5-2', 'Check for XML' );
+		    equals( jQuery('result', this).text(), '3', 'Check for XML' );
 		 });
 	  start();
 	});
 });
 
-test("$.ajaxSetup({timeout: Number}) - with global timeout", function() {
+test("jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() {
 	stop();
 	
 	var passed = 0;
 
-	$.ajaxSetup({timeout: 1000});
+	jQuery.ajaxSetup({timeout: 1000});
 	
 	var pass = function() {
 		passed++;
 		if ( passed == 2 ) {
 			ok( true, 'Check local and global callbacks after timeout' );
-	     	$('#main').unbind("ajaxError");
+	     	jQuery('#main').unbind("ajaxError");
 			start();
 		}
 	};
@@ -594,9 +743,9 @@ test("$.ajaxSetup({timeout: Number}) - with global timeout", function() {
 		start();
 	};
 	
-	$('#main').ajaxError(pass);
+	jQuery('#main').ajaxError(pass);
 	
-	$.ajax({
+	jQuery.ajax({
 	  type: "GET",
 	  url: url("data/name.php?wait=5"),
 	  error: pass,
@@ -604,14 +753,14 @@ test("$.ajaxSetup({timeout: Number}) - with global timeout", function() {
 	});
 	
 	// reset timeout
-	$.ajaxSetup({timeout: 0});
+	jQuery.ajaxSetup({timeout: 0});
 });
 
-test("$.ajaxSetup({timeout: Number}) with localtimeout", function() {
+test("jQuery.ajaxSetup({timeout: Number}) with localtimeout", function() {
 	stop();
-	$.ajaxSetup({timeout: 50});
+	jQuery.ajaxSetup({timeout: 50});
 
-	$.ajax({
+	jQuery.ajax({
 	  type: "GET",
 	  timeout: 5000,
 	  url: url("data/name.php?wait=1"),
@@ -626,31 +775,31 @@ test("$.ajaxSetup({timeout: Number}) with localtimeout", function() {
 	});
 
 	// reset timeout
-	$.ajaxSetup({timeout: 0});
+	jQuery.ajaxSetup({timeout: 0});
 });
 
-test("$.ajax - simple get", function() {
+test("jQuery.ajax - simple get", function() {
 	expect(1);
 	stop();
-	$.ajax({
+	jQuery.ajax({
 	  type: "GET",
 	  url: url("data/name.php?name=foo"),
 	  success: function(msg){
-	    ok( msg == 'bar', 'Check for GET' );
+	    equals( msg, 'bar', 'Check for GET' );
 	    start();
 	  }
 	});
 });
 
-test("$.ajax - simple post", function() {
+test("jQuery.ajax - simple post", function() {
 	expect(1);
 	stop();
-	$.ajax({
+	jQuery.ajax({
 	  type: "POST",
 	  url: url("data/name.php"),
 	  data: "name=peter",
 	  success: function(msg){
-	    ok( msg == 'pan', 'Check for POST' );
+	    equals( msg, 'pan', 'Check for POST' );
 	    start();
 	  }
 	});
@@ -659,19 +808,19 @@ test("$.ajax - simple post", function() {
 test("ajaxSetup()", function() {
 	expect(1);
 	stop();
-	$.ajaxSetup({
+	jQuery.ajaxSetup({
 		url: url("data/name.php?name=foo"),
 		success: function(msg){
-	    	ok( msg == 'bar', 'Check for GET' );
+	    	equals( msg, 'bar', 'Check for GET' );
 			start();
 		}
 	});
-	$.ajax();
+	jQuery.ajax();
 });
 
 test("custom timeout does not set error message when timeout occurs, see #970", function() {
 	stop();
-	$.ajax({
+	jQuery.ajax({
 		url: "data/name.php?wait=10",
 		timeout: 500,
 		error: function(request, status) {
@@ -682,6 +831,22 @@ test("custom timeout does not set error message when timeout occurs, see #970",
 	});
 });
 
+test("data option: evaluate function values (#2806)", function() {
+	stop();
+	jQuery.ajax({
+		url: "data/echoQuery.php",
+		data: {
+			key: function() {
+				return "value";
+			}
+		},
+		success: function(result) {
+			equals( result, "key=value" );
+			start();
+		}
+	})
+});
+
 }
 
 //}