Skip to content

Commit 421bf64

Browse files
author
Raice Hannay
committed
remove unnecessary initial merge objects
1 parent 19888e0 commit 421bf64

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"author": "Raice Hannay <[email protected]>",
44
"description": "A set of classes to make setting up React components for unit tests easy.",
55
"license": "ISC",
6-
"version": "1.0.4",
6+
"version": "1.0.5",
77
"keywords": [
88
"component",
99
"enzyme",

src/Wrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export default class Wrapper<
9696
};
9797

9898
protected defineProps = () => {
99-
this.mergedProps = merge({}, this.defaultProps, this.scenarioProps, {
99+
this.mergedProps = merge(this.defaultProps, this.scenarioProps, {
100100
children: this.scenarioChildren || this.defaultChildren
101101
});
102102

src/WrapperWithRedux.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default abstract class WrapperWithRedux<
2727
}
2828

2929
protected get mergedReduxState(): S {
30-
return merge({}, this.defaultReduxState, this.scenarioReduxState) as S;
30+
return merge(this.defaultReduxState, this.scenarioReduxState) as S;
3131
}
3232

3333
public withDefaultReduxState = (state: DeepPartial<S>) => {

0 commit comments

Comments
 (0)