merge: copy function values independent of source index (lodash#4429)

* merge: copy function values independent of source index * Enable merge tests
rusiarohit · Aug 22, 2019 · 1011cfd · 1011cfd
1 parent 2cf08be
commit 1011cfd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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 → test/merge.test.js b/test/merge.js → 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
@@ -733,6 +733,7 @@ export {
   params,
   push,
   realm,
+  root,
   slice,
   strictArgs,
   arrayBuffer,
-Original file line number
+Diff line change
@@ Expand Up / @@ -733,6 +733,7 @@ export { @@
       params,
       push,
       realm,
+      root,
       slice,
       strictArgs,
       arrayBuffer,
@@ Expand Down @@