From 1011cfdf4c8d3e652d875713891ed7cfde8c47ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luiz=20Am=C3=A9rico?= Date: Thu, 22 Aug 2019 11:48:28 -0300 Subject: [PATCH] merge: copy function values independent of source index (#4429) * merge: copy function values independent of source index * Enable merge tests --- .internal/baseMergeDeep.js | 2 +- test/{merge.js => merge.test.js} | 2 +- test/utils.js | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) rename test/{merge.js => merge.test.js} (99%) diff --git a/.internal/baseMergeDeep.js b/.internal/baseMergeDeep.js index b2e4e9764..c8e5b197d 100644 --- a/.internal/baseMergeDeep.js +++ b/.internal/baseMergeDeep.js @@ -71,7 +71,7 @@ function baseMergeDeep(object, source, key, srcIndex, mergeFunc, customizer, sta if (isArguments(objValue)) { newValue = toPlainObject(objValue) } - else if ((srcIndex && typeof objValue == 'function') || !isObject(objValue)) { + else if (typeof objValue == 'function' || !isObject(objValue)) { newValue = initCloneObject(srcValue) } } diff --git a/test/merge.js b/test/merge.test.js similarity index 99% rename from test/merge.js rename to test/merge.test.js index 2ecd7c78c..18b5a16ae 100644 --- a/test/merge.js +++ b/test/merge.test.js @@ -1,6 +1,6 @@ import assert from 'assert'; import lodashStable from 'lodash'; -import { args, typedArrays, stubTrue, defineProperty, document } from './utils.js'; +import { args, typedArrays, stubTrue, defineProperty, document, root } from './utils.js'; import merge from '../merge.js'; import isArguments from '../isArguments.js'; diff --git a/test/utils.js b/test/utils.js index af88e1580..890212c45 100644 --- a/test/utils.js +++ b/test/utils.js @@ -733,6 +733,7 @@ export { params, push, realm, + root, slice, strictArgs, arrayBuffer,