Fixed #1999 by replacing the 'no-cache' parameter if it is there instead of just...

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

diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index 162650f..5274b68 100644 (file)
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -218,26 +218,54 @@ test("synchronous request with callbacks", function() {
 });
 
 test("pass-through request object", function() {
-       expect(1);
+       expect(6);
        stop(true);
        
        var target = "data/name.html";
        var count = 0;
        var success = function() {
-               // Disabled
-               //if(count++ == 5)
-               start();
+               // Re-enabled because a bug was found in the unit test that probably caused the problem
+               if(++count == 5)
+                       start();
        };
        
-       /* Test disabled, too many simultaneous requests
        ok( $.get(url(target), success), "get" );
        ok( $.post(url(target), success), "post" );
        ok( $.getScript(url("data/test.js"), success), "script" );
        ok( $.getJSON(url("data/json_obj.js"), success), "json" );
-       */
        ok( $.ajax({url: url(target), success: success}), "generic" );
 });
 
+test("ajax cache", function () {
+       expect(18);
+       stop();
+       
+       var count = 0;
+
+       $("#firstp").bind("ajaxSuccess", function (e, xml, s) {
+               var re = /_=(.*?)(&|$)/g;
+    var oldOne = null;
+               for (var i = 0; i < 6; i++) {
+      var ret = re.exec(s.url);
+                       if (!ret) {
+                               break;
+                       }
+      oldOne = ret[1];
+               }
+               equals(i, 1, "Test to make sure only one 'no-cache' parameter is there");
+               ok(oldOne != "tobereplaced555", "Test to be sure parameter (if it was there) was replaced");
+               if(++count == 6)
+                       start();
+       });
+
+       ok( $.ajax({url: "data/text.php", cache:false}), "test with no parameters" );
+       ok( $.ajax({url: "data/text.php?pizza=true", cache:false}), "test with 1 parameter" );
+       ok( $.ajax({url: "data/text.php?_=tobereplaced555", cache:false}), "test with _= parameter" );
+       ok( $.ajax({url: "data/text.php?pizza=true&_=tobereplaced555", cache:false}), "test with 1 parameter plus _= one" );
+       ok( $.ajax({url: "data/text.php?_=tobereplaced555&tv=false", cache:false}), "test with 1 parameter plus _= one before it" );
+       ok( $.ajax({url: "data/text.php?name=David&_=tobereplaced555&washere=true", cache:false}), "test with 2 parameters surrounding _= one" );
+});
+
 test("global ajaxSettings", function() {
        expect(3);
 
@@ -513,6 +541,19 @@ test("$.getJSON(String, Function) - JSON object", function() {
        });
 });
 
+test("$.getJSON(String, Function) - Remote JSON object with assignment", function() {
+       expect(2);
+
+       var base = window.location.href.replace(/\?.*$/, "");
+
+       stop();
+       $.getJSON(base + "data/json_assigned_obj.js", function() {
+         ok( typeof json_assigned_obj == "object", 'Check JSON loaded' );
+         equals( json_assigned_obj.test, "worked", 'Check JSON obj.test' );
+         start();
+       });
+});
+
 test("$.post(String, Hash, Function) - simple with xml", function() {
        expect(4);
        stop();