Merge pull request #47 from ivospinheiro/ISSUE_46

Handle error thrown when parsing responseText as JSON

Author: justinbmeyer

can-ajax-test.js

@@ -452,6 +452,42 @@ QUnit.test("handles 204 No Content responses when expecting JSON", function (ass
 	});
 });
 
+QUnit.test("handles responseText containing text when expecting JSON (#46)", function (assert) {
+	var done = assert.async();
+	var NOT_FOUND_CODE = 404;
+	var NOT_FOUND_MSG = "NOT FOUND";
+	var headers = {},
+		restore = makeFixture(function () {
+			this.open = function (type, url) {};
+
+			this.send = function () {
+				this.readyState = 4;
+				this.status = NOT_FOUND_CODE;
+				this.responseText = NOT_FOUND_MSG;
+				this.onreadystatechange();
+			};
+
+			this.setRequestHeader = function (header, value) {
+				headers[header] = value;
+			};
+		});
+
+	ajax({
+		type: "get",
+		url: "/foo",
+		dataType: "json"
+	}).then(function (value) {
+		assert.notOk(value, "success callback call not expected");
+	}, function (xhr) {
+		assert.equal(xhr.status, 404);
+		assert.equal(xhr.responseText, NOT_FOUND_MSG);
+	}).then(function () {
+		// restore original values
+		restore();
+		done();
+	});
+});
+
 if (hasLocalServer) {
 	QUnit.test("correctly serializes null and undefined values (#177)", function (assert) {
 		var done = assert.async();

can-ajax.js

@@ -102,25 +102,29 @@ var contentTypes = {
 };
 
 var _xhrResp = function (xhr, options) {
-	var type = (options.dataType || xhr.getResponseHeader("Content-Type").split(";")[0]);
-	
-	if(type && (xhr.responseText || xhr.responseXML)){
+	try{
+		var type = (options.dataType || xhr.getResponseHeader("Content-Type").split(";")[0]);
 
-		switch (type) {
-			case "text/xml":
-			case "xml":
-				return xhr.responseXML;
-			case "text/json":
-			case "application/json":
-			case "text/javascript":
-			case "application/javascript":
-			case "application/x-javascript":
-			case "json":
-				return xhr.responseText && JSON.parse(xhr.responseText);
-			default:
-				return xhr.responseText;
+		if(type && (xhr.responseText || xhr.responseXML)){
+			
+			switch (type) {
+				case "text/xml":
+				case "xml":
+					return xhr.responseXML;
+				case "text/json":
+				case "application/json":
+				case "text/javascript":
+				case "application/javascript":
+				case "application/x-javascript":
+				case "json":
+					return xhr.responseText && JSON.parse(xhr.responseText);
+				default:
+					return xhr.responseText;
+			}
+		} else {
+			return xhr;
 		}
-	} else {
+	} catch(e){
 		return xhr;
 	}
 };