Make sure that a parsererror is thrown whenever malformed JSON comes back from a server (so that the Ajax error handler is called). Makes it uniform across browsers that do and don't have JSON.parse support.

2 files changed, 22 insertions, 2 deletions

diff --git a/test/data/badjson.js b/test/data/badjson.js
new file mode 100644
index 000000000..ec41ee5d6
--- /dev/null
+++ b/test/data/badjson.js
@@ -0,0 +1 @@
+{bad: 1}
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 33937804b..298fb5bab 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -341,13 +341,13 @@ test("jQuery.param()", function() {
 
 test("synchronous request", function() {
 	expect(1);
-	ok( /^{ "data"/.test( jQuery.ajax({url: url("data/json_obj.js"), async: false}).responseText ), "check returned text" );
+	ok( /^{ "data"/.test( jQuery.ajax({url: url("data/json_obj.js"), dataType: "text", async: false}).responseText ), "check returned text" );
 });
 
 test("synchronous request with callbacks", function() {
 	expect(2);
 	var result;
-	jQuery.ajax({url: url("data/json_obj.js"), async: false, success: function(data) { ok(true, "sucess callback executed"); result = data; } });
+	jQuery.ajax({url: url("data/json_obj.js"), async: false, dataType: "text", success: function(data) { ok(true, "sucess callback executed"); result = data; } });
 	ok( /^{ "data"/.test( result ), "check returned text" );
 });
 
@@ -821,6 +821,25 @@ test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
 	});
 });
 
+test("jQuery.ajax() - malformed JSON", function() {
+	expect(1);
+
+	stop();
+
+	jQuery.ajax({
+		url: "data/badjson.js",
+		dataType: "json",
+		success: function(){
+			ok( false, "Success." );
+			start();
+		},
+		error: function(xhr, msg) {
+			equals( "parsererror", msg, "A parse error occurred." );
+	  		start();
+		}
+	});
+});
+
 test("jQuery.ajax() - script by content-type", function() {
 	expect(1);