Make sure that a parsererror is thrown whenever malformed JSON comes back from a...

[jquery.git] / test / unit / ajax.js

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 9b1e323..298fb5b 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -70,6 +70,30 @@ test("jQuery.ajax() - error callbacks", function() {
        });
 });
 
+test("jQuery.ajax() - abort", function() {
+       expect( 6 );
+       stop();
+
+       jQuery('#foo').ajaxStart(function(){
+               ok( true, "ajaxStart" );
+       }).ajaxStop(function(){
+               ok( true, "ajaxStop" );
+               start();
+       }).ajaxSend(function(){
+               ok( true, "ajaxSend" );
+       }).ajaxComplete(function(){
+               ok( true, "ajaxComplete" );
+       });
+
+       var xhr = jQuery.ajax({
+               url: url("data/name.php?wait=5"),
+               beforeSend: function(){ ok(true, "beforeSend"); },
+               complete: function(){ ok(true, "complete"); }
+       });
+
+       xhr.abort();
+});
+
 test("Ajax events with context", function() {
        expect(6);
        
@@ -317,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" );
 });
 
@@ -797,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);