Merge branch 'bug_6158' of https://github.com/jboesch/jquery into jboesch-bug_6158

[jquery.git] / test / unit / ajax.js

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 4ce15f8..7c572a3 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -492,7 +492,7 @@ test(".ajax() - hash", function() {
 
 test("jQuery ajax - cross-domain detection", function() {
 
-       expect( 4 );
+       expect( 6 );
 
        var loc = document.location,
                otherPort = loc.port === 666 ? 667 : 666,
@@ -509,6 +509,15 @@ test("jQuery ajax - cross-domain detection", function() {
 
        jQuery.ajax({
                dataType: "jsonp",
+               url: 'app:/path',
+               beforeSend: function( _ , s ) {
+                       ok( s.crossDomain , "Adobe AIR app:/ URL detected as cross-domain" );
+                       return false;
+               }
+       });
+
+       jQuery.ajax({
+               dataType: "jsonp",
                url: loc.protocol + '//somewebsitethatdoesnotexist-656329477541.com:' + ( loc.port || 80 ),
                beforeSend: function( _ , s ) {
                        ok( s.crossDomain , "Test different hostnames are detected as cross-domain" );
@@ -527,6 +536,15 @@ test("jQuery ajax - cross-domain detection", function() {
 
        jQuery.ajax({
                dataType: "jsonp",
+               url: "about:blank",
+               beforeSend: function( _ , s ) {
+                       ok( s.crossDomain , "Test about:blank is detected as cross-domain" );
+                       return false;
+               }
+       });
+
+       jQuery.ajax({
+               dataType: "jsonp",
                url: loc.protocol + "//" + loc.host,
                crossDomain: true,
                beforeSend: function( _ , s ) {
@@ -2239,18 +2257,6 @@ test("jQuery.ajax - active counter", function() {
     ok( jQuery.active == 0, "ajax active counter should be zero: " + jQuery.active );
 });
 
-test("jQuery.ajax - compatible with AIR urls"), function() {
-       expect( 1 );
-       stop();
-       $.ajax({
-               url: "app:/testing",
-               beforeSend: function() {
-                       ok( this.crossDomain, "Detected crossDomain for AIR Url" );
-                       return false;
-               }
-       });
-});
-
 }
 
 //}
\ No newline at end of file