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

Ensure _.defaultsDeep doesn't attempt a merge of a string into an array. [closes #1560]

Browse Source
This commit is contained in:
John-David Dalton
2015-10-24 15:15:06 -07:00
parent 182b29662d
commit 89279009d8
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lodash.js
View File

@@ -4841,7 +4841,7 @@
* @returns {*} Returns the value to assign to the destination object.
*/
function mergeDefaults(objValue, srcValue, key, object, source, stack) {
if (isObject(objValue)) {
if (isObject(objValue) && isObject(srcValue)) {
stack.set(srcValue, objValue);
baseMerge(objValue, srcValue, mergeDefaults, stack);
}

12
test/test.js
View File

@@ -3658,15 +3658,21 @@
QUnit.test('should not modify sources', function(assert) {
assert.expect(3);
var object = {},
source1 = { 'a': 1, 'b': { 'c': 2 } },
var source1 = { 'a': 1, 'b': { 'c': 2 } },
source2 = { 'b': { 'c': 3, 'd': 3 } },
actual = _.defaultsDeep(object, source1, source2);
actual = _.defaultsDeep({}, source1, source2);
assert.deepEqual(actual, { 'a': 1, 'b': { 'c': 2, 'd': 3 } });
assert.deepEqual(source1, { 'a': 1, 'b': { 'c': 2 } });
assert.deepEqual(source2, { 'b': { 'c': 3, 'd': 3 } });
});
QUnit.test('should not attempt a merge of a string into an array', function(assert) {
assert.expect(1);
var actual = _.defaultsDeep({ 'a': ['abc'] }, { 'a': 'abc' });
assert.deepEqual(actual, { 'a': ['abc'] });
});
}());
/*--------------------------------------------------------------------------*/