test cleanup

linode · Jan 10, 2025 · b2c8920 · b2c8920
1 parent 589f7e8
commit b2c8920
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 137 deletions.
diff --git a/...manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.test.tsx b/...manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.test.tsx
@@ -12,9 +12,11 @@ import { PlacementGroupsDetail } from './PlacementGroupsDetail';
 const queryMocks = vi.hoisted(() => ({
   useAllLinodesQuery: vi.fn().mockReturnValue({}),
   useLocation: vi.fn().mockReturnValue({ pathname: '/placement-groups/1' }),
-  useParams: vi.fn().mockReturnValue({}),
+  useNavigate: vi.fn(),
+  useParams: vi.fn().mockReturnValue({ id: 1 }),
   usePlacementGroupQuery: vi.fn().mockReturnValue({}),
   useRegionsQuery: vi.fn().mockReturnValue({}),
+  useSearch: vi.fn().mockReturnValue({ query: undefined }),
 }));
 
 vi.mock('src/queries/placementGroups', async () => {
@@ -37,15 +39,9 @@ vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
   return {
     ...actual,
+    useNavigate: queryMocks.useNavigate,
     useParams: queryMocks.useParams,
-  };
-});
-
-vi.mock('react-router-dom', async () => {
-  const actual = await vi.importActual('react-router-dom');
-  return {
-    ...actual,
-    useLocation: queryMocks.useLocation,
+    useSearch: queryMocks.useSearch,
   };
 });
 
@@ -57,13 +53,10 @@ vi.mock('src/queries/regions/regions', async () => {
   };
 });
 
