]> source.dussan.org Git - jquery.git/commitdiff
Split failing cross domain tests into two separate test bodies.
authorRick Waldron <waldron.rick@gmail.com>
Mon, 15 Oct 2012 20:00:50 +0000 (16:00 -0400)
committerRick Waldron <waldron.rick@gmail.com>
Mon, 15 Oct 2012 20:00:50 +0000 (16:00 -0400)
Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
test/unit/ajax.js

index 547dcae8fb96ce080429e79fbe322684ee671f5e..8c1033ee0601d80864f7ea5a9c4afb2708e25ebe 100644 (file)
@@ -2316,13 +2316,10 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
                /* jQuery.each arguments end */
        );
 
-       test( "jQuery ajax - failing cross-domain", function() {
-
-               expect( 2 );
-
-               stop();
+       asyncTest( "jQuery ajax - failing cross-domain (non-existing)", function() {
+               expect( 1 );
 
-               var i = 2;
+               var i = 1;
 
                jQuery.ajax({
                        url: "http://somewebsitethatdoesnotexist-67864863574657654.com",
@@ -2333,11 +2330,17 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
                                ok( true, "file not found: " + xhr.status + " => " + e );
                        },
                        complete: function() {
-                               if ( ! --i ) {
+                               if ( !--i ) {
                                        start();
                                }
                        }
                });
+       });
+
+       asyncTest( "jQuery ajax - failing cross-domain", function() {
+               expect( 1 );
+
+               var i = 1;
 
                jQuery.ajax({
                        url: "http://www.google.com",
@@ -2348,12 +2351,11 @@ if ( jQuery.ajax && ( !isLocal || hasPHP ) ) {
                                ok( true, "access denied: " + xhr.status + " => " + e );
                        },
                        complete: function() {
-                               if ( ! --i ) {
+                               if ( !--i ) {
                                        start();
                                }
                        }
                });
-
        });
 
        test( "jQuery ajax - atom+xml", function() {