Fixes #7465. Reworked the regexp and associated test for cross-domain detection so that it now includes ports. Added cross-domain detection tests for protocol, hostname and port.

1 files changed, 52 insertions, 0 deletions

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index adf589e1a..14f892857 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -358,6 +358,58 @@ test(".ajax() - hash", function() {
 	});
 });
 
+test("jQuery ajax - cross-domain detection", function() {
+
+	expect( 3 );
+
+	var loc = document.location,
+		otherPort = loc.port === 666 ? 667 : 666,
+		otherProtocol = loc.protocol === "http:" ? "https:" : "http:",
+		protocolFlag,
+		hostFlag,
+		portFlag;
+
+	if ( jQuery.ajax({
+		url: otherProtocol + "//" + loc.host,
+		beforeSend: function( _ , s ) {
+			protocolFlag = 1;
+			ok( s.crossDomain , "Test different protocols are detected as cross-domain" );
+			return false;
+		}
+	}) === false ) {
+		if ( ! protocolFlag ) {
+			ok( ! jQuery.support.cors , "Test different protocols are detected as cross-domain (no transport)" );
+		}
+	}
+
+	if ( jQuery.ajax({
+		url: loc.protocol + '//somewebsitethatdoesnotexist-656329477541.com:' + ( loc.port || 80 ),
+		beforeSend: function( _ , s ) {
+			hostFlag = 1;
+			ok( s.crossDomain , "Test different hostnames are detected as cross-domain" );
+			return false;
+		}
+	}) === false ) {
+		if ( ! hostFlag ) {
+			ok( ! jQuery.support.cors , "Test different hostnames are detected as cross-domain (no transport)" );
+		}
+	}
+
+	if ( jQuery.ajax({
+		url: loc.protocol + "//" + loc.hostname + ":" + otherPort,
+		beforeSend: function( _ , s ) {
+			portFlag = 1;
+			ok( s.crossDomain , "Test different ports are detected as cross-domain" );
+			return false;
+		}
+	}) === false ) {
+		if ( ! portFlag ) {
+			ok( ! jQuery.support.cors , "Test different ports are detected as cross-domain (no transport)" );
+		}
+	}
+
+});
+
 test(".ajax() - 304", function() {
 	expect( 1 );
 	stop();