add time to test.html request url using new Date().getTime()

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

diff --git a/src/ajax/ajaxTest.js b/src/ajax/ajaxTest.js
index 3159fb8..2c798a0 100644 (file)
--- a/src/ajax/ajaxTest.js
+++ b/src/ajax/ajaxTest.js
@@ -24,7 +24,7 @@ test("param", function() {
 
 test("pass-through request object", function() {
        expect(7);
-       stop();
+       stop(true);
        var count = 0;
        var success = function() {
                if(count++ == 6)
@@ -44,8 +44,9 @@ test("synchronous request", function() {
 });
 
 test("synchronous request with callbacks", function() {
+       expect(2);
        var result;
-       $.ajax({url: "data/json.php", async: false, success: function(data) { result = data; }});
+       $.ajax({url: "data/json.php", async: false, success: function(data) { ok(true, "sucess callback executed"); result = data; } });
        ok( /^{ "data"/.test( result ), "check returned text" );
 });
 
@@ -60,7 +61,7 @@ test("load(String, Object, Function) - simple: inject text into DOM", function()
 
 test("load(String, Object, Function) - inject without callback", function() {
        expect(1);
-       stop(); // check if load can be called with only url
+       stop(true); // check if load can be called with only url
        $('#first').load("data/name.php");
 });
 
@@ -74,7 +75,7 @@ test("load(String, Object, Function) - check scripts", function() {
          ok( $('#ap').html() == 'bar', 'Check if script evaluation has modified DOM');
          start();
        };
-       $('#first').load('data/test.html', function() {
+       $('#first').load('data/test.html?'+new Date().getTime(), function() {
          ok( $('#first').html().match(/^html text/), 'Check content after loading html' );
          ok( testFoo == "foo", 'Check if script was evaluated after load' );
          setTimeout(verifyEvaluation, 600);
@@ -127,6 +128,7 @@ test("test global handlers - failure", function() {
          counter.error = counter.success = counter.complete = counter.send = 0;
          $.ajaxTimeout(500);
          $.ajax({url: "data/name.php?wait=5", global: false, beforeSend: send, success: success, error: error, complete: function() {
+                var x = counter;
             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' );
@@ -170,7 +172,7 @@ test("$.getScript(String, Function) - with callback", function() {
 
 test("$.getScript(String, Function) - no callback", function() {
        expect(1);
-       stop();
+       stop(true);
        $.getScript("data/test.js");
 });
 
@@ -234,6 +236,8 @@ test("$.ajaxTimeout(Number) - with global timeout", function() {
          error: pass,
          success: fail
        });
+       // reset timeout
+       $.ajaxTimeout(0);
 });
 
 test("$.ajaxTimeout(Number) with localtimeout", function() {
@@ -292,7 +296,7 @@ test("$.ajax - dataType html", function() {
        };
        $.ajax({
          dataType: "html",
-         url: "data/test.html",
+         url: "data/test.html?"+new Date().getTime(),
          success: function(data) {
            ok( data.match(/^html text/), 'Check content for datatype html' );
            ok( testFoo == "foo", 'Check if script was evaluated for datatype html' );
@@ -317,16 +321,29 @@ test("$.ajax - xml: non-namespace elements inside namespaced elements", function
 test("$.ajax - beforeSend", function() {
        expect(1);
        stop();
-       var customHeader = "value";
+       var check = false;
        $.ajax({
                url: "data/name.php", 
                data: {'req': true},
                beforeSend: function(xml) {
-                       xml.setRequestHeader('X-Custom-Header', customHeader);
+                       check = true
                },
                success: function(data) {
-                       ok( data == customHeader, "check return value, should be the custom header sent" );
+                       ok( check, "check beforeSend was executed" );
                        start();
                }
        });
-});
\ No newline at end of file
+});
+
+test("ajaxSetup()", function() {
+       expect(1);
+       stop();
+       $.ajaxSetup({
+               url: "data/name.php?name=foo",
+               success: function(msg){
+               ok( msg == 'bar', 'Check for GET' );
+                       start();
+               }
+       });
+       $.ajax();
+});