Complete overhaul of the Ajax test suite, it's now passing in all browsers. In order to achieve this I had to fix a numbe

r of bugs in the suite itself, along with other random bugs that popped up. The following bugs were resolved along the wa
y: #1236 (.extend() keeps processing when it hits nulls), #1028 (.extend() now works recursively), #1080 ($.get no longer
 overwrites the data parameter), #1210 (Creating script and link tags now work), and #1463 (jQuery.global has been re-too
led to no longer leak memory and slow things down).
This commit is contained in:
John Resig 2007-08-19 23:37:26 +00:00
parent 24db022ba0
commit 2ef4093cf7
14 changed files with 368 additions and 277 deletions

View file

@ -79,7 +79,10 @@ jQuery.fn.extend({
if ( status == "success" || !ifModified && status == "notmodified" )
self.html(res.responseText);
self.each( callback, [res.responseText, status, res] );
// Add delay to account for Safari's delay in globalEval
setTimeout(function(){
self.each( callback, [res.responseText, status, res] );
}, 13);
}
});
return this;
@ -570,18 +573,21 @@ jQuery.extend({
* @see ajaxSetup(Map)
*/
ajax: function( s ) {
// TODO introduce global settings, allowing the client to modify them for all requests, not only timeout
s = jQuery.extend({}, jQuery.ajaxSettings, s);
// Extend the settings, but re-extend 's' so that it can be
// checked again later (in the test suite, specifically)
s = jQuery.extend(s, jQuery.extend({}, jQuery.ajaxSettings, s));
// if data available
if ( s.data ) {
// convert data if not already a string
if (s.processData && typeof s.data != "string")
s.data = jQuery.param(s.data);
if ( s.processData && typeof s.data != "string" )
s.data = jQuery.param(s.data);
// append data to url for get requests
if( s.type.toLowerCase() == "get" ) {
if ( s.type.toLowerCase() == "get" ) {
// "?" + data or "&" + data (in case there are already params)
s.url += ((s.url.indexOf("?") > -1) ? "&" : "?") + s.data;
s.url += (s.url.indexOf("?") > -1 ? "&" : "?") + s.data;
// IE likes to send both get and post data, prevent this
s.data = null;
}
@ -662,7 +668,7 @@ jQuery.extend({
s.success( data, status );
// Fire the global callback
if( s.global )
if ( s.global )
jQuery.event.trigger( "ajaxSuccess", [xml, s] );
} else
jQuery.handleError(s, xml, status);
@ -685,21 +691,23 @@ jQuery.extend({
}
};
// don't attach the handler to the request, just poll it instead
var ival = setInterval(onreadystatechange, 13);
if ( s.async ) {
// don't attach the handler to the request, just poll it instead
var ival = setInterval(onreadystatechange, 13);
// Timeout checker
if ( s.timeout > 0 )
setTimeout(function(){
// Check to see if the request is still happening
if ( xml ) {
// Cancel the request
xml.abort();
if( !requestDone )
onreadystatechange( "timeout" );
}
}, s.timeout);
// Timeout checker
if ( s.timeout > 0 )
setTimeout(function(){
// Check to see if the request is still happening
if ( xml ) {
// Cancel the request
xml.abort();
if( !requestDone )
onreadystatechange( "timeout" );
}
}, s.timeout);
}
// Send the data
try {

View file

@ -1,42 +1,33 @@
module("ajax");
// Safari 3 crashes when running these tests, sigh
if ( !jQuery.browser.safari ) {
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%5Bbar%5D=&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%5B%5D=baz&foo%5B%5D=42&foo%5B%5D=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%5Bbar%5D=baz&foo%5Bbeep%5D=42&foo%5Bquux%5D=All%20your%20base%20are%20belong%20to%20us", "even more arrays" );
});
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()');
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("synchronous request", function() {
expect(1);
ok( /^{ "data"/.test( $.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
});
@ -50,12 +41,14 @@ test("synchronous request with callbacks", function() {
test("pass-through request object", function() {
expect(7);
stop(true);
var target = "data/name.html";
var count = 0;
var success = function() {
if(count++ == 6)
if(count++ == 5)
start();
}
var target = "data/name.html";
};
ok( $.get(url(target), success), "get" );
ok( $.getIfModified(url(target), success), "getIfModified" );
ok( $.post(url(target), success), "post" );
@ -64,7 +57,39 @@ test("pass-through request object", function() {
ok( $.ajax({url: url(target), success: success}), "generic" );
});
test("load(String, Object, Function) - simple: inject text into DOM", function() {
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)", function() {
expect(1);
stop(true); // check if load can be called with only url
$('#first').load("data/name.html", start);
});
test("load(String, Function) - simple: inject text into DOM", function() {
expect(2);
stop();
$('#first').load(url("data/name.html"), function() {
@ -73,99 +98,35 @@ test("load(String, Object, Function) - simple: inject text into DOM", function()
});
});
test("load(String, Object, Function) - inject without callback", function() {
expect(1);
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() {
test("load(String, Function) - check scripts", function() {
expect(7);
stop();
window.testFoo = undefined;
window.foobar = null;
var verifyEvaluation = function() {
ok( foobar == "bar", 'Check if script src was evaluated after load' );
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(url('data/test.php'), function() {
$('#first').load(url('data/test.html'), 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' );
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("load(String, Object, Function) - check file with only a script tag", function() {
test("load(String, Function) - check file with only a script tag", function() {
expect(3);
stop();
testFoo = undefined;
$('#first').load(url('data/test2.php'), function() {
$('#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("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: 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: 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);
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: 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: 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' );
ok( counter.send == 1, 'Check failed request without globals' );
start();
}});
}});
});
test("$.get(String, Hash, Function) - parse xml and use text() on nodes", function() {
expect(2);
stop();
@ -174,8 +135,8 @@ test("$.get(String, Hash, Function) - parse xml and use text() on nodes", functi
$('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();
});
});
@ -183,7 +144,7 @@ test("$.get(String, Hash, Function) - parse xml and use text() on nodes", functi
test("$.getIfModified(String, Hash, Function)", function() {
expect(1);
stop();
$.getIfModified(url("data/name.php"), function(msg) {
$.getIfModified(url("data/name.html"), function(msg) {
ok( /^ERROR/.test(msg), 'Check ifModified' );
start();
});
@ -193,7 +154,7 @@ test("$.getScript(String, Function) - with callback", function() {
expect(2);
stop();
$.getScript(url("data/test.js"), function() {
ok( foobar == "bar", 'Check if script was evaluated' );
equals( foobar, "bar", 'Check if script was evaluated' );
setTimeout(start, 100);
});
});
@ -201,9 +162,142 @@ test("$.getScript(String, Function) - with callback", function() {
test("$.getScript(String, Function) - no callback", function() {
expect(1);
stop(true);
$.getScript(url("data/test.js"));
$.getScript(url("data/test.js"), start);
});
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("test global handlers - success", function() {
expect( isLocal ? 4 : 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: url("data/name.html"), beforeSend: send, success: success, error: error, complete: function() {
equals( counter.error, 0, 'Check succesful request, error callback' );
equals( counter.success, 2, 'Check succesful request, success callback' );
equals( counter.complete, 3, 'Check succesful request, complete callback' );
equals( counter.send, 2, 'Check succesful request, send callback' );
if ( !isLocal ) {
counter.error = counter.success = counter.complete = counter.send = 0;
$.ajaxTimeout(500);
$.ajax({url: url("data/name.php?wait=5"), beforeSend: send, success: success, error: error, complete: function() {
equals( counter.error, 2, 'Check failed request, error callback' );
equals( counter.success, 0, 'Check failed request, success callback' );
equals( counter.complete, 3, 'Check failed request, failed callback' );
equals( counter.send, 2, 'Check failed request, send callback' );
start();
}});
} else
start();
}});
});
test("test global handlers - failure", function() {
expect( isLocal ? 4 : 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++ };
$.ajaxTimeout(0);
$('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
$.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' );
if ( !isLocal ) {
counter.error = counter.success = counter.complete = counter.send = 0;
$.ajaxTimeout(500);
$.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' );
ok( counter.send == 1, 'Check failed request without globals' );
start();
}});
} else
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();
}
});
});
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' );
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' );
ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
setTimeout(verifyEvaluation, 600);
}
});
});
if ( !isLocal ) {
test("$.getJSON(String, Hash, Function) - JSON array", function() {
expect(4);
stop();
@ -216,7 +310,7 @@ 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(url("data/json.php"), function(json) {
@ -240,30 +334,34 @@ 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: url("data/name.php?wait=5"),
error: pass,
success: fail
});
// reset timeout
$.ajaxTimeout(0);
});
@ -313,58 +411,6 @@ 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' );
start();
};
$.ajax({
dataType: "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' );
setTimeout(verifyEvaluation, 600);
}
});
});
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) {
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();
}
});
});
test("$.ajax - beforeSend", function() {
expect(1);
stop();
var check = false;
$.ajax({
url: url("data/name.php"),
data: {'req': true},
beforeSend: function(xml) {
check = true
},
success: function(data) {
ok( check, "check beforeSend was executed" );
start();
}
});
});
test("ajaxSetup()", function() {
expect(1);
@ -393,3 +439,5 @@ test("custom timeout does not set error message when timeout occurs, see #970",
});
}
}