fix: adjust tests for namespace instead of workspace

konflux-ci · Feb 11, 2025 · baa6680 · baa6680
1 parent 4953839
commit baa6680
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/src/components/Components/ComponentDetails/__tests__/ComponentActivityTab.spec.tsx b/src/components/Components/ComponentDetails/__tests__/ComponentActivityTab.spec.tsx
@@ -4,7 +4,7 @@ import { useComponent, useComponents } from '../../../../hooks/useComponents';
 import {
   createK8sWatchResourceMock,
   createUseApplicationMock,
-  createUseWorkspaceInfoMock,
+  createUseNamespaceMock,
   routerRenderer,
 } from '../../../../utils/test-utils';
 import { pipelineWithCommits } from '../../../Commits/__data__/pipeline-with-commits';
@@ -39,7 +39,7 @@ const useParamsMock = useParams as jest.Mock;
 describe('ComponentActivityTab', () => {
   let navigateMock: jest.Mock;
 
-  createUseWorkspaceInfoMock({ namespace: 'test-ns', workspace: 'test-ws' });
+  createUseNamespaceMock('test-ns');
 
   beforeEach(() => {
     watchResourceMock.mockReturnValue([pipelineWithCommits.slice(0, 4), true]);
@@ -49,7 +49,6 @@ describe('ComponentActivityTab', () => {
     useNavigateMock.mockImplementation(() => navigateMock);
     useParamsMock.mockReturnValue({
       activityTab: 'latest-commits',
-      workspaceName: 'test-ws',
       componentName: 'test-component',
     });
   });
@@ -73,7 +72,7 @@ describe('ComponentActivityTab', () => {
 
     await act(() => fireEvent.click(plrTab));
     expect(navigateMock).toHaveBeenCalledWith(
-      '/workspaces/test-ws/applications/my-test-output/components/test-component/activity/pipelineruns',
+      '/workspaces/test-ns/applications/my-test-output/components/test-component/activity/pipelineruns',
     );
   });
 });
diff --git a/src/components/Components/ComponentDetails/__tests__/ComponentDetails.spec.tsx b/src/components/Components/ComponentDetails/__tests__/ComponentDetails.spec.tsx
@@ -4,7 +4,7 @@ import { useComponent } from '../../../../hooks/useComponents';
 import { PACState } from '../../../../hooks/usePACState';
 import {
   createK8sWatchResourceMock,
-  createUseWorkspaceInfoMock,
+  createUseNamespaceMock,
   renderWithQueryClientAndRouter,
   WithTestWorkspaceContext,
 } from '../../../../utils/test-utils';
@@ -63,7 +63,7 @@ describe('ComponentDetailsView', () => {
   let navigateMock: jest.Mock;
   const showModalMock = jest.fn();
 
-  createUseWorkspaceInfoMock({ namespace: 'test-ns', workspace: 'test-ws' });
+  createUseNamespaceMock('test-ns');
 
   beforeEach(() => {
     useComponentMock.mockReturnValue([mockComponent, true]);
@@ -108,7 +108,7 @@ describe('ComponentDetailsView', () => {
 
     await act(() => fireEvent.click(activityTab));
     expect(navigateMock).toHaveBeenCalledWith(
-      '/workspaces/test-ws/applications/test-application/components/human-resources/activity',
+      '/workspaces/test-ns/applications/test-application/components/human-resources/activity',
     );
   });
 });
diff --git a/src/components/Components/ComponentsListView/__tests__/ComponentListView.spec.tsx b/src/components/Components/ComponentsListView/__tests__/ComponentListView.spec.tsx
@@ -4,8 +4,8 @@ import { useTRPipelineRuns } from '../../../../hooks/useTektonResults';
 import { ComponentGroupVersionKind, PipelineRunGroupVersionKind } from '../../../../models';
 import {
   createK8sWatchResourceMock,
-  createUseWorkspaceInfoMock,
   createUseApplicationMock,
+  createUseNamespaceMock,
 } from '../../../../utils/test-utils';
 import { componentCRMocks } from '../../__data__/mock-data';
 import { mockPipelineRuns } from '../../__data__/mock-pipeline-run';
@@ -94,7 +94,7 @@ describe('ComponentListViewPage', () => {
     paramValues = {};
   });
 
-  createUseWorkspaceInfoMock({ namespace: 'test-ns', workspace: 'test-ws' });
+  createUseNamespaceMock('test-ns');
 
   it('should render skeleton if data is not loaded', () => {
     useK8sWatchResourceMock.mockReturnValue([[], false]);
@@ -107,7 +107,7 @@ describe('ComponentListViewPage', () => {
     const button = screen.getByText('Add component');
     expect(button).toBeInTheDocument();
     expect(button.closest('a').href).toBe(
-      'http://localhost/workspaces/test-ws/import?application=test-app',
+      'http://localhost/workspaces/test-ns/import?application=test-app',
     );
   });
 

diff --git a/src/utils/test-utils.tsx b/src/utils/test-utils.tsx
@@ -12,6 +12,7 @@ import {
 } from '@testing-library/react';
 import { FormikValues, Formik } from 'formik';
 import * as NamespaceUtils from '../components/Namespace/namespace-context';
+import * as NamespaceHook from '../components/Namespace/useNamespaceInfo';
 import * as WorkspaceHook from '../components/Workspace/useWorkspaceInfo';
 import * as WorkspaceUtils from '../components/Workspace/workspace-context';
 import * as ApplicationHook from '../hooks/useApplications';
@@ -237,6 +238,18 @@ export const createUseWorkspaceInfoMock = (
   return mockFn;
 };
 
+export const createUseNamespaceMock = (initialValue: string = ''): jest.Mock => {
+  const mockFn = jest.fn().mockReturnValue(initialValue);
+
+  jest.spyOn(NamespaceHook, 'useNamespace').mockImplementation(mockFn);
+
+  beforeEach(() => {
+    mockFn.mockReturnValue(initialValue);
+  });
+
+  return mockFn;
+};
+
 export const createUseApplicationMock = (
   initialValue: [{ metadata: { name: string } }, boolean] = [{ metadata: { name: '' } }, false],
 ): jest.Mock => {