From 0a0fa392b9ce7aea85c300decf5cc7eff8779bb5 Mon Sep 17 00:00:00 2001
From: Jim Ehrismann <jehrismann@mirantis.com>
Date: Tue, 13 Sep 2022 18:28:39 -0400
Subject: [PATCH] address review comments, fix tests

Signed-off-by: Jim Ehrismann <jehrismann@mirantis.com>
---
 ...come-route-config.global-override-for-injectable.ts |  8 ++++++++
 ...verify-that-all-routes-have-route-component.test.ts | 10 ++++++----
 src/features/welcome/setting-welcome-page.test.tsx     |  8 ++++----
 3 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts

diff --git a/src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts
new file mode 100644
index 0000000000..703c0798a2
--- /dev/null
+++ b/src/common/front-end-routing/routes/welcome/welcome-route-config.global-override-for-injectable.ts
@@ -0,0 +1,8 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getGlobalOverride } from "../../../test-utils/get-global-override";
+import welcomeRouteConfig from "./welcome-route-config.injectable";
+
+export default getGlobalOverride(welcomeRouteConfig, () => "/welcome");
diff --git a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
index 4b6776bdaa..acd1d4401d 100644
--- a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
+++ b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts
@@ -5,7 +5,7 @@
 import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting";
 import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token";
 import { frontEndRouteInjectionToken } from "./front-end-route-injection-token";
-import { filter, map, matches } from "lodash/fp";
+import { filter, map } from "lodash/fp";
 import clusterStoreInjectable from "../cluster-store/cluster-store.injectable";
 import type { ClusterStore } from "../cluster-store/cluster-store";
 import { pipeline } from "@ogre-tools/fp";
@@ -27,9 +27,11 @@ describe("verify-that-all-routes-have-component", () => {
       routes,
 
       map(
-        (route) => ({
-          path: route.path,
-          routeComponent: routeComponents.find(matches({ route })),
+        (currentRoute) => ({
+          path: currentRoute.path,
+          routeComponent: routeComponents.find(({ route }) => (
+            route.path === currentRoute.path
+            && route.clusterFrame === currentRoute.clusterFrame)),
         }),
       ),
 
diff --git a/src/features/welcome/setting-welcome-page.test.tsx b/src/features/welcome/setting-welcome-page.test.tsx
index e795f69a89..fc5a0fe4a9 100644
--- a/src/features/welcome/setting-welcome-page.test.tsx
+++ b/src/features/welcome/setting-welcome-page.test.tsx
@@ -22,7 +22,7 @@ describe("setting-welcome-page", () => {
     applicationBuilder = getApplicationBuilder();
   });
 
-  describe("given no extension sets the welcome page", () => {
+  describe("given configuration of welcome page route is the default", () => {
     beforeEach(async () => {
       applicationBuilder.beforeApplicationStart((mainDi) => {
         mainDi.override(welcomeRouteConfigInjectable, () => "/welcome");
@@ -45,14 +45,14 @@ describe("setting-welcome-page", () => {
       expect(welcomeRoute.path).toEqual("/welcome");
     });
 
-    it("navigates to the default welcome page", () => {
+    it("launches to the default welcome page", () => {
       const welcomePage = rendered.getByTestId("welcome-page");  // from the Welcome component (welcome.tsx)
 
       expect(welcomePage).toBeInTheDocument();
     });
   });
 
-  describe("given an extension specifies a custom welcome page", () => {
+  describe("given configuration of welcome page route is set to a custom page", () => {
     beforeEach(async () => {
       applicationBuilder.beforeApplicationStart((mainDi) => {
         mainDi.override(welcomeRouteConfigInjectable, () => "/extension/some-extension-name/some-welcome-page");
@@ -74,7 +74,7 @@ describe("setting-welcome-page", () => {
       expect(welcomeRoute.path).toEqual("/extension/some-extension-name/some-welcome-page");
     });
 
-    it("navigates to the custom welcome page", () => {
+    it("launches to the custom welcome page ", () => {
       const welcomePage = rendered.getByTestId("some-welcome-test-id");
 
       expect(welcomePage).toBeInTheDocument();