diff --git a/packages/menus/src/containers/MenuContainer.spec.js b/packages/menus/src/containers/MenuContainer.spec.js index 6bc3874173e..3316a8e4a58 100644 --- a/packages/menus/src/containers/MenuContainer.spec.js +++ b/packages/menus/src/containers/MenuContainer.spec.js @@ -132,6 +132,8 @@ describe('MenuContainer', () => { findTrigger(wrapper).simulate('click'); expect(wrapper.find('Portal').length).toBeGreaterThan(0); + + wrapper.unmount(); }); it("doesn't render Popper element if menu is not open", () => { diff --git a/packages/testing/src/utils/mountWithTheme.js b/packages/testing/src/utils/mountWithTheme.js index ac13302026b..d20ecff9106 100644 --- a/packages/testing/src/utils/mountWithTheme.js +++ b/packages/testing/src/utils/mountWithTheme.js @@ -21,11 +21,11 @@ const mountWithTheme = (tree, { rtl, theme = {}, enzymeOptions } = {}) => { .instance() .getChildContext(); - return mount( - tree, - { context, childContextTypes: StyledThemeProvider.childContextTypes }, - enzymeOptions - ); + return mount(tree, { + ...enzymeOptions, + context, + childContextTypes: StyledThemeProvider.childContextTypes + }); }; export default mountWithTheme; diff --git a/packages/testing/src/utils/renderWithTheme.js b/packages/testing/src/utils/renderWithTheme.js index 9829d9ae523..feb20a0b73f 100644 --- a/packages/testing/src/utils/renderWithTheme.js +++ b/packages/testing/src/utils/renderWithTheme.js @@ -21,11 +21,11 @@ const renderWithTheme = (tree, { rtl, theme, enzymeOptions } = {}) => { .instance() .getChildContext(); - return render( - tree, - { context, childContextTypes: StyledThemeProvider.childContextTypes }, - enzymeOptions - ); + return render(tree, { + ...enzymeOptions, + context, + childContextTypes: StyledThemeProvider.childContextTypes + }); }; export default renderWithTheme; diff --git a/packages/testing/src/utils/shallowWithTheme.js b/packages/testing/src/utils/shallowWithTheme.js index 4fd3f77c46c..a719ff474c9 100644 --- a/packages/testing/src/utils/shallowWithTheme.js +++ b/packages/testing/src/utils/shallowWithTheme.js @@ -20,7 +20,7 @@ const shallowWithTheme = (tree, { rtl, theme, enzymeOptions } = {}) => { .instance() .getChildContext(); - return shallow(tree, { context }, enzymeOptions); + return shallow(tree, { ...enzymeOptions, context }); }; export default shallowWithTheme;