From b0ab6059a2a9ca7764c5afb914912df1cebf4d0b Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Fri, 17 Jun 2022 15:47:29 +0300
Subject: [PATCH] Fixing tests due to changed ids of the entities

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
---
 ...tension-specific-preferences.test.tsx.snap | 76 +++++++++++++++++--
 ...to-extension-specific-preferences.test.tsx | 30 ++++----
 .../test-utils/get-application-builder.tsx    |  2 +-
 3 files changed, 84 insertions(+), 24 deletions(-)

diff --git a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
index 877499c505..313e438492 100644
--- a/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
+++ b/src/behaviours/preferences/__snapshots__/navigation-to-extension-specific-preferences.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab shows extension tab in general area 1`] = `
 <div
   class="Tab flex gaps align-center"
-  data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
+  data-testid="tab-link-for-extension-registered-tab-page-id-1-nav-item-metrics-extension-tab"
   role="tab"
   tabindex="0"
 >
@@ -17,6 +17,16 @@ exports[`preferences - navigation to extension specific preferences given in pre
 
 exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extension with registered tab when navigating to specific extension tab renders 1`] = `
 <div>
+  <div
+    class="StatusBar"
+  >
+    <div
+      class="leftSide"
+    />
+    <div
+      class="rightSide"
+    />
+  </div>
   <div
     class="SettingLayout showNavigation Preferences"
     data-testid="extension-preferences-page"
@@ -97,7 +107,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
           </div>
           <div
             class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
+            data-testid="tab-link-for-extension-registered-tab-page-id-1-nav-item-metrics-extension-tab"
             role="tab"
             tabindex="0"
           >
@@ -196,6 +206,16 @@ exports[`preferences - navigation to extension specific preferences given in pre
 
 exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to first extension tab renders 1`] = `
 <div>
+  <div
+    class="StatusBar"
+  >
+    <div
+      class="leftSide"
+    />
+    <div
+      class="rightSide"
+    />
+  </div>
   <div
     class="SettingLayout showNavigation Preferences"
     data-testid="extension-preferences-page"
@@ -276,7 +296,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
           </div>
           <div
             class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
+            data-testid="tab-link-for-extension-registered-tab-page-id-1-nav-item-metrics-extension-tab"
             role="tab"
             tabindex="0"
           >
@@ -288,7 +308,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
           </div>
           <div
             class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+            data-testid="tab-link-for-extension-duplicated-tab-page-id-1-nav-item-metrics-extension-tab"
             role="tab"
             tabindex="0"
           >
@@ -387,6 +407,16 @@ exports[`preferences - navigation to extension specific preferences given in pre
 
 exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given extensions with tabs having same id when navigating to second extension tab renders 1`] = `
 <div>
+  <div
+    class="StatusBar"
+  >
+    <div
+      class="leftSide"
+    />
+    <div
+      class="rightSide"
+    />
+  </div>
   <div
     class="SettingLayout showNavigation Preferences"
     data-testid="extension-preferences-page"
@@ -467,7 +497,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
           </div>
           <div
             class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab"
+            data-testid="tab-link-for-extension-registered-tab-page-id-1-nav-item-metrics-extension-tab"
             role="tab"
             tabindex="0"
           >
@@ -479,7 +509,7 @@ exports[`preferences - navigation to extension specific preferences given in pre
           </div>
           <div
             class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+            data-testid="tab-link-for-extension-duplicated-tab-page-id-1-nav-item-metrics-extension-tab"
             role="tab"
             tabindex="0"
           >
@@ -578,6 +608,16 @@ exports[`preferences - navigation to extension specific preferences given in pre
 
 exports[`preferences - navigation to extension specific preferences given in preferences, when rendered given multiple extensions with specific preferences, when navigating to extension specific preferences page renders 1`] = `
 <div>
+  <div
+    class="StatusBar"
+  >
+    <div
+      class="leftSide"
+    />
+    <div
+      class="rightSide"
+    />
+  </div>
   <div
     class="SettingLayout showNavigation Preferences"
     data-testid="extension-preferences-page"
@@ -2117,6 +2157,16 @@ exports[`preferences - navigation to extension specific preferences given in pre
 
 exports[`preferences - navigation to extension specific preferences when navigating to extension specific tab renders 1`] = `
 <div>
+  <div
+    class="StatusBar"
+  >
+    <div
+      class="leftSide"
+    />
+    <div
+      class="rightSide"
+    />
+  </div>
   <div
     class="SettingLayout showNavigation Preferences"
     data-testid="extension-preferences-page"
@@ -2197,7 +2247,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
           </div>
           <div
             class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+            data-testid="tab-link-for-extension-duplicated-tab-page-id-1-nav-item-metrics-extension-tab"
             role="tab"
             tabindex="0"
           >
@@ -2296,6 +2346,16 @@ exports[`preferences - navigation to extension specific preferences when navigat
 
 exports[`preferences - navigation to extension specific preferences when navigating to someone else extension specific tab renders 1`] = `
 <div>
+  <div
+    class="StatusBar"
+  >
+    <div
+      class="leftSide"
+    />
+    <div
+      class="rightSide"
+    />
+  </div>
   <div
     class="SettingLayout showNavigation Preferences"
     data-testid="extension-preferences-page"
@@ -2376,7 +2436,7 @@ exports[`preferences - navigation to extension specific preferences when navigat
           </div>
           <div
             class="Tab flex gaps align-center active"
-            data-testid="tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab"
+            data-testid="tab-link-for-extension-duplicated-tab-page-id-1-nav-item-metrics-extension-tab"
             role="tab"
             tabindex="0"
           >
diff --git a/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx b/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx
index 47dc8d7a84..2c60b1f707 100644
--- a/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx
+++ b/src/behaviours/preferences/navigation-to-extension-specific-preferences.test.tsx
@@ -53,7 +53,7 @@ describe("preferences - navigation to extension specific preferences", () => {
         const someTestExtension = getRendererExtensionFake(extensionStubWithExtensionSpecificPreferenceItems);
         const someOtherTestExtension = getRendererExtensionFake(someOtherExtensionStubWithExtensionSpecificPreferenceItems);
 
-        await applicationBuilder.addExtensions(someTestExtension, someOtherTestExtension);
+        await applicationBuilder.extensions.renderer.enable(someTestExtension, someOtherTestExtension);
         applicationBuilder.preferences.navigation.click("extension-some-test-extension-id");
       });
 
@@ -81,7 +81,7 @@ describe("preferences - navigation to extension specific preferences", () => {
         const extensionWithoutPreferences = getRendererExtensionFake(extensionStubWithoutPreferences);
         const extensionWithSpecificTab = getRendererExtensionFake(extensionStubWithShowInPreferencesTab);
 
-        await applicationBuilder.addExtensions(someTestExtension, extensionWithoutPreferences, extensionWithSpecificTab);
+        await applicationBuilder.extensions.renderer.enable(someTestExtension, extensionWithoutPreferences, extensionWithSpecificTab);
       });
 
       it("doesn't show link for extension without preferences", () => {
@@ -161,11 +161,11 @@ describe("preferences - navigation to extension specific preferences", () => {
         const getRendererExtensionFake = getRendererExtensionFakeFor(applicationBuilder);
         const extension = getRendererExtensionFake(extensionStubWithWithRegisteredTab);
 
-        await applicationBuilder.addExtensions(extension);
+        await applicationBuilder.extensions.renderer.enable(extension);
       });
 
       it("shows extension tab in general area", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+        const actual = rendered.getByTestId("tab-link-for-extension-registered-tab-page-id-1-nav-item-metrics-extension-tab");
 
         expect(actual).toMatchSnapshot();
       });
@@ -178,7 +178,7 @@ describe("preferences - navigation to extension specific preferences", () => {
 
       describe("when navigating to specific extension tab", () => {
         beforeEach(() => {
-          applicationBuilder.preferences.navigation.click("extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+          applicationBuilder.preferences.navigation.click("extension-registered-tab-page-id-1-nav-item-metrics-extension-tab");
         });
         it("renders", () => {
           expect(rendered.container).toMatchSnapshot();
@@ -201,12 +201,12 @@ describe("preferences - navigation to extension specific preferences", () => {
         const getRendererExtensionFake = getRendererExtensionFakeFor(applicationBuilder);
         const extension = getRendererExtensionFake(extensionStubWithWithRegisteredTabs);
 
-        await applicationBuilder.addExtensions(extension);
+        await applicationBuilder.extensions.renderer.enable(extension);
       });
 
       it("shows each of registered tabs in general area", () => {
-        const helloTab = rendered.getByTestId("tab-link-for-extension-hello-world-tab-page-id-nav-item-hello-extension-tab");
-        const logsTab = rendered.getByTestId("tab-link-for-extension-hello-world-tab-page-id-nav-item-logs-extension-tab");
+        const helloTab = rendered.getByTestId("tab-link-for-extension-hello-world-tab-page-id-1-nav-item-hello-extension-tab");
+        const logsTab = rendered.getByTestId("tab-link-for-extension-hello-world-tab-page-id-1-nav-item-logs-extension-tab");
 
         expect(helloTab).toBeInTheDocument();
         expect(logsTab).toBeInTheDocument();
@@ -219,24 +219,24 @@ describe("preferences - navigation to extension specific preferences", () => {
         const extension = getRendererExtensionFake(extensionStubWithWithRegisteredTab);
         const otherExtension = getRendererExtensionFake(extensionStubWithWithSameRegisteredTab);
 
-        await applicationBuilder.addExtensions(extension, otherExtension);
+        await applicationBuilder.extensions.renderer.enable(extension, otherExtension);
       });
 
       it("shows tab from the first extension", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+        const actual = rendered.getByTestId("tab-link-for-extension-registered-tab-page-id-1-nav-item-metrics-extension-tab");
 
         expect(actual).toBeInTheDocument();
       });
 
       it("shows tab from the second extension", () => {
-        const actual = rendered.getByTestId("tab-link-for-extension-duplicated-tab-page-id-nav-item-metrics-extension-tab");
+        const actual = rendered.getByTestId("tab-link-for-extension-duplicated-tab-page-id-1-nav-item-metrics-extension-tab");
 
         expect(actual).toBeInTheDocument();
       });
 
       describe("when navigating to first extension tab", () => {
         beforeEach(() => {
-          applicationBuilder.preferences.navigation.click("extension-registered-tab-page-id-nav-item-metrics-extension-tab");
+          applicationBuilder.preferences.navigation.click("extension-registered-tab-page-id-1-nav-item-metrics-extension-tab");
         });
 
         it("renders", () => {
@@ -258,7 +258,7 @@ describe("preferences - navigation to extension specific preferences", () => {
 
       describe("when navigating to second extension tab", () => {
         beforeEach(() => {
-          applicationBuilder.preferences.navigation.click("extension-duplicated-tab-page-id-nav-item-metrics-extension-tab");
+          applicationBuilder.preferences.navigation.click("extension-duplicated-tab-page-id-1-nav-item-metrics-extension-tab");
         });
 
         it("renders", () => {
@@ -300,7 +300,7 @@ describe("preferences - navigation to extension specific preferences", () => {
         applicationBuilder.preferences.navigateTo(extensionRoute, params);
       });
       
-      await applicationBuilder.addExtensions(extension);
+      await applicationBuilder.extensions.renderer.enable(extension);
       rendered = await applicationBuilder.render();
     });
 
@@ -330,7 +330,7 @@ describe("preferences - navigation to extension specific preferences", () => {
         applicationBuilder.preferences.navigateTo(extensionRoute, params);
       });
       
-      await applicationBuilder.addExtensions(extension, extensionUsingOtherTab);
+      await applicationBuilder.extensions.renderer.enable(extension, extensionUsingOtherTab);
       rendered = await applicationBuilder.render();
     });
 
diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx
index 91404c8686..c0fbc06aaa 100644
--- a/src/renderer/components/test-utils/get-application-builder.tsx
+++ b/src/renderer/components/test-utils/get-application-builder.tsx
@@ -102,7 +102,7 @@ export interface ApplicationBuilder {
   preferences: {
     close: () => void;
     navigate: () => void;
-    navigateTo: (route: Route, params: Partial<NavigateToRouteOptions<any>>) => void;
+    navigateTo: (route: Route<any>, params: Partial<NavigateToRouteOptions<any>>) => void;
     navigation: {
       click: (id: string) => void;
     };