X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=a6f490c4739ddb5c2c131a640c5ae932fd6bdd56;hb=d36d224cc52e70d837306d33a03f517ef72abc60;hp=fe2e992a8aa7591b397fe44091840ba76fb96ca0;hpb=8d52c27808a77f51d1cf42c7e738b0b356466c1a;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index fe2e992..a6f490c 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -386,6 +386,12 @@ test("each(Function)", function() { ok( pass, "Execute a function, Relative" ); }); +test("index()", function() { + expect(1); + + equals( jQuery("#text2").index(), 2, "Returns the index of a child amongst its siblings" ) +}); + test("index(Object|String|undefined)", function() { expect(16); @@ -435,7 +441,7 @@ test("jQuery.merge()", function() { }); test("jQuery.extend(Object, Object)", function() { - expect(21); + expect(23); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -463,9 +469,19 @@ test("jQuery.extend(Object, Object)", function() { var empty = {}; var optionsWithLength = { foo: { length: -1 } }; jQuery.extend(true, empty, optionsWithLength); - isObj( empty.foo, optionsWithLength.foo, "The length property must copy correctly" ); + empty = {}; + var optionsWithDate = { foo: { date: new Date } }; + jQuery.extend(true, empty, optionsWithDate); + isObj( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); + + var myKlass = function() {}; + empty = {}; + var optionsWithCustomObject = { foo: { date: new myKlass } }; + jQuery.extend(true, empty, optionsWithCustomObject); + isObj( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" ); + var nullUndef; nullUndef = jQuery.extend({}, options, { xnumber2: null }); ok( nullUndef.xnumber2 === null, "Check to make sure null values are copied");