mirror of
https://github.com/jquery/jquery.git
synced 2024-12-09 08:04:24 +00:00
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:
parent
24db022ba0
commit
2ef4093cf7
@ -11,8 +11,8 @@ window.onload = function(){
|
||||
load(
|
||||
"src/jquery/coreTest.js",
|
||||
"src/selector/selectorTest.js",
|
||||
"src/event/eventTest.js",
|
||||
"src/fx/fxTest.js"
|
||||
"src/event/eventTest.js"
|
||||
//"src/fx/fxTest.js",
|
||||
//"src/ajax/ajaxTest.js"
|
||||
);
|
||||
|
||||
|
7
build/test/data/test.html
Normal file
7
build/test/data/test.html
Normal file
@ -0,0 +1,7 @@
|
||||
html text<br/>
|
||||
<script type="text/javascript">/* <![CDATA[ */
|
||||
testFoo = "foo"; $('#foo').html('foo');
|
||||
ok( true, "test.html executed" );
|
||||
/* ]]> */</script>
|
||||
<script src="data/test.js"></script>
|
||||
blabla
|
@ -1,3 +1,3 @@
|
||||
foobar = "bar";
|
||||
var foobar = "bar";
|
||||
$('#ap').html('bar');
|
||||
ok( true, "test.js executed");
|
5
build/test/data/test2.html
Normal file
5
build/test/data/test2.html
Normal file
@ -0,0 +1,5 @@
|
||||
<script type="text/javascript">
|
||||
var testFoo = "foo";
|
||||
$('#foo').html('foo');
|
||||
ok( true, "test2.html executed" );
|
||||
</script>
|
@ -1,3 +0,0 @@
|
||||
<script type="text/javascript">
|
||||
testFoo = "foo"; $('#foo').html('foo');ok( true, "test2.php executed" );
|
||||
</script>
|
@ -13,6 +13,8 @@ var _config = {
|
||||
asyncTimeout: 2 // seconds for async timeout
|
||||
};
|
||||
|
||||
var isLocal = !!(window.location.protocol == 'file:');
|
||||
|
||||
$(function() {
|
||||
$('#userAgent').html(navigator.userAgent);
|
||||
runTest();
|
||||
@ -39,13 +41,17 @@ function stop(allowFailure) {
|
||||
ok( false, "Test timed out" );
|
||||
start();
|
||||
};
|
||||
_config.timeout = setTimeout(handler, _config.asyncTimeout * 1000);
|
||||
// Disabled, caused too many random errors
|
||||
//_config.timeout = setTimeout(handler, _config.asyncTimeout * 1000);
|
||||
}
|
||||
function start() {
|
||||
// A slight delay, to avoid any current callbacks
|
||||
setTimeout(function(){
|
||||
if(_config.timeout)
|
||||
clearTimeout(_config.timeout);
|
||||
_config.blocking = false;
|
||||
process();
|
||||
}, 13);
|
||||
}
|
||||
|
||||
function runTest() {
|
||||
@ -271,7 +277,7 @@ function url(value) {
|
||||
* @param Object actual
|
||||
* @param String message (optional)
|
||||
*/
|
||||
function equals(expected, actual, message) {
|
||||
function equals(actual, expected, message) {
|
||||
var result = expected == actual;
|
||||
message = message || (result ? "okay" : "failed");
|
||||
_config.Test.push( [ result, result ? message + ": " + expected : message + " expected: " + expected + " actual: " + actual ] );
|
||||
|
@ -9,7 +9,7 @@
|
||||
<script type="text/javascript" src="../src/jquery/coreTest.js"></script>
|
||||
<script type="text/javascript" src="../src/selector/selectorTest.js"></script>
|
||||
<script type="text/javascript" src="../src/event/eventTest.js"></script>
|
||||
<!--<script type="text/javascript" src="../src/ajax/ajaxTest.js"></script>-->
|
||||
<script type="text/javascript" src="../src/ajax/ajaxTest.js"></script>
|
||||
<script type="text/javascript" src="../src/fx/fxTest.js"></script>
|
||||
</head>
|
||||
|
||||
|
@ -79,7 +79,10 @@ jQuery.fn.extend({
|
||||
if ( status == "success" || !ifModified && status == "notmodified" )
|
||||
self.html(res.responseText);
|
||||
|
||||
// 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")
|
||||
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,6 +691,7 @@ jQuery.extend({
|
||||
}
|
||||
};
|
||||
|
||||
if ( s.async ) {
|
||||
// don't attach the handler to the request, just poll it instead
|
||||
var ival = setInterval(onreadystatechange, 13);
|
||||
|
||||
@ -700,6 +707,7 @@ jQuery.extend({
|
||||
onreadystatechange( "timeout" );
|
||||
}
|
||||
}, s.timeout);
|
||||
}
|
||||
|
||||
// Send the data
|
||||
try {
|
||||
|
@ -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®ularThing=blah", "with array" );
|
||||
equals( $.param(params), "someName=1&someName=2&someName=3®ularThing=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");
|
||||
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);
|
||||
});
|
||||
@ -314,58 +412,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);
|
||||
stop();
|
||||
@ -393,3 +439,5 @@ test("custom timeout does not set error message when timeout occurs, see #970",
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -71,12 +71,8 @@ jQuery.event = {
|
||||
// Add the function to the element's handler list
|
||||
handlers[handler.guid] = handler;
|
||||
|
||||
// Remember the function in a global list (for triggering)
|
||||
if (!this.global[type])
|
||||
this.global[type] = [];
|
||||
// Only add the element to the global list once
|
||||
if (jQuery.inArray(element, this.global[type]) == -1)
|
||||
this.global[type].push( element );
|
||||
// Keep track of which events have been used, for global triggering
|
||||
this.global[type] = true;
|
||||
},
|
||||
|
||||
guid: 1,
|
||||
@ -116,10 +112,6 @@ jQuery.event = {
|
||||
element.detachEvent("on" + type, element.$handle);
|
||||
ret = null;
|
||||
delete events[type];
|
||||
|
||||
// Remove element from the global event type cache
|
||||
while ( this.global[type] && ( (index = jQuery.inArray(element, this.global[type])) >= 0 ) )
|
||||
delete this.global[type][index];
|
||||
}
|
||||
}
|
||||
|
||||
@ -135,13 +127,13 @@ jQuery.event = {
|
||||
data = jQuery.makeArray(data || []);
|
||||
|
||||
// Handle a global trigger
|
||||
if ( !element )
|
||||
jQuery.each( this.global[type] || [], function(){
|
||||
jQuery.event.trigger( type, data, this );
|
||||
});
|
||||
if ( !element ) {
|
||||
// Only trigger if we've ever bound an event for it
|
||||
if ( this.global[type] )
|
||||
jQuery("*").trigger(type, data);
|
||||
|
||||
// Handle triggering a single element
|
||||
else {
|
||||
} else {
|
||||
var val, ret, fn = jQuery.isFunction( element[ type ] || null );
|
||||
|
||||
// Pass along a fake event
|
||||
@ -986,16 +978,3 @@ new function(){
|
||||
jQuery.event.add( window, "load", jQuery.ready );
|
||||
|
||||
};
|
||||
|
||||
// Clean up after IE to avoid memory leaks
|
||||
if (jQuery.browser.msie)
|
||||
jQuery(window).one("unload", function() {
|
||||
var global = jQuery.event.global;
|
||||
for ( var type in global ) {
|
||||
var els = global[type], i = els.length;
|
||||
if ( i && type != 'unload' )
|
||||
do
|
||||
els[i-1] && jQuery.event.remove(els[i-1], type);
|
||||
while (--i);
|
||||
}
|
||||
});
|
||||
|
@ -196,7 +196,7 @@ jQuery.each( from, function(fn, f){
|
||||
|
||||
if ( t_h == "show" ) {
|
||||
var old_h = jQuery.curCSS(this, "height");
|
||||
$(elem).append("<br>Some more text<br>and some more...");
|
||||
$(elem).append("<br/>Some more text<br/>and some more...");
|
||||
ok(old_h != jQuery.css(this, "height" ), "Make sure height is auto.");
|
||||
}
|
||||
|
||||
|
51
src/jquery/coreTest.js
vendored
51
src/jquery/coreTest.js
vendored
@ -116,6 +116,18 @@ test("isFunction", function() {
|
||||
});
|
||||
});
|
||||
|
||||
test("$('html')", function() {
|
||||
expect(2);
|
||||
|
||||
reset();
|
||||
ok( $("<script>var foo='test';</script>")[0], "Creating a script" );
|
||||
|
||||
reset();
|
||||
ok( $("<link rel='stylesheet'/>")[0], "Creating a link" );
|
||||
|
||||
reset();
|
||||
});
|
||||
|
||||
test("length", function() {
|
||||
expect(1);
|
||||
ok( $("p").length == 6, "Get Number of Elements Found" );
|
||||
@ -194,8 +206,7 @@ test("attr(String)", function() {
|
||||
ok( $('#tAnchor5').attr('href') == "#5", 'Check for non-absolute href (an anchor)' );
|
||||
});
|
||||
|
||||
if ( location.protocol != "file:" ) {
|
||||
test("attr(String) in XML Files", function() {
|
||||
test("attr(String) in XML Files", function() {
|
||||
expect(2);
|
||||
stop();
|
||||
$.get("data/dashboard.xml", function(xml) {
|
||||
@ -203,8 +214,7 @@ if ( location.protocol != "file:" ) {
|
||||
ok( $("location", xml).attr("for") == "bar", "Check for attribute in XML document" );
|
||||
start();
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test("attr(String, Function)", function() {
|
||||
expect(2);
|
||||
@ -247,8 +257,7 @@ test("attr(String, Object)", function() {
|
||||
ok( document.getElementById('name').maxLength == '5', 'Set maxlength attribute' );
|
||||
});
|
||||
|
||||
if ( location.protocol != "file:" ) {
|
||||
test("attr(String, Object)x", function() {
|
||||
test("attr(String, Object) - Loaded via XML document", function() {
|
||||
expect(2);
|
||||
stop();
|
||||
$.get('data/dashboard.xml', function(xml) {
|
||||
@ -260,8 +269,7 @@ if ( location.protocol != "file:" ) {
|
||||
ok( titles[1] == 'Users', 'attr() in XML context: Check second title' );
|
||||
start();
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
test("css(String|Hash)", function() {
|
||||
expect(19);
|
||||
@ -652,27 +660,40 @@ test("is(String)", function() {
|
||||
});
|
||||
|
||||
test("$.extend(Object, Object)", function() {
|
||||
expect(2);
|
||||
expect(10);
|
||||
|
||||
var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
|
||||
options = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
|
||||
optionsCopy = { xnumber2: 1, xstring2: "x", xxx: "newstring" },
|
||||
merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" };
|
||||
merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "x", xxx: "newstring" },
|
||||
deep1 = { foo: { bar: true } },
|
||||
deep1copy = { foo: { bar: true } },
|
||||
deep2 = { foo: { baz: true } },
|
||||
deep2copy = { foo: { baz: true } },
|
||||
deepmerged = { foo: { bar: true, baz: true } };
|
||||
|
||||
jQuery.extend(settings, options);
|
||||
isObj( settings, merged, "Check if extended: settings must be extended" );
|
||||
isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
|
||||
});
|
||||
|
||||
test("$.extend(Object, Object, Object, Object)", function() {
|
||||
expect(4);
|
||||
jQuery.extend(settings, null, options);
|
||||
isObj( settings, merged, "Check if extended: settings must be extended" );
|
||||
isObj( options, optionsCopy, "Check if not modified: options must not be modified" );
|
||||
|
||||
jQuery.extend(deep1, deep2);
|
||||
isObj( deep1.foo, deepmerged.foo, "Check if foo: settings must be extended" );
|
||||
isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" );
|
||||
|
||||
var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
|
||||
defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
|
||||
options1 = { xnumber2: 1, xstring2: "x" },
|
||||
options1Copy = { xnumber2: 1, xstring2: "x" },
|
||||
options2 = { xstring2: "xx", xxx: "newstringx" },
|
||||
options2Copy = { xstring2: "xx", xxx: "newstringx" },
|
||||
merged = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
|
||||
merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
|
||||
|
||||
var settings = jQuery.extend({}, defaults, options1, options2);
|
||||
isObj( settings, merged, "Check if extended: settings must be extended" );
|
||||
isObj( settings, merged2, "Check if extended: settings must be extended" );
|
||||
isObj( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );
|
||||
isObj( options1, options1Copy, "Check if not modified: options1 must not be modified" );
|
||||
isObj( options2, options2Copy, "Check if not modified: options2 must not be modified" );
|
||||
|
32
src/jquery/jquery.js
vendored
32
src/jquery/jquery.js
vendored
@ -1252,17 +1252,33 @@ jQuery.fn = jQuery.prototype = {
|
||||
*/
|
||||
jQuery.extend = jQuery.fn.extend = function() {
|
||||
// copy reference to target object
|
||||
var target = arguments[0], a = 1;
|
||||
var target = arguments[0] || {}, a = 1, al = arguments.length;
|
||||
|
||||
// extend jQuery itself if only one argument is passed
|
||||
if ( arguments.length == 1 ) {
|
||||
if ( al == 1 ) {
|
||||
target = this;
|
||||
a = 0;
|
||||
}
|
||||
|
||||
var prop;
|
||||
while ( (prop = arguments[a++]) != null )
|
||||
|
||||
for ( ; a < al; a++ )
|
||||
// Only deal with non-null/undefined values
|
||||
if ( (prop = arguments[a]) != null )
|
||||
// Extend the base object
|
||||
for ( var i in prop ) target[i] = prop[i];
|
||||
for ( var i in prop ) {
|
||||
// Prevent never-ending loop
|
||||
if ( target == prop[i] )
|
||||
continue;
|
||||
|
||||
// Recurse if we're merging object values
|
||||
if ( typeof prop[i] == 'object' && target[i] )
|
||||
jQuery.extend( target[i], prop[i] );
|
||||
|
||||
// Don't bring in undefined values
|
||||
else if ( prop[i] != undefined )
|
||||
target[i] = prop[i];
|
||||
}
|
||||
|
||||
// Return the modified object
|
||||
return target;
|
||||
@ -1577,7 +1593,11 @@ jQuery.extend({
|
||||
[3, "<table><tbody><tr>", "</tr></tbody></table>"] ||
|
||||
|
||||
!s.indexOf("<col") &&
|
||||
[2, "<table><colgroup>", "</colgroup></table>"] ||
|
||||
[2, "<table><tbody></tbody><colgroup>", "</colgroup></table>"] ||
|
||||
|
||||
// IE can't serialize <link> and <script> tags normally
|
||||
jQuery.browser.msie &&
|
||||
[1, "div<div>", "</div>"] ||
|
||||
|
||||
[0,"",""];
|
||||
|
||||
@ -1586,7 +1606,7 @@ jQuery.extend({
|
||||
|
||||
// Move to the right depth
|
||||
while ( wrap[0]-- )
|
||||
div = div.firstChild;
|
||||
div = div.lastChild;
|
||||
|
||||
// Remove IE's autoinserted <tbody> from table fragments
|
||||
if ( jQuery.browser.msie ) {
|
||||
|
Loading…
Reference in New Issue
Block a user