-describe('PlacementGroupsLanding', () => {
+describe('PlacementGroupsDetail', () => {
   it('renders a error page', async () => {
     const { getByText } = await renderWithThemeAndRouter(
-      <PlacementGroupsDetail />,
-      {
-        initialRoute: '/placement-groups/1',
-      }
+      <PlacementGroupsDetail />
     );
 
     expect(getByText('Not Found')).toBeInTheDocument();
@@ -74,7 +67,6 @@ describe('PlacementGroupsLanding', () => {
       data: placementGroupFactory.build({
         id: 1,
       }),
-
       isLoading: true,
     });
     queryMocks.useAllLinodesQuery.mockReturnValue({
@@ -95,10 +87,7 @@ describe('PlacementGroupsLanding', () => {
     });
 
     const { getByRole } = await renderWithThemeAndRouter(
-      <PlacementGroupsDetail />,
-      {
-        initialRoute: '/placement-groups/1',
-      }
+      <PlacementGroupsDetail />
     );
 
     expect(getByRole('progressbar')).toBeInTheDocument();
@@ -113,12 +102,16 @@ describe('PlacementGroupsLanding', () => {
         placement_group_type: 'anti_affinity:local',
       }),
     });
+    queryMocks.useAllLinodesQuery.mockReturnValue({
+      data: [],
+      isLoading: false,
+      page: 1,
+      pages: 1,
+      results: 0,
+    });
 
     const { getByText } = await renderWithThemeAndRouter(
-      <PlacementGroupsDetail />,
-      {
-        initialRoute: '/placement-groups/1',
-      }
+      <PlacementGroupsDetail />
     );
 
     expect(getByText(/my first pg/i)).toBeInTheDocument();

diff --git a/...ages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.tsx b/...ages/manager/src/features/PlacementGroups/PlacementGroupsDetail/PlacementGroupsDetail.tsx
@@ -21,8 +21,7 @@ import { PlacementGroupsLinodes } from './PlacementGroupsLinodes/PlacementGroups
 import { PlacementGroupsSummary } from './PlacementGroupsSummary/PlacementGroupsSummary';
 
 export const PlacementGroupsDetail = () => {
-  const { id } = useParams({ from: '/placement-groups/$id' });
-  const placementGroupId = +id;
+  const { id: placementGroupId } = useParams({ from: '/placement-groups/$id' });
 
   const {
     data: placementGroup,

diff --git a/...cementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.test.tsx b/...cementGroups/PlacementGroupsDetail/PlacementGroupsLinodes/PlacementGroupsLinodes.test.tsx
@@ -5,34 +5,33 @@ import { renderWithThemeAndRouter } from 'src/utilities/testHelpers';
 
 import { PLACEMENT_GROUP_LINODES_ERROR_MESSAGE } from '../../constants';
 import { PlacementGroupsLinodes } from './PlacementGroupsLinodes';
-import { migrationRouteTree } from 'src/routes';
 
 const queryMocks = vi.hoisted(() => ({
   useLocation: vi.fn().mockReturnValue({ pathname: '/placement-groups/1' }),
+  useNavigate: vi.fn(),
   useParams: vi.fn().mockReturnValue({ id: 1 }),
+  useSearch: vi.fn().mockReturnValue({ query: undefined }),
 }));
 
 vi.mock('@tanstack/react-router', async () => {
   const actual = await vi.importActual('@tanstack/react-router');
   return {
     ...actual,
     useLocation: queryMocks.useLocation,
+    useNavigate: queryMocks.useNavigate,
     useParams: queryMocks.useParams,
+    useSearch: queryMocks.useSearch,
   };
 });
 
 describe('PlacementGroupsLinodes', () => {
-  it.only('renders an error state if placement groups are undefined', async () => {
+  it('renders an error state if placement groups are undefined', async () => {
     const { getByText } = await renderWithThemeAndRouter(
       <PlacementGroupsLinodes
         isLinodeReadOnly={false}
         placementGroup={undefined}
         region={undefined}
-      />, 
-      {
-        routeTree: migrationRouteTree,
-        initialRoute: '/placement-groups/1'
-      }
+      />
     );
 
     expect(

diff --git a/...nager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsLanding.test.tsx b/...nager/src/features/PlacementGroups/PlacementGroupsLanding/PlacementGroupsLanding.test.tsx
@@ -5,7 +5,6 @@ import { renderWithThemeAndRouter } from 'src/utilities/testHelpers';
 
 import { PlacementGroupsLanding } from './PlacementGroupsLanding';
 import { headers } from './PlacementGroupsLandingEmptyStateData';
-import { TanstackLink } from 'src/components/TanstackLinks';
 
 const queryMocks = vi.hoisted(() => ({
   useLocation: vi.fn().mockReturnValue({ pathname: '/placement-groups' }),
@@ -21,14 +20,6 @@ vi.mock('@tanstack/react-router', async () => {
   };
 });
 
-vi.mock('react-router-dom', async () => {
-  const actual = await vi.importActual('react-router-dom');
-  return {
-    ...actual,
-    useLocation: queryMocks.useLocation,
-  };
-});
-
 vi.mock('src/queries/placementGroups', async () => {
   const actual = await vi.importActual('src/queries/placementGroups');
   return {
@@ -37,14 +28,6 @@ vi.mock('src/queries/placementGroups', async () => {
   };
 });
 
-vi.mock('src/components/Link', async () => {
-  const actual = await vi.importActual('src/components/Link');
-  return {
-    ...actual,
-    Link: TanstackLink,
-  };
-});
-
 describe('PlacementGroupsLanding', () => {
   it('renders loading state', async () => {
     queryMocks.usePlacementGroupsQuery.mockReturnValue({

diff --git a/packages/manager/src/routes/routes.test.tsx b/packages/manager/src/routes/routes.test.tsx
diff --git a/packages/manager/src/utilities/testHelpers.tsx b/packages/manager/src/utilities/testHelpers.tsx
@@ -18,6 +18,7 @@ import { Provider } from 'react-redux';
 import { MemoryRouter, Route } from 'react-router-dom';
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+import { BrowserRouter } from 'react-router-dom';
 
 import { LinodeThemeWrapper } from 'src/LinodeThemeWrapper';
 import { queryClientFactory } from 'src/queries/base';
@@ -206,7 +207,9 @@ export const wrapWithThemeAndRouter = (
             options={{ bootstrap: options.flags }}
           >
             <SnackbarProvider>
-              <RouterProvider router={router} />
+              <BrowserRouter>
+                <RouterProvider router={router} />
+              </BrowserRouter>
             </SnackbarProvider>
           </LDProvider>
         </LinodeThemeWrapper>