Fixed #471

[jquery.git] / src / ajax / ajaxTest.js

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index a84df1d..48010a2 100644 (file)
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -55,47 +55,55 @@ test("load(String, Object, Function) - check scripts", function() {
 });
 
 test("test global handlers - success", function() {
-       expect(6);
+       expect(8);
        stop();
-       var counter = { complete: 0, success: 0, error: 0 },
+       var counter = { complete: 0, success: 0, error: 0, send: 0 },
                success = function() { counter.success++ },
                error = function() { counter.error++ },
-               complete = function() { counter.complete++ };
+               complete = function() { counter.complete++ },
+               send = function() { counter.send++ };
 
-       $('#foo').ajaxStart(complete).ajaxStop(complete).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
+       $('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
        // start with successful test
-       $.ajax({url: "data/name.php", success: success, error: error, complete: function() {
+       $.ajax({url: "data/name.php", beforeSend: send, success: success, error: error, complete: function() {
          ok( counter.error == 0, 'Check succesful request' );
          ok( counter.success == 2, 'Check succesful request' );
          ok( counter.complete == 3, 'Check succesful request' );
-         counter.error = counter.success = counter.complete = 0;
+         ok( counter.send == 2, 'Check succesful request' );
+         counter.error = counter.success = counter.complete = counter.send = 0;
          $.ajaxTimeout(500);
-         $.ajax({url: "data/name.php?wait=5", success: success, error: error, complete: function() {
+         $.ajax({url: "data/name.php?wait=5", beforeSend: send, success: success, error: error, complete: function() {
            ok( counter.error == 2, 'Check failed request' );
            ok( counter.success == 0, 'Check failed request' );
            ok( counter.complete == 3, 'Check failed request' );
+           ok( counter.send == 2, 'Check failed request' );
            start();
          }});
        }});
 });
 
 test("test global handlers - failure", function() {
-       expect(6);
+       expect(8);
        stop();
-       var counter = { complete: 0, success: 0, error: 0 },
+       var counter = { complete: 0, success: 0, error: 0, send: 0 },
                success = function() { counter.success++ },
-               error = function() { counter.error++ };
+               error = function() { counter.error++ },
+               complete = function() { counter.complete++ },
+               send = function() { counter.send++ };
        $.ajaxTimeout(0);
-       $.ajax({url: "data/name.php", global: false, success: success, error: error, complete: function() {
+       $('#foo').ajaxStart(complete).ajaxStop(complete).ajaxSend(send).ajaxComplete(complete).ajaxError(error).ajaxSuccess(success);
+       $.ajax({url: "data/name.php", global: false, beforeSend: send, success: success, error: error, complete: function() {
          ok( counter.error == 0, 'Check sucesful request without globals' );
          ok( counter.success == 1, 'Check sucesful request without globals' );
          ok( counter.complete == 0, 'Check sucesful request without globals' );
-         counter.error = counter.success = counter.complete = 0;
+         ok( counter.send == 1, 'Check sucesful request without globals' );
+         counter.error = counter.success = counter.complete = counter.send = 0;
          $.ajaxTimeout(500);
-         $.ajax({url: "data/name.php?wait=5", global: false, success: success, error: error, complete: function() {
+         $.ajax({url: "data/name.php?wait=5", global: false, beforeSend: send, success: success, error: error, complete: function() {
             ok( counter.error == 1, 'Check failed request without globals' );
             ok( counter.success == 0, 'Check failed request without globals' );
             ok( counter.complete == 0, 'Check failed request without globals' );
+            ok( counter.send == 1, 'Check failed request without globals' );
             start();
          }});
        }});
@@ -279,15 +287,15 @@ test("$.ajax - xml: non-namespace elements inside namespaced elements", function
        });
 });
 
-test("$.ajax - preprocess", function() {
+test("$.ajax - beforeSend", function() {
        expect(1);
        stop();
-       var customHeader = "value-for-custom-header";
+       var customHeader = "value";
        $.ajax({
                url: "data/name.php", 
                data: {'req': true},
-               preprocess: function(xml) {
-                       xml.setRequestHeader('customHeader', customHeader)
+               beforeSend: function(xml) {
+                       xml.setRequestHeader('X-Custom-Header', customHeader);
                },
                success: function(data) {
                        ok( data == customHeader, "check return value, should be the custom header sent" );