aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit/ajax.js
diff options
context:
space:
mode:
authorRichard Gibson <richard.gibson@gmail.com>2012-11-08 10:05:10 -0500
committerRichard Gibson <richard.gibson@gmail.com>2012-11-08 10:10:43 -0500
commit517846aad247aa3677d156aa426f71b8dcacdcf7 (patch)
treec891caaeae3cda48613ac4abc541395013c51faa /test/unit/ajax.js
parent877306738f931a711c41d907e69fc8930f985830 (diff)
downloadjquery-517846aad247aa3677d156aa426f71b8dcacdcf7.tar.gz
jquery-517846aad247aa3677d156aa426f71b8dcacdcf7.zip
No ticket: speedup test suite. Close gh-1020.
Diffstat (limited to 'test/unit/ajax.js')
-rw-r--r--test/unit/ajax.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 1f3654a60..86ded7f3f 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -1481,9 +1481,7 @@
jQuery.getScript( url("data/test.js"), function( data, _, jqXHR ) {
equal( foobar, "bar", "Check if script was evaluated" );
strictEqual( data, jqXHR.responseText, "Same-domain script requests returns the source of the script (#8082)" );
- setTimeout(function() {
- start();
- }, 1000 );
+ start();
});
});
@@ -2221,7 +2219,7 @@
test( "jQuery.ajaxSetup({timeout: Number}) - with global timeout", function() {
var passed = 0;
- expect( 1 );
+ expect( 2 );
stop();
@@ -2230,9 +2228,8 @@
});
var pass = function() {
- passed++;
+ ok( passed++ < 2, "Error callback executed" );
if ( passed == 2 ) {
- ok( true, "Check local and global callbacks after timeout" );
jQuery("#qunit-fixture").unbind("ajaxError");
start();
}