X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fajax%2FajaxTest.js;h=200376c00d626730ef52a980637c3e64fb226b7c;hb=d776dc9d5c5322e81b56272728325990ed6892bb;hp=ad85e0531682f8ae3cf0027f8694a462bd4081dc;hpb=6b8ffe79f4e616d6179f6b16099e7c25e7ae5cb1;p=jquery.git

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index ad85e05..200376c 100644
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -4,7 +4,7 @@ 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' );
+	ok( data == 'action=Test&text2=Test&radio1=on&radio2=on&check=on&=on&hidden=&foo%5Bbar%5D=&name=name&=foobar&select1=&select2=3&select3=1', 'Check form serialization as query string' );
 });
 
 test("param", function() {
@@ -16,43 +16,58 @@ test("param", function() {
 	ok( $.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" );
+	ok( $.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" );
+	ok( $.param(params) == "foo%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" );
 });
 
-test("pass-through request object", function() {
-	expect(7);
-	stop();
-	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("evalScripts() with no script elements", function() {
+    expect(2);
+
+    var data = "this is just some bogus text";
+    $('#foo').html(data);
+    ok ( true, 'before evalScripts()');
+    try {
+        $('#foo').evalScripts();
+    } catch(e) {
+        ok (false, 'exception evaluating scripts: ' + e.message);
+    }
+    ok ( true, 'after evalScripts()');
 });
 
 test("synchronous request", function() {
-	ok( /^{ "data"/.test( $.ajax({url: "data/json.php", async: false}).responseText ), "check returned text" );
+	ok( /^{ "data"/.test( $.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: "data/json.php", async: false, success: function(data) { result = data; } });
+	$.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(7);
+	stop(true);
+	var count = 0;
+	var success = function() {
+		if(count++ == 6)
+			start();
+	}
+	var target = "data/name.html";
+	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("load(String, Object, Function) - simple: inject text into DOM", function() {
 	expect(2);
 	stop();
-	$('#first').load("data/name.php", function() {
+	$('#first').load(url("data/name.html"), function() {
 		ok( /^ERROR/.test($('#first').text()), 'Check if content was injected into the DOM' );
 		start();
 	});
@@ -60,27 +75,41 @@ 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
-	$('#first').load("data/name.php");
+	stop(true); // check if load can be called with only url
+	$('#first').load("data/name.html");
 });
 
+if ( location.protocol != "file:" ) {
+
 test("load(String, Object, 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');
 	  start();
 	};
-	$('#first').load('data/test.html', function() {
+	$('#first').load(url('data/test.php'), function() {
 	  ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
+	  ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
 	  ok( testFoo == "foo", 'Check if script was evaluated after load' );
 	  setTimeout(verifyEvaluation, 600);
 	});
 });
 
+test("load(String, Object, Function) - check file with only a script tag", function() {
+	expect(3);
+	stop();
+	testFoo = undefined;
+	$('#first').load(url('data/test2.php'), function() {
+	  ok( $('#foo').html() == 'foo', 'Check if script evaluation has modified DOM');
+	  ok( testFoo == "foo", 'Check if script was evaluated after load' );
+	  start();
+	});
+});
+
 test("test global handlers - success", function() {
 	expect(8);
 	stop();
@@ -92,14 +121,14 @@ test("test global handlers - success", function() {
 
 	$('#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() {
+	$.ajax({url: 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() {
+	  $.ajax({url: 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' );
@@ -119,14 +148,15 @@ test("test global handlers - failure", function() {
 		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() {
+	$.ajax({url: 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() {
+	  $.ajax({url: 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' );
@@ -139,7 +169,7 @@ test("test global handlers - failure", function() {
 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());
@@ -153,7 +183,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.php"), function(msg) {
 	    ok( /^ERROR/.test(msg), 'Check ifModified' );
 	    start();
 	});
@@ -162,7 +192,7 @@ test("$.getIfModified(String, Hash, Function)", function() {
 test("$.getScript(String, Function) - with callback", function() {
 	expect(2);
 	stop();
-	$.getScript("data/test.js", function() {
+	$.getScript(url("data/test.js"), function() {
 		ok( foobar == "bar", 'Check if script was evaluated' );
 		setTimeout(start, 100);
 	});
@@ -170,14 +200,14 @@ test("$.getScript(String, Function) - with callback", function() {
 
 test("$.getScript(String, Function) - no callback", function() {
 	expect(1);
-	stop();
-	$.getScript("data/test.js");
+	stop(true);
+	$.getScript(url("data/test.js"));
 });
 
 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' );
@@ -189,7 +219,7 @@ test("$.getJSON(String, Hash, Function) - JSON array", function() {
 test("$.getJSON(String, Hash, 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();
@@ -199,7 +229,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' );
@@ -230,7 +260,7 @@ test("$.ajaxTimeout(Number) - with global timeout", function() {
 	$('#main').ajaxError(pass);
 	$.ajax({
 	  type: "GET",
-	  url: "data/name.php?wait=5",
+	  url: url("data/name.php?wait=5"),
 	  error: pass,
 	  success: fail
 	});
@@ -243,7 +273,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();
@@ -262,7 +292,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();
@@ -275,7 +305,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' );
@@ -287,6 +317,7 @@ test("$.ajax - simple post", function() {
 test("$.ajax - dataType html", function() {
 	expect(5);
 	stop();
+	foobar = null;
 	testFoo = undefined;
 	var verifyEvaluation = function() {
 	  ok( foobar == "bar", 'Check if script src was evaluated for datatype html' );
@@ -294,7 +325,7 @@ test("$.ajax - dataType html", function() {
 	};
 	$.ajax({
 	  dataType: "html",
-	  url: "data/test.html",
+	  url: url("data/test.php"),
 	  success: function(data) {
 	    ok( data.match(/^html text/), 'Check content for datatype html' );
 	    ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
@@ -307,7 +338,9 @@ test("$.ajax - xml: non-namespace elements inside namespaced elements", function
 	expect(3);
 	stop();
 	$.ajax({
-	  url: "data/with_fries.xml", dataType: "xml", type: "GET", data: "", success: function(resp) {
+	  url: url("data/with_fries.xml"),
+	  dataType: "xml",
+	  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' );
@@ -319,16 +352,44 @@ 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", 
+		url: 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: url("data/name.php?name=foo"),
+		success: function(msg){
+	    	ok( msg == 'bar', 'Check for GET' );
+			start();
+		}
+	});
+	$.ajax();
+});
+
+test("custom timeout does not set error message when timeout occurs, see #970", function() {
+	stop();
+	$.ajax({
+		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
+});
+
+}