aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2008-05-07 01:16:54 +0000
committerScott González <scott.gonzalez@gmail.com>2008-05-07 01:16:54 +0000
commit5311565223cca0158cb44f4fffa812ce8dd4a4c8 (patch)
treec22ed70d3a9cae754bbadf1f1313ee752c6bae1a /test
parent96ca83d1501a2ffa78332c35d4a7afefe600f1ee (diff)
downloadjquery-5311565223cca0158cb44f4fffa812ce8dd4a4c8.tar.gz
jquery-5311565223cca0158cb44f4fffa812ce8dd4a4c8.zip
ajax test: Removed test for extending with null.
Diffstat (limited to 'test')
-rw-r--r--test/unit/ajax.js8
1 files changed, 2 insertions, 6 deletions
diff --git a/test/unit/ajax.js b/test/unit/ajax.js
index a5891c53e..fc2ab9e33 100644
--- a/test/unit/ajax.js
+++ b/test/unit/ajax.js
@@ -298,19 +298,15 @@ test("ajax cache", function () {
});
test("global ajaxSettings", function() {
- expect(3);
+ expect(2);
var tmp = jQuery.extend({}, jQuery.ajaxSettings);
- var orig = { url: "data/with_fries.xml", data: null };
+ var orig = { url: "data/with_fries.xml" };
var t;
$.ajaxSetup({ data: {foo: 'bar', bar: 'BAR'} });
t = jQuery.extend({}, orig);
- $.ajax(t);
- ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending null" );
-
- t = jQuery.extend({}, orig);
t.data = {};
$.ajax(t);
ok( t.url.indexOf('foo') > -1 && t.url.indexOf('bar') > -1, "Check extending {}" );