@@ -194,7 +194,7 @@ jQuery.extend({ ajax: function( s ) { // Extend the settings, but re-extend 's' so that it can be // checked again later (in the test suite, specifically) - s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); + s = jQuery.extend(true, {}, jQuery.ajaxSettings, s); var jsonp, status, data, callbackContext = s.context || window, src/ajax.js @@ -368,6 +368,10 @@ test("ajax cache", function () { ok( jQuery.ajax({url: "data/text.php?name=David&_=tobereplaced555&washere=true", cache:false}), "test with 2 parameters surrounding _= one" ); }); +/* + * Test disabled. + * The assertions expect that the passed-in object will be modified, + * which shouldn't be the case. Fixes #5439. test("global ajaxSettings", function() { expect(2); @@ -389,6 +393,7 @@ test("global ajaxSettings", function() { jQuery.ajaxSettings = tmp; }); +*/ test("load(String)", function() { expect(1); test/unit/ajax.js 1a94a46826188fc3ba63680ca62db164589c70c9 John Resig jeresig@gmail.com http://github.com/jquery/jquery/commit/6a722e251dedd5f01ac0c46e330a368be7bb760b 6a722e251dedd5f01ac0c46e330a368be7bb760b 2009-11-07T07:08:07-08:00 2009-11-07T07:08:07-08:00 jQuery.ajax modified the passed-in object only to help test the code - this shouldn't occur. Fixes #5439. 70ae4fbadd5f1b85dde8928115e4dbe426650a6d John Resig jeresig@gmail.com