From 93be758de94b2d4a76fca217465c9e09b613cedd Mon Sep 17 00:00:00 2001 From: Robert Katic Date: Thu, 12 Nov 2009 13:48:45 +0800 Subject: Made jQuery.extend(true, ...) to extend recursively only 'object literal' values. --- test/unit/core.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'test/unit') diff --git a/test/unit/core.js b/test/unit/core.js index b355a8c40..9b43c4889 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -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 && 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 && 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 }); -- cgit v1.2.3