X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fajax.js;h=fbff2d82e535a339602ec72e230b97738368f815;hb=90a87c03b4943d75c24bc5e6246630231d12d933;hp=a049fecef524d05cbaf480cd565aac5c2ee7ef0d;hpb=cbda6c541b9f2dd8fbaa084ecce7f421e8dc3dc4;p=jquery.git diff --git a/test/unit/ajax.js b/test/unit/ajax.js index a049fec..fbff2d8 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -642,8 +642,12 @@ test("jQuery.ajax() - script, Remote with POST", function() { type: "POST", dataType: "script", success: function(data, status){ - ok( foobar, "Script results returned (GET, no callback)" ); - equals( status, "success", "Script results returned (GET, no callback)" ); + ok( foobar, "Script results returned (POST, no callback)" ); + equals( status, "success", "Script results returned (POST, no callback)" ); + start(); + }, + error: function(xhr) { + ok( false, "ajax error, status code: " + xhr.status ); start(); } }); @@ -689,6 +693,25 @@ test("jQuery.getJSON(String, Function) - JSON object", function() { }); }); +test("jQuery.getJSON - Using Native JSON", function() { + expect(2); + + var old = window.JSON; + JSON = { + parse: function(str){ + ok( true, "Verifying that parse method was run" ); + return true; + } + }; + + stop(); + jQuery.getJSON(url("data/json.php"), function(json) { + window.JSON = old; + equals( json, true, "Verifying return value" ); + start(); + }); +}); + test("jQuery.getJSON(String, Function) - JSON object with absolute url to local content", function() { expect(2);