From bfb4245207151a08749e474c5255a11087472086 Mon Sep 17 00:00:00 2001 From: DevyanshuNegi Date: Wed, 11 Dec 2024 17:30:26 +0530 Subject: [PATCH 1/2] refactored src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx from jest to vitest --- .../Groups/{Groups.test.tsx => Groups.spec.tsx} | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) rename src/screens/UserPortal/Volunteer/Groups/{Groups.test.tsx => Groups.spec.tsx} (95%) diff --git a/src/screens/UserPortal/Volunteer/Groups/Groups.test.tsx b/src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx similarity index 95% rename from src/screens/UserPortal/Volunteer/Groups/Groups.test.tsx rename to src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx index bc0a4993b9..28e2806e5d 100644 --- a/src/screens/UserPortal/Volunteer/Groups/Groups.test.tsx +++ b/src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx @@ -15,6 +15,8 @@ import Groups from './Groups'; import type { ApolloLink } from '@apollo/client'; import { MOCKS, EMPTY_MOCKS, ERROR_MOCKS } from './Groups.mocks'; import useLocalStorage from 'utils/useLocalstorage'; +import { vi } from 'vitest'; +import '@testing-library/jest-dom'; const { setItem } = useLocalStorage(); @@ -63,10 +65,13 @@ const renderGroups = (link: ApolloLink): RenderResult => { describe('Testing Groups Screen', () => { beforeAll(() => { - jest.mock('react-router-dom', () => ({ - ...jest.requireActual('react-router-dom'), - useParams: () => ({ orgId: 'orgId' }), - })); + vi.mock('react-router-dom', async () => { + const actual = await vi.importActual('react-router-dom'); + return { + ...actual, + userParams: () => ({ orgId: 'orgId' }), + }; + }); }); beforeEach(() => { @@ -74,7 +79,7 @@ describe('Testing Groups Screen', () => { }); afterAll(() => { - jest.clearAllMocks(); + vi.clearAllMocks(); }); it('should redirect to fallback URL if URL params are undefined', async () => { From 05e21529e348a15f64b86862d4948bbf6b2e5692 Mon Sep 17 00:00:00 2001 From: Devyanshu Negi <100033611+DevyanshuNegi@users.noreply.github.com> Date: Wed, 11 Dec 2024 20:45:58 +0530 Subject: [PATCH 2/2] Update src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx b/src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx index 28e2806e5d..3ec91789f4 100644 --- a/src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx +++ b/src/screens/UserPortal/Volunteer/Groups/Groups.spec.tsx @@ -69,7 +69,7 @@ describe('Testing Groups Screen', () => { const actual = await vi.importActual('react-router-dom'); return { ...actual, - userParams: () => ({ orgId: 'orgId' }), + useParams: () => ({ orgId: 'orgId' }), }; }); });