From 1243eb887379850394360c5d4c9f16b9669b97fc Mon Sep 17 00:00:00 2001
From: Janne Savolainen <janne.savolainen@live.fi>
Date: Mon, 27 Jun 2022 14:41:00 +0300
Subject: [PATCH] Remove duplication

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
---
 .../test-utils/get-application-builder.tsx    | 38 ++++++-------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx
index 7a60243b76..80a6627f50 100644
--- a/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/src/renderer/components/test-utils/get-application-builder.tsx
@@ -121,7 +121,7 @@ interface DiContainers {
 }
 
 interface Environment {
-  render: () => RenderResult;
+  RootComponent: React.ElementType;
   onAllowKubeResource: () => void;
 }
 
@@ -159,17 +159,7 @@ export const getApplicationBuilder = () => {
 
   const environments = {
     application: {
-      render: () => {
-        const history = rendererDi.inject(historyInjectable);
-
-        const render = renderFor(rendererDi);
-
-        return render(
-          <Router history={history}>
-            <RootFrame />
-          </Router>,
-        );
-      },
+      RootComponent: RootFrame,
 
       onAllowKubeResource: () => {
         throw new Error(
@@ -179,18 +169,7 @@ export const getApplicationBuilder = () => {
     } as Environment,
 
     clusterFrame: {
-      render: () => {
-        const history = rendererDi.inject(historyInjectable);
-
-        const render = renderFor(rendererDi);
-
-        return render(
-          <Router history={history}>
-            <ClusterFrame />
-          </Router>,
-        );
-      },
-
+      RootComponent: ClusterFrame,
       onAllowKubeResource: () => {},
     } as Environment,
   };
@@ -477,12 +456,19 @@ export const getApplicationBuilder = () => {
 
       await startFrame();
 
-
       for (const callback of beforeRenderCallbacks) {
         await callback(dis);
       }
 
-      rendered = environment.render();
+      const history = rendererDi.inject(historyInjectable);
+
+      const render = renderFor(rendererDi);
+
+      rendered = render(
+        <Router history={history}>
+          <environment.RootComponent />
+        </Router>,
+      );
 
       return rendered;
     },