From 598b3b65b70355d71b0c55adfcd4eacbe6fc961b Mon Sep 17 00:00:00 2001
From: Sergey Sidorchik <s.sidorchick@gmail.com>
Date: Fri, 5 Oct 2018 14:20:00 -0700
Subject: [PATCH 1/2] fix(testing): fix enzyme options passing

---
 packages/testing/src/utils/mountWithTheme.js   | 10 +++++-----
 packages/testing/src/utils/renderWithTheme.js  | 10 +++++-----
 packages/testing/src/utils/shallowWithTheme.js |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

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;

From 7aa5abbaa652b0cd2ff850cef9fd88b01df09940 Mon Sep 17 00:00:00 2001
From: Sergey Sidorchik <s.sidorchick@gmail.com>
Date: Fri, 5 Oct 2018 21:39:28 -0700
Subject: [PATCH 2/2] Fix test

---
 packages/menus/src/containers/MenuContainer.spec.js | 2 ++
 1 file changed, 2 insertions(+)

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", () => {