Commit a0cbf601 authored by Rick Waldron's avatar Rick Waldron

Split failing cross domain tests into two separate test bodies.

Signed-off-by: 's avatarRick Waldron <waldron.rick@gmail.com>
parent be1f1d7b
...@@ -2316,13 +2316,10 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) { ...@@ -2316,13 +2316,10 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
/* jQuery.each arguments end */ /* jQuery.each arguments end */
); );
test( "jQuery ajax - failing cross-domain", function() { asyncTest( "jQuery ajax - failing cross-domain (non-existing)", function() {
expect( 1 );
expect( 2 );
stop();
var i = 2; var i = 1;
jQuery.ajax({ jQuery.ajax({
url: "http://somewebsitethatdoesnotexist-67864863574657654.com", url: "http://somewebsitethatdoesnotexist-67864863574657654.com",
...@@ -2333,11 +2330,17 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) { ...@@ -2333,11 +2330,17 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
ok( true, "file not found: " + xhr.status + " => " + e ); ok( true, "file not found: " + xhr.status + " => " + e );
}, },
complete: function() { complete: function() {
if ( ! --i ) { if ( !--i ) {
start(); start();
} }
} }
}); });
});
asyncTest( "jQuery ajax - failing cross-domain", function() {
expect( 1 );
var i = 1;
jQuery.ajax({ jQuery.ajax({
url: "http://www.google.com", url: "http://www.google.com",
...@@ -2348,12 +2351,11 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) { ...@@ -2348,12 +2351,11 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
ok( true, "access denied: " + xhr.status + " => " + e ); ok( true, "access denied: " + xhr.status + " => " + e );
}, },
complete: function() { complete: function() {
if ( ! --i ) { if ( !--i ) {
start(); start();
} }
} }
}); });
}); });
test( "jQuery ajax - atom+xml", function() { test( "jQuery ajax - atom+xml", function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment