From 8dda094c7caaef7cf1de3acd3e39a3b6dbc7a7ad Mon Sep 17 00:00:00 2001
From: Oleg Gaidarenko <markelog@gmail.com>
Date: Wed, 11 Nov 2015 18:54:44 +0300
Subject: [PATCH] Revert "Ajax: don't expect cross-origin tests run in envs
 which not support it"

This reverts commit 39cdb8c9aa0fde68f733553ba050a2ba9d86474c.
---
 test/unit/ajax.js | 51 ++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 20 deletions(-)

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 4d7dc95e8..4eb70cad8 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -71,6 +71,21 @@ QUnit.module( "ajax", {
 		};
 	} );
 
+	ajaxTest( "jQuery.ajax() - do not execute js (crossOrigin)", 2, function( assert ) {
+		return {
+			create: function( options ) {
+				options.crossDomain = true;
+				return jQuery.ajax( url( "data/script.php?header=ecma" ), options );
+			},
+			success: function() {
+				assert.ok( true, "success" );
+			},
+			complete: function() {
+				assert.ok( true, "complete" );
+			}
+		};
+	} );
+
 	ajaxTest( "jQuery.ajax() - execute js for crossOrigin when dataType option is provided", 3,
 		function( assert ) {
 			return {
@@ -98,11 +113,6 @@ QUnit.module( "ajax", {
 			success: function() {
 				assert.ok( true, "success" );
 			},
-			fail: function() {
-				if (jQuery.support.cors === false) {
-					assert.ok( true, "fail" );
-				}
-			},
 			complete: function() {
 				assert.ok( true, "complete" );
 			}
@@ -1810,21 +1820,22 @@ if ( typeof window.ArrayBuffer === "undefined" || typeof new XMLHttpRequest().re
 			done: function( data ) {
 				assert.ok( false, "done: " + data );
 			},
-			fail: function( jqXHR, status, error ) {
-				assert.ok( true, "exception caught: " + error );
-				assert.strictEqual( jqXHR.status, 0, "proper status code" );
-				assert.strictEqual( status, "error", "proper status" );
-			}
-		}, {
-			url: "http://" + externalHost + ":80q",
-			done: function( data ) {
-				assert.ok( false, "done: " + data );
-			},
-			fail: function( _, status, error ) {
-				assert.ok( true, "fail: " + status + " - " + error );
-			}
-		} ];
-	} );
+				fail: function( jqXHR, status, error ) {
+					assert.ok( true, "exception caught: " + error );
+					assert.strictEqual( jqXHR.status, 0, "proper status code" );
+					assert.strictEqual( status, "error", "proper status" );
+				}
+			}, {
+				url: "http://domain.org:80d",
+				done: function( data ) {
+					assert.ok( false, "done: " + data );
+				},
+				fail: function( _, status, error ) {
+					assert.ok( true, "fail: " + status + " - " + error );
+				}
+			} ];
+		}
+	);
 
 	ajaxTest( "gh-2587 - when content-type not xml, but looks like one", 1, function( assert ) {
 		return {
-- 
2.39.5