X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=298fb5bab03b285e711da9bdc500e9ba56c9937c;hb=31252b1e4752d70eb895a659b41a85850ed727b4;hp=33937804ba46312696022f064d8392d50dd67f06;hpb=84dd82eb1a295e8671a98ebf5a854dbac63caf78;p=jquery.git diff --git a/test/unit/ajax.js b/test/unit/ajax.js index 3393780..298fb5b 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);