X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=9514a8edc4a818459af1d4755efac3b389d8beb5;hb=c6e88b16e9f6e45d87019db45dd04d27482d25d7;hp=162650f3bec16c66239c10b6bcfd2ada05676d62;hpb=b45325765327d257f00b55cd5383287c1bd94875;p=jquery.git

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 162650f..9514a8e 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -136,6 +136,27 @@ test("$.ajax - beforeSend", function() {
 	});
 });
 
+test("$.ajax - beforeSend, cancel request (#2688)", function() {
+	expect(2);
+	var request = $.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() {
@@ -146,8 +167,8 @@ 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();
 	};
 
@@ -218,40 +239,74 @@ test("synchronous request with callbacks", function() {
 });
 
 test("pass-through request object", function() {
-	expect(1);
+	expect(8);
 	stop(true);
 	
 	var target = "data/name.html";
-	var count = 0;
+	var successCount = 0;
+	var errorCount = 0;
+  var errorEx = "";
 	var success = function() {
-		// Disabled
-		//if(count++ == 5)
-		start();
+		successCount++;
 	};
+	$("#foo").ajaxError(function (e, xml, s, ex) {
+		errorCount++;
+    errorEx += ": " + xml.status;
+	});
+	$("#foo").one('ajaxStop', function () {
+		equals(successCount, 5, "Check all ajax calls successful");
+		equals(errorCount, 0, "Check no ajax errors (status" + errorEx + ")");
+		$("#foo").unbind('ajaxError');
+		start();
+	});
 	
-	/* Test disabled, too many simultaneous requests
 	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" );
 });
 
+test("ajax cache", function () {
+	expect(18);
+	stop();
+	
+	var count = 0;
+
+	$("#firstp").bind("ajaxSuccess", function (e, xml, s) {
+		var re = /_=(.*?)(&|$)/g;
+    var oldOne = null;
+		for (var i = 0; i < 6; i++) {
+      var ret = re.exec(s.url);
+			if (!ret) {
+				break;
+			}
+      oldOne = ret[1];
+		}
+		equals(i, 1, "Test to make sure only one 'no-cache' parameter is there");
+		ok(oldOne != "tobereplaced555", "Test to be sure parameter (if it was there) was replaced");
+		if(++count == 6)
+			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" );
+});
+
 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" );
-
-    t = jQuery.extend({}, orig);
 	t.data = {};
     $.ajax(t);
 	ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" );
@@ -279,6 +334,19 @@ test("load('url selector')", function() {
 	});
 });
 
+test("load(String, Function) with ajaxSetup on dataType json, see #2046", function() {
+	expect(1);
+	stop();
+	$.ajaxSetup({ dataType: "json" });
+	$("#first").ajaxComplete(function (e, xml, s) {
+		equals( s.dataType, "html", "Verify the load() dataType was html" );
+		$("#first").unbind("ajaxComplete");
+		$.ajaxSetup({ dataType: "" });
+		start();
+	});
+	$('#first').load("data/test3.html");
+});
+
 test("load(String, Function) - simple: inject text into DOM", function() {
 	expect(2);
 	stop();
@@ -294,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( $('#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);
+		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);
 	});
 });
 
@@ -311,9 +379,33 @@ test("load(String, Function) - check file with only a script tag", function() {
 	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();
+		equals( $('#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();
+	
+	$('<div />').load(url('data/params_html.php'), { foo:3, bar:'ok' }, function() {
+		var $post = $(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();
+	
+	$('<div />').load(url('data/params_html.php'), 'foo=3&bar=ok', function() {
+		var $get = $(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();
 	});
 });
 
@@ -334,6 +426,7 @@ test("$.get(String, Hash, Function) - parse xml and use text() on nodes", functi
 test("$.getScript(String, Function) - with callback", function() {
 	expect(2);
 	stop();
+	window.foobar = null;
 	$.getScript(url("data/test.js"), function() {
 		equals( foobar, "bar", 'Check if script was evaluated' );
 		setTimeout(start, 100);
@@ -360,6 +453,10 @@ test("$.ajax() - JSONP, Local", function() {
 		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();
 		}
 	});
 
@@ -369,6 +466,10 @@ test("$.ajax() - JSONP, Local", function() {
 		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();
 		}
 	});
 
@@ -379,16 +480,24 @@ test("$.ajax() - JSONP, Local", function() {
 		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({
 		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();
 		}
 	});
 
@@ -399,6 +508,10 @@ test("$.ajax() - JSONP, Local", function() {
 		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();
 		}
 	});
 
@@ -410,17 +523,25 @@ 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({
 		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();
 		}
 	});
 });
@@ -441,6 +562,10 @@ test("$.ajax() - JSONP, Remote", function() {
 		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();
 		}
 	});
 
@@ -450,6 +575,10 @@ test("$.ajax() - JSONP, Remote", function() {
 		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();
 		}
 	});
 
@@ -460,16 +589,24 @@ test("$.ajax() - JSONP, Remote", function() {
 		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({
 		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();
 		}
 	});
 });
@@ -481,6 +618,46 @@ test("$.ajax() - script, Remote", function() {
 
 	stop();
 
+	window.foobar = null;
+	$.ajax({
+		url: base + "data/test.js",
+		dataType: "script",
+		success: function(data){
+			ok( foobar, "Script results returned (GET, no callback)" );
+			start();
+		}
+	});
+});
+
+test("$.ajax() - script, Remote with POST", function() {
+	expect(3);
+
+	var base = window.location.href.replace(/\?.*$/, "");
+
+	stop();
+
+	window.foobar = null;
+	$.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("$.ajax() - script, Remote with scheme-less URL", function() {
+	expect(2);
+
+	var base = window.location.href.replace(/\?.*$/, "");
+	base = base.replace(/^.*?\/\//, "//");
+
+	stop();
+
+	window.foobar = null;
 	$.ajax({
 		url: base + "data/test.js",
 		dataType: "script",
@@ -495,10 +672,10 @@ test("$.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' );
+	  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();
 	});
 });
@@ -507,8 +684,21 @@ test("$.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' );
+	  equals( json.data.lang, 'en', 'Check JSON: lang' );
+	  equals( json.data.length, 25, 'Check JSON: length' );
+	  start();
+	});
+});
+
+test("$.getJSON(String, Function) - JSON object with absolute url to local content", function() {
+	expect(2);
+
+	var base = window.location.href.replace(/\?.*$/, "");
+
+	stop();
+	$.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();
 	});
 });
@@ -518,15 +708,15 @@ test("$.post(String, Hash, Function) - simple with xml", function() {
 	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' );
+		    equals( $('calculation', this).text(), '5-2', 'Check for XML' );
+		    equals( $('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' );
+		    equals( $('calculation', this).text(), '5-2', 'Check for XML' );
+		    equals( $('result', this).text(), '3', 'Check for XML' );
 		 });
 	  start();
 	});
@@ -595,7 +785,7 @@ test("$.ajax - simple get", function() {
 	  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();
 	  }
 	});
@@ -609,7 +799,7 @@ test("$.ajax - simple post", function() {
 	  url: url("data/name.php"),
 	  data: "name=peter",
 	  success: function(msg){
-	    ok( msg == 'pan', 'Check for POST' );
+	    equals( msg, 'pan', 'Check for POST' );
 	    start();
 	  }
 	});
@@ -621,7 +811,7 @@ test("ajaxSetup()", function() {
 	$.ajaxSetup({
 		url: url("data/name.php?name=foo"),
 		success: function(msg){
-	    	ok( msg == 'bar', 'Check for GET' );
+	    	equals( msg, 'bar', 'Check for GET' );
 			start();
 		}
 	});
@@ -641,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();
+	$.ajax({
+		url: "data/echoQuery.php",
+		data: {
+			key: function() {
+				return "value";
+			}
+		},
+		success: function(result) {
+			equals( result, "key=value" );
+			start();
+		}
+	})
+});
+
 }
 
 //}