Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-01 23:57:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure _.merge merges plain-objects onto non plain-objects. [closes #1413]

Browse Source
This commit is contained in:
John-David Dalton
2015-08-27 09:21:37 -07:00
parent dfebb83c35
commit ce4f2f1326
2 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lodash.js
View File

@@ -2315,7 +2315,7 @@
else if (isPlainObject(srcValue) || isArguments(srcValue)) {
newValue = isArguments(oldValue)
? toPlainObject(oldValue)
: (isPlainObject(oldValue) ? oldValue : {});
: (isObject(oldValue) ? oldValue : {});
}
else {
isCommon = isFunction(srcValue);

49
test/test.js
View File

@@ -5141,29 +5141,29 @@
var args,
object = { 'a': 1 },
source = { 'a': 2 },
expected = [1, 2, 'a', object, source];
func(object, source, function() {
args || (args = slice.call(arguments));
});
expected = _.map([1, 2, 'a', object, source], _.clone);
if (isMergeWith) {
expected.push(undefined, undefined);
}
func(object, source, function() {
args || (args = _.map(arguments, _.clone));
});
deepEqual(args, expected, 'primitive property values');
args = null;
object = { 'a': 1 };
source = { 'b': 2 };
expected = _.map([undefined, 2, 'b', object, source], _.clone);
func(object, source, function() {
args || (args = slice.call(arguments));
});
expected = [undefined, 2, 'b', object, source];
if (isMergeWith) {
expected.push(undefined, undefined);
}
func(object, source, function() {
args || (args = _.map(arguments, _.clone));
});
deepEqual(args, expected, 'missing destination property');
var argsList = [],
@@ -5172,16 +5172,16 @@
object = { 'a': objectValue };
source = { 'a': sourceValue };
expected = [_.map([objectValue, sourceValue, 'a', object, source], _.cloneDeep)];
if (isMergeWith) {
expected[0].push([], []);
expected.push(_.map([undefined, 2, 'b', objectValue, sourceValue, [sourceValue], [objectValue]], _.cloneDeep));
}
func(object, source, function() {
argsList.push(slice.call(arguments));
argsList.push(_.map(arguments, _.cloneDeep));
});
expected = [[objectValue, sourceValue, 'a', object, source]];
if (isMergeWith) {
expected[0].push([sourceValue], [sourceValue]);
expected.push([undefined, 2, 'b', sourceValue, sourceValue, [sourceValue], [sourceValue]]);
}
deepEqual(argsList, expected, 'object property values');
});
@@ -10352,6 +10352,23 @@
deepEqual(actual, expected);
});
test('should merge plain-objects onto non plain-objects', 4, function() {
function Foo(object) {
_.assign(this, object);
}
var object = { 'a': 1 },
actual = _.merge(new Foo, object);
ok(actual instanceof Foo);
deepEqual(actual, new Foo(object));
actual = _.merge([new Foo], [object]);
ok(actual[0] instanceof Foo);
deepEqual(actual, [new Foo(object)]);
});
test('should convert values to arrays when merging with arrays of `source`', 2, function() {
var object = { 'a': { '1': 'y', 'b': 'z', 'length': 2 } },
actual = _.merge(object, { 'a': ['x'] });