Mirrors/lodash
1
0
Fork 0
mirror of https://github.com/whoisclebs/lodash.git synced 2026-02-08 18:17:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ensure _.mergeWith sources are cloned when customizer returns undefiend. [closes #2111]

Browse Source
This commit is contained in:
John-David Dalton
2016-03-15 08:32:23 -07:00
parent 7d1d7d909a
commit b95d1d6123
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lodash.js
View File

@@ -3219,7 +3219,7 @@
} }
else { else {
isCommon = false; isCommon = false;
newValue = baseClone(srcValue, !customizer); newValue = baseClone(srcValue, true);
} }
} }
else if (isPlainObject(srcValue) || isArguments(srcValue)) { else if (isPlainObject(srcValue) || isArguments(srcValue)) {
@@ -3228,7 +3228,7 @@
} }
else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) { else if (!isObject(objValue) || (srcIndex && isFunction(objValue))) {
isCommon = false; isCommon = false;
newValue = baseClone(srcValue, !customizer); newValue = baseClone(srcValue, true);
} }
else { else {
newValue = objValue; newValue = objValue;

10
test/test.js
View File

@@ -14610,6 +14610,16 @@
assert.deepEqual(actual, { 'a': { 'b': ['c'] } }); assert.deepEqual(actual, { 'a': { 'b': ['c'] } });
}); });
QUnit.test('should clone sources when `customizer` result is `undefined`', function(assert) {
assert.expect(1);
var source1 = { 'a': { 'b': { 'c': 1 } } },
source2 = { 'a': { 'b': { 'd': 2 } } },
actual = _.mergeWith({}, source1, source2, alwaysUndefined);
assert.deepEqual(source1.a.b, { 'c': 1 });
});
QUnit.test('should pop the stack of sources for each sibling property', function(assert) { QUnit.test('should pop the stack of sources for each sibling property', function(assert) {
assert.expect(1); assert.expect(1);