From ec35c57c470f7f3d5f141d9a6853bf89712db76f Mon Sep 17 00:00:00 2001
From: Andrew Musgrave <andrew.musgrave@shopify.com>
Date: Wed, 29 May 2019 16:11:06 -0400
Subject: [PATCH] Fix context sharing

---
 src/test-utilities/react-testing.tsx | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/test-utilities/react-testing.tsx b/src/test-utilities/react-testing.tsx
index 7119a5a6..d29ea5fb 100644
--- a/src/test-utilities/react-testing.tsx
+++ b/src/test-utilities/react-testing.tsx
@@ -22,8 +22,8 @@ interface Providers {
   themeProvider: ThemeProviderContextType;
   frame: FrameContextType;
 }
-type Options = {};
-type Context = DeepPartial<Providers>;
+type Options = DeepPartial<Providers>;
+type Context = Providers;
 interface Props extends Providers {
   children: React.ReactElement<any>;
 }
@@ -54,7 +54,7 @@ function TestProvider({
 }
 
 export const mountWithContext = createMount<Options, Context>({
-  render(element, {polaris, themeProvider, frame}) {
+  context({polaris, themeProvider, frame}) {
     const polarisContextDefault = createPolarisContext();
     const polarisContext =
       (polaris && merge(polarisContextDefault, polaris)) ||
@@ -76,11 +76,18 @@ export const mountWithContext = createMount<Options, Context>({
     const frameContext =
       (frame && merge(frameContextDefault, frame)) || frameContextDefault;
 
+    return {
+      polaris: polarisContext,
+      themeProvider: themeProviderContext,
+      frame: frameContext,
+    };
+  },
+  render(element, {polaris, themeProvider, frame}) {
     return (
       <TestProvider
-        polaris={polarisContext}
-        themeProvider={themeProviderContext}
-        frame={frameContext}
+        polaris={polaris}
+        themeProvider={themeProvider}
+        frame={frame}
       >
         {element}
       </TestProvider>