From fb39efa3204c06080ac99c83084c60a9c0542cdf Mon Sep 17 00:00:00 2001
From: Tim Hansen <timbonicus@gmail.com>
Date: Fri, 4 Feb 2022 13:25:51 -0700
Subject: [PATCH] Fix useEntityListProvider test

Signed-off-by: Tim Hansen <timbonicus@gmail.com>
---
 .../src/hooks/useEntityListProvider.test.tsx  | 50 +++++++++++--------
 .../catalog-react/src/testUtils/providers.tsx |  1 +
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
index a1e722bc6d..548561108d 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.test.tsx
@@ -27,6 +27,7 @@ import { MockStorageApi, TestApiProvider } from '@backstage/test-utils';
 import { act, renderHook } from '@testing-library/react-hooks';
 import qs from 'qs';
 import React, { PropsWithChildren } from 'react';
+import { MemoryRouter } from 'react-router';
 import { catalogApiRef } from '../api';
 import { DefaultStarredEntitiesApi, starredEntitiesApiRef } from '../apis';
 import { EntityKindPicker, UserListPicker } from '../components';
@@ -82,31 +83,35 @@ const mockCatalogApi: Partial<CatalogApi> = {
 
 const wrapper = ({
   userFilter,
+  location,
   children,
 }: PropsWithChildren<{
   userFilter?: UserListFilterKind;
+  location?: string;
 }>) => {
   return (
-    <TestApiProvider
-      apis={[
-        [configApiRef, mockConfigApi],
-        [catalogApiRef, mockCatalogApi],
-        [identityApiRef, mockIdentityApi],
-        [storageApiRef, MockStorageApi.create()],
-        [
-          starredEntitiesApiRef,
-          new DefaultStarredEntitiesApi({
-            storageApi: MockStorageApi.create(),
-          }),
-        ],
-      ]}
-    >
-      <EntityListProvider>
-        <EntityKindPicker initialFilter="component" hidden />
-        <UserListPicker initialFilter={userFilter} />
-        {children}
-      </EntityListProvider>
-    </TestApiProvider>
+    <MemoryRouter initialEntries={[location ?? '']}>
+      <TestApiProvider
+        apis={[
+          [configApiRef, mockConfigApi],
+          [catalogApiRef, mockCatalogApi],
+          [identityApiRef, mockIdentityApi],
+          [storageApiRef, MockStorageApi.create()],
+          [
+            starredEntitiesApiRef,
+            new DefaultStarredEntitiesApi({
+              storageApi: MockStorageApi.create(),
+            }),
+          ],
+        ]}
+      >
+        <EntityListProvider>
+          <EntityKindPicker initialFilter="component" hidden />
+          <UserListPicker initialFilter={userFilter} />
+          {children}
+        </EntityListProvider>
+      </TestApiProvider>
+    </MemoryRouter>
   );
 };
 
@@ -168,10 +173,11 @@ describe('<EntityListProvider />', () => {
     const query = qs.stringify({
       filters: { kind: 'component', type: 'service' },
     });
-    delete (window as any).location;
-    (window as any).location = new URL(`http://localhost/catalog?${query}`);
     const { result, waitFor } = renderHook(() => useEntityListProvider(), {
       wrapper,
+      initialProps: {
+        location: `/catalog?${query}`,
+      },
     });
     await waitFor(() => !!result.current.queryParameters);
     expect(result.current.queryParameters).toEqual({
diff --git a/plugins/catalog-react/src/testUtils/providers.tsx b/plugins/catalog-react/src/testUtils/providers.tsx
index 5b2eae04a5..3fb295298c 100644
--- a/plugins/catalog-react/src/testUtils/providers.tsx
+++ b/plugins/catalog-react/src/testUtils/providers.tsx
@@ -74,6 +74,7 @@ export const MockEntityListContextProvider = ({
       filters,
       loading: value?.loading ?? false,
       queryParameters: value?.queryParameters ?? defaultValues.queryParameters,
+      error: value?.error,
     }),
     [value, defaultValues, filters, updateFilters],
   );