X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=test%2Funit%2Fcore.js;h=7a2c4d6fc118d24ad2713587532a51f4bbcbc56e;hb=8cb8ae27d8e0c732b711d73d2ef71125b0a7769b;hp=b355a8c40f35091ac449767443d3580e87555e27;hpb=990d9ca1b05a587cce7599a1a40aa2558117db41;p=jquery.git diff --git a/test/unit/core.js b/test/unit/core.js index b355a8c..7a2c4d6 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -517,7 +517,7 @@ test("jQuery.merge()", function() { }); test("jQuery.extend(Object, Object)", function() { - expect(23); + expect(25); var settings = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" }, options = { xnumber2: 1, xstring2: "x", xxx: "newstring" }, @@ -553,16 +553,20 @@ test("jQuery.extend(Object, Object)", function() { same( empty.foo, optionsWithDate.foo, "Dates copy correctly" ); var myKlass = function() {}; - var optionsWithCustomObject = { foo: { date: new myKlass } }; + var customObject = new myKlass(); + var optionsWithCustomObject = { foo: { date: new customObject } }; empty = {}; jQuery.extend(true, empty, optionsWithCustomObject); - same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly (no methods)" ); + ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly (no methods)" ); // Makes the class a little more realistic myKlass.prototype = { someMethod: function(){} }; empty = {}; jQuery.extend(true, empty, optionsWithCustomObject); - same( empty.foo, optionsWithCustomObject.foo, "Custom objects copy correctly" ); + ok( empty.foo && empty.foo.date === customObject, "Custom objects copy correctly" ); + + var ret = jQuery.extend(true, { foo: 4 }, { foo: new Number(5) } ); + ok( ret.foo == 5, "Wrapped numbers copy correctly" ); var nullUndef; nullUndef = jQuery.extend({}, options, { xnumber2: null });