Add some abort() Ajax tests. Verifies that #3984 works.

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

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index f9f595a..3393780 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);
        
@@ -797,6 +821,39 @@ test("jQuery.ajax() - script, Remote with scheme-less URL", function() {
        });
 });
 
+test("jQuery.ajax() - script by content-type", function() {
+       expect(1);
+
+       stop();
+
+       jQuery.ajax({
+               url: "data/script.php",
+               data: { header: "script" },
+               success: function() {
+                       start();
+               }
+       });
+});
+
+test("jQuery.ajax() - json by content-type", function() {
+       expect(5);
+
+       stop();
+
+       jQuery.ajax({
+               url: "data/json.php",
+               data: { header: "json", json: "array" },
+               success: function( json ) {
+                       ok( json.length >= 2, "Check length");
+                       equals( json[0].name, 'John', 'Check JSON: first, name' );
+                       equals( json[0].age, 21, 'Check JSON: first, age' );
+                       equals( json[1].name, 'Peter', 'Check JSON: second, name' );
+                       equals( json[1].age, 25, 'Check JSON: second, age' );
+                       start();
+               }
+       });
+});
+
 test("jQuery.getJSON(String, Hash, Function) - JSON array", function() {
        expect(5);
        stop();