X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=fe2e992a8aa7591b397fe44091840ba76fb96ca0;hb=8d52c27808a77f51d1cf42c7e738b0b356466c1a;hp=347864eaf6228a28a5efa5b6541299d6a0435ea1;hpb=6b912beb7b7ba3147112b8291ba3d3deb888bdba;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index 347864e..fe2e992 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -435,7 +435,7 @@ test("jQuery.merge()", function() { }); test("jQuery.extend(Object, Object)", function() { - expect(20); + expect(21); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -460,6 +460,12 @@ test("jQuery.extend(Object, Object)", function() { isObj( deep2.foo, deep2copy.foo, "Check if not deep2: options must not be modified" ); equals( deep1.foo2, document, "Make sure that a deep clone was not attempted on the document" ); + var empty = {}; + var optionsWithLength = { foo: { length: -1 } }; + jQuery.extend(true, empty, optionsWithLength); + + isObj( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); + var nullUndef; nullUndef = jQuery.extend({}, options, { xnumber2: null }); ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");