use merge-deep to merge props

voodoocreation · Dec 11, 2019 · 5d4266d · 5d4266d
1 parent e0cf9b1
commit 5d4266d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -3,7 +3,7 @@
   "author": "Raice Hannay <voodoocreation@gmail.com>",
   "description": "A set of classes to make setting up React components for unit tests easy.",
   "license": "ISC",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "keywords": [
     "component",
     "enzyme",

diff --git a/src/Wrapper.tsx b/src/Wrapper.tsx
@@ -1,4 +1,5 @@
 import { ComponentType, mount, render, shallow } from "enzyme";
+import merge from "merge-deep";
 import * as React from "react";
 
 export default class Wrapper<
@@ -95,11 +96,9 @@ export default class Wrapper<
   };
 
   protected defineProps = () => {
-    this.mergedProps = {
-      children: this.scenarioChildren || this.defaultChildren,
-      ...this.defaultProps,
-      ...this.scenarioProps
-    };
+    this.mergedProps = merge({}, this.defaultProps, this.scenarioProps, {
+      children: this.scenarioChildren || this.defaultChildren
+    });
 
     return this.mergedProps;
   };