aboutsummaryrefslogtreecommitdiffstats
path: root/test/unit
diff options
context:
space:
mode:
authorRobert Katic <robert.katic@gmail.com>2009-11-12 13:48:45 +0800
committerJohn Resig <jeresig@gmail.com>2009-11-12 21:59:47 +0800
commit93be758de94b2d4a76fca217465c9e09b613cedd (patch)
tree6b356b15e68182e7fa494771a195217ec8aceea5 /test/unit
parent990d9ca1b05a587cce7599a1a40aa2558117db41 (diff)
downloadjquery-93be758de94b2d4a76fca217465c9e09b613cedd.tar.gz
jquery-93be758de94b2d4a76fca217465c9e09b613cedd.zip
Made jQuery.extend(true, ...) to extend recursively only 'object literal' values.
Diffstat (limited to 'test/unit')
-rw-r--r--test/unit/core.js10
1 files changed, 7 insertions, 3 deletions
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 });