working on ajax cors issue #187

ilyavf · ilyavf · commit 87066d065674 · 2017-02-23T22:15:00.000-05:00
diff --git a/ajax-test.js b/ajax-test.js
@@ -108,6 +108,48 @@ if(typeof XDomainRequest === 'undefined') {
 			start();
 		});
 	});
+	
+	// Test GET CORS:
+	QUnit.asyncTest("GET CORS should set content-type header (#187)", function () {
+
+		var hasCorrectHeader, restore;
+		restore = makeFixture(function () {
+			this.open = function (type, url) {
+			};
+
+			this.send = function () {
+				this.readyState = 4;
+				this.status = 200;
+				this.onreadystatechange();
+			};
+
+			this.setRequestHeader = function (header, value) {
+				if (header === "Content-Type" && value === "application/x-www-form-urlencoded"){
+					hasCorrectHeader = true;
+				}
+				var o = {};
+				o[header] = value;
+				this.responseText = JSON.stringify(o);
+			};
+		});
+		
+		ajax({
+			url: "http://query.yahooapis.com/v1/public/yql",
+			data: {
+				fmt: "JSON",
+				q: 'select * from geo.places where text="sunnyvale, ca"',
+				format: "json"
+			}
+		}).then(function(response){
+			QUnit.ok(hasCorrectHeader, "Content-Type for GET CORS should be set to `application/x-www-form-urlencoded`");
+			restore();
+			start();
+		}, function(err){
+			QUnit.ok(false, "Should be resolved");
+			restore();
+			start();
+		});
+	});
 }
 
 if(System.env !== 'canjs-test' && __dirname !== '/') {
diff --git a/ajax.js b/ajax.js
@@ -159,12 +159,14 @@ module.exports = namespace.ajax = function (o) {
 	}
 	xhr.open(type, url);
 
+	var isJson = o.dataType.indexOf("json") >= 0;
 	if (isPost) {
-		var isJson = o.dataType.indexOf("json") >= 0;
 		data = (isJson && !o.crossDomain) ?
 			(typeof o.data === "object" ? JSON.stringify(o.data) : o.data):
 			$._formData(o.data);
 		xhr.setRequestHeader("Content-Type", (isJson && !o.crossDomain) ? "application/json" : "application/x-www-form-urlencoded");
+	} else if (type === "GET" && o.crossDomain){
+		xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
 	}
 	// X-Requested-With header
 	xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest" );
diff --git a/test.html b/test.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+<head>
+	<title>can-util/dom/ajax/ajax test</title>
+</head>
+<body>
+<div id="qunit-fixture"></div>
+<script src="../../node_modules/steal/steal.js"
+		data-main="can-util/dom/ajax/ajax-test"></script>
+</body>
+</html>
