git.asbjorn.biz
/
jquery.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made jQuery.extend(true, ...) to extend recursively only 'object literal' values.
[jquery.git]
/
test
/
unit
/
core.js
diff --git
a/test/unit/core.js
b/test/unit/core.js
index
b355a8c
..
9b43c48
100644
(file)
--- 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() {};
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);
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);
// 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 });
var nullUndef;
nullUndef = jQuery.extend({}, options, { xnumber2: null });