@openmrs/esm-fast-data-entry-app 1.4.2-pre.728 → 1.4.2-pre.736

package/dist/openmrs-esm-fast-data-entry-app.js.buildmanifest.json

@@ -1563,9 +1563,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: defaultVendors)",
-      "size": 3145073,
+      "size": 3147823,
       "sizes": {
-        "javascript": 3145073
+        "javascript": 3147823
       },
       "names": [],
       "idHints": [
@@ -1581,7 +1581,7 @@
       "auxiliaryFiles": [
         "9108.js.map"
       ],
-      "hash": "27d23081f0696640",
+      "hash": "496ab30cbbad651a",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"root","routeRegex":"forms","online":true,"offline":true}],"extensions":[{"name":"forms-app-link","slot":"app-menu-slot","component":"formsAppMenuLink","online":true,"offline":true}],"version":"1.4.2-pre.728"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"fhir2":">=1.2","webservices.rest":">=2.2.0"},"pages":[{"component":"root","routeRegex":"forms","online":true,"offline":true}],"extensions":[{"name":"forms-app-link","slot":"app-menu-slot","component":"formsAppMenuLink","online":true,"offline":true}],"version":"1.4.2-pre.736"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-fast-data-entry-app",
-  "version": "1.4.2-pre.728",
+  "version": "1.4.2-pre.736",
   "license": "MPL-2.0",
   "description": "O3 frontend module for fast data entry using the OpenMRS Angular Form Engine",
   "browser": "dist/openmrs-esm-fast-data-entry-app.js",
@@ -14,9 +14,10 @@
     "lint": "eslint \"src/**/*.ts\" \"src/**/*.tsx\" --fix --max-warnings=0",
     "prettier": "prettier --write \"src/**/*.{ts,tsx}\" --list-different",
     "typescript": "tsc",
-    "test": "jest --config jest.config.json --passWithNoTests",
+    "test": "cross-env TZ=UTC vitest run --passWithNoTests",
+    "test:watch": "cross-env TZ=UTC vitest watch",
     "verify": "turbo lint typescript test",
-    "coverage": "yarn test -- --coverage ",
+    "coverage": "cross-env TZ=UTC vitest run --coverage --passWithNoTests",
     "postinstall": "husky install",
     "extract-translations": "i18next 'src/**/*.tsx' --config ./tools/i18next-parser.config.js",
     "test-e2e": "playwright test"
@@ -55,29 +56,26 @@
     "@playwright/test": "^1.50.1",
     "@swc-node/loader": "^1.3.7",
     "@swc/core": "^1.3.84",
-    "@swc/jest": "^0.2.29",
-    "@testing-library/dom": "^7.31.2",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^13.4.0",
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.8.0",
+    "@testing-library/react": "^16.3.0",
     "@testing-library/user-event": "^14.4.3",
-    "@types/jest": "^28.1.8",
     "@types/react": "^18.3.21",
     "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
-    "@types/testing-library__jest-dom": "^5.14.9",
     "@types/webpack-env": "^1.18.1",
     "@typescript-eslint/eslint-plugin": "^6.7.0",
     "@typescript-eslint/parser": "^6.7.0",
+    "@vitest/coverage-v8": "^4.1.2",
     "concurrently": "^6.5.1",
+    "cross-env": "^10.1.0",
     "eslint": "^8.49.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-react-hooks": "^5.0.0",
     "husky": "^8.0.3",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^28.1.3",
-    "jest-cli": "^28.1.3",
-    "jest-environment-jsdom": "^28.1.3",
+    "jsdom": "^28.0.0",
     "lint-staged": "^15.2.0",
     "lodash-es": "^4.17.21",
     "openmrs": "next",
@@ -89,7 +87,8 @@
     "semver": "^7.5.4",
     "swr": "^2.2.4",
     "turbo": "^2.5.2",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "vitest": "^4.1.2"
   },
   "dependencies": {
     "dotenv": "^16.4.7",

package/src/FormBootstrap.test.tsx

@@ -1,15 +1,16 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach, afterEach, type MockedFunction } from 'vitest';
 import { act, render, screen } from '@testing-library/react';
 import { detach, ExtensionSlot } from '@openmrs/esm-framework';
 import GroupFormWorkflowContext from './context/GroupFormWorkflowContext';
 import useGetPatient from './hooks/useGetPatient';
 import FormBootstrap from './FormBootstrap';
 
-jest.mock('./hooks/useGetPatient', () => jest.fn());
+vi.mock('./hooks/useGetPatient', () => ({ default: vi.fn() }));
 
-const mockDetach = jest.mocked(detach);
-const mockExtensionSlot = jest.mocked(ExtensionSlot);
-const mockUseGetPatient = useGetPatient as jest.MockedFunction<typeof useGetPatient>;
+const mockDetach = vi.mocked(detach);
+const mockExtensionSlot = vi.mocked(ExtensionSlot);
+const mockUseGetPatient = useGetPatient as MockedFunction<typeof useGetPatient>;
 
 const renderFormBootstrap = (props = {}) =>
   render(
@@ -31,9 +32,9 @@ const renderFormBootstrap = (props = {}) =>
         visitUuid="visit-1"
         visitTypeUuid="visit-type-1"
         encounterUuid="encounter-1"
-        handlePostResponse={jest.fn()}
-        handleEncounterCreate={jest.fn()}
-        handleOnValidate={jest.fn()}
+        handlePostResponse={vi.fn()}
+        handleEncounterCreate={vi.fn()}
+        handleOnValidate={vi.fn()}
         hidePatientBanner={true}
         {...props}
       />
@@ -50,7 +51,7 @@ describe('FormBootstrap', () => {
   });
 
   afterEach(() => {
-    jest.useRealTimers();
+    vi.useRealTimers();
   });
 
   it('passes the expected widget state once the patient is available', () => {
@@ -84,8 +85,8 @@ describe('FormBootstrap', () => {
   });
 
   it('refreshes the widget after submit and detaches it on unmount', () => {
-    jest.useFakeTimers();
-    const handlePostResponse = jest.fn();
+    vi.useFakeTimers();
+    const handlePostResponse = vi.fn();
     const { unmount } = renderFormBootstrap({ handlePostResponse });
 
     const [{ state }] = mockExtensionSlot.mock.calls[0];
@@ -99,7 +100,7 @@ describe('FormBootstrap', () => {
     expect(screen.queryByTestId('form-widget-slot')).not.toBeInTheDocument();
 
     act(() => {
-      jest.advanceTimersByTime(1);
+      vi.advanceTimersByTime(1);
     });
 
     expect(screen.getByTestId('form-widget-slot')).toBeInTheDocument();

package/src/add-group-modal/AddGroupModal.test.tsx

@@ -6,15 +6,16 @@ import {
   type Session,
   PatientIdentifierType,
 } from '@openmrs/esm-framework';
+import { vi, describe, it, expect, test, beforeEach, type MockedFunction } from 'vitest';
 import { useHsuIdIdentifier } from '../hooks/location-tag.resource';
 
-jest.mock('@openmrs/esm-framework');
-jest.mock('../hooks/location-tag.resource');
+vi.mock('@openmrs/esm-framework');
+vi.mock('../hooks/location-tag.resource');
 
-const mockShowSnackbar = showSnackbar as jest.MockedFunction<typeof showSnackbar>;
-const mockUseConfig = useConfig as jest.MockedFunction<typeof useConfig>;
-const mockUseSession = useSession as jest.MockedFunction<typeof useSession>;
-const mockUseHsuIdIdentifier = useHsuIdIdentifier as jest.MockedFunction<typeof useHsuIdIdentifier>;
+const mockShowSnackbar = showSnackbar as MockedFunction<typeof showSnackbar>;
+const mockUseConfig = useConfig as MockedFunction<typeof useConfig>;
+const mockUseSession = useSession as MockedFunction<typeof useSession>;
+const mockUseHsuIdIdentifier = useHsuIdIdentifier as MockedFunction<typeof useHsuIdIdentifier>;
 
 describe('AddGroupModal - enforcePatientListLocationMatch', () => {
   const mockSessionLocation = {
@@ -28,7 +29,7 @@ describe('AddGroupModal - enforcePatientListLocationMatch', () => {
   };
 
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
   });
 
   it('should show error snackbar when enforcePatientListLocationMatch is enabled and location mismatch occurs', () => {
@@ -48,7 +49,7 @@ describe('AddGroupModal - enforcePatientListLocationMatch', () => {
       },
     } as unknown as ReturnType<typeof useHsuIdIdentifier>);
 
-    const config = mockUseConfig();
+    const config = mockUseConfig() as ConfigSchema;
     const session = mockUseSession();
     const hsuData = mockUseHsuIdIdentifier('patient-uuid');
 
@@ -88,7 +89,7 @@ describe('AddGroupModal - enforcePatientListLocationMatch', () => {
       },
     } as unknown as ReturnType<typeof useHsuIdIdentifier>);
 
-    const config = mockUseConfig();
+    const config = mockUseConfig() as ConfigSchema;
     const session = mockUseSession();
     const hsuData = mockUseHsuIdIdentifier('patient-uuid');
 
@@ -122,7 +123,7 @@ describe('AddGroupModal - enforcePatientListLocationMatch', () => {
       },
     } as unknown as ReturnType<typeof useHsuIdIdentifier>);
 
-    const config = mockUseConfig();
+    const config = mockUseConfig() as ConfigSchema;
     const session = mockUseSession();
     const hsuData = mockUseHsuIdIdentifier('patient-uuid');
 
@@ -160,7 +161,7 @@ describe('AddGroupModal - enforcePatientListLocationMatch', () => {
       },
     } as unknown as ReturnType<typeof useHsuIdIdentifier>);
 
-    const config = mockUseConfig();
+    const config = mockUseConfig() as ConfigSchema;
     const session = mockUseSession();
     const hsuData = mockUseHsuIdIdentifier('patient-uuid');
 
@@ -187,7 +188,7 @@ describe('AddGroupModal - enforcePatientListLocationMatch', () => {
       patientLocationMismatchCheck: true,
     } as ConfigSchema);
 
-    const config = mockUseConfig();
+    const config = mockUseConfig() as ConfigSchema;
 
     const shouldShowError = config.enforcePatientListLocationMatch === true;
     const shouldShowModal = !config.enforcePatientListLocationMatch && config.patientLocationMismatchCheck;

package/src/context/FormWorkflowReducer.test.ts

@@ -1,8 +1,9 @@
 import { navigate } from '@openmrs/esm-framework';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
 import { initialWorkflowState } from './FormWorkflowContext';
 import reducer, { fdeWorkflowStorageName, fdeWorkflowStorageVersion } from './FormWorkflowReducer';
 
-const mockNavigate = jest.mocked(navigate);
+const mockNavigate = vi.mocked(navigate);
 
 const buildState = (formStateOverrides = {}) => ({
   ...initialWorkflowState,
@@ -81,7 +82,7 @@ describe('FormWorkflowReducer', () => {
   });
 
   it('dispatches the submit event and moves the workflow into SUBMIT_FOR_NEXT', () => {
-    const dispatchEventSpy = jest.spyOn(window, 'dispatchEvent');
+    const dispatchEventSpy = vi.spyOn(window, 'dispatchEvent');
     const state = buildState({
       workflowState: 'EDIT_FORM',
       activePatientUuid: 'patient-a',

package/src/context/GroupFormWorkflowReducer.test.ts

@@ -1,12 +1,13 @@
 import { navigate } from '@openmrs/esm-framework';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
 import { initialWorkflowState } from './GroupFormWorkflowContext';
 import reducer, { fdeGroupWorkflowStorageName, fdeGroupWorkflowStorageVersion } from './GroupFormWorkflowReducer';
 
-jest.mock('uuid', () => ({
-  v4: jest.fn(() => 'generated-session-uuid'),
+vi.mock('uuid', () => ({
+  v4: vi.fn(() => 'generated-session-uuid'),
 }));
 
-const mockNavigate = jest.mocked(navigate);
+const mockNavigate = vi.mocked(navigate);
 
 const buildState = (formStateOverrides = {}, rootStateOverrides = {}) => ({
   ...initialWorkflowState,
@@ -185,7 +186,7 @@ describe('GroupFormWorkflowReducer', () => {
   });
 
   it('dispatches validate events and stores the visit UUID for the active patient', () => {
-    const dispatchEventSpy = jest.spyOn(window, 'dispatchEvent');
+    const dispatchEventSpy = vi.spyOn(window, 'dispatchEvent');
     const state = buildState({
       workflowState: 'EDIT_FORM',
       activePatientUuid: 'patient-a',
@@ -217,7 +218,7 @@ describe('GroupFormWorkflowReducer', () => {
   });
 
   it('submits for next and advances to the requested patient after saving', () => {
-    const dispatchEventSpy = jest.spyOn(window, 'dispatchEvent');
+    const dispatchEventSpy = vi.spyOn(window, 'dispatchEvent');
     const state = buildState(
       {
         workflowState: 'EDIT_FORM',

package/src/form-entry-workflow/patient-banner/PatientBanner.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it } from 'vitest';
 import { render } from '@testing-library/react';
 import PatientBanner from './PatientBanner';
 

package/src/form-entry-workflow/patient-search-header/PatientSearchHeader.test.tsx

@@ -1,25 +1,25 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach, afterEach, type MockedFunction } from 'vitest';
 import { render, screen, fireEvent, cleanup, waitFor } from '@testing-library/react';
-import '@testing-library/jest-dom';
 import PatientSearchHeader from './PatientSearchHeader';
 import FormWorkflowContext from '../../context/FormWorkflowContext';
 import { showSnackbar, useConfig, useSession, type ConfigSchema, type Session } from '@openmrs/esm-framework';
 import { useHsuIdIdentifier } from '../../hooks/location-tag.resource';
 
-jest.mock('@openmrs/esm-framework', () => ({
+vi.mock('@openmrs/esm-framework', () => ({
   ExtensionSlot: ({ state }) => (
     <button data-testid="mock-search-select" onClick={() => state.selectPatientAction('patient-123')}>
       Select Patient
     </button>
   ),
-  interpolateUrl: jest.fn((url) => url),
-  navigate: jest.fn(),
-  showSnackbar: jest.fn(),
-  useConfig: jest.fn(),
-  useSession: jest.fn(),
+  interpolateUrl: vi.fn((url) => url),
+  navigate: vi.fn(),
+  showSnackbar: vi.fn(),
+  useConfig: vi.fn(),
+  useSession: vi.fn(),
 }));
 
-jest.mock('react-i18next', () => ({
+vi.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string, defaultValue: string, interpolation: { hsuLocation?: string; sessionLocation?: string }) => {
       if (interpolation?.hsuLocation) {
@@ -30,22 +30,22 @@ jest.mock('react-i18next', () => ({
   }),
 }));
 
-jest.mock('../../hooks/location-tag.resource', () => ({
-  useHsuIdIdentifier: jest.fn(),
+vi.mock('../../hooks/location-tag.resource', () => ({
+  useHsuIdIdentifier: vi.fn(),
 }));
 
-jest.mock('react-router-dom', () => ({
+vi.mock('react-router-dom', () => ({
   Link: ({ children }) => <div>{children}</div>,
 }));
 
-const mockShowSnackbar = showSnackbar as jest.MockedFunction<typeof showSnackbar>;
-const mockUseConfig = useConfig as jest.MockedFunction<typeof useConfig>;
-const mockUseSession = useSession as jest.MockedFunction<typeof useSession>;
-const mockUseHsuIdIdentifier = useHsuIdIdentifier as jest.MockedFunction<typeof useHsuIdIdentifier>;
+const mockShowSnackbar = showSnackbar as MockedFunction<typeof showSnackbar>;
+const mockUseConfig = useConfig as MockedFunction<typeof useConfig>;
+const mockUseSession = useSession as MockedFunction<typeof useSession>;
+const mockUseHsuIdIdentifier = useHsuIdIdentifier as MockedFunction<typeof useHsuIdIdentifier>;
 
 describe('PatientSearchHeader - Enforcement Feature', () => {
   const mockContext = {
-    addPatient: jest.fn(),
+    addPatient: vi.fn(),
     workflowState: 'NEW_PATIENT',
     activeFormUuid: 'form-123',
   };
@@ -60,7 +60,7 @@ describe('PatientSearchHeader - Enforcement Feature', () => {
   });
 
   afterEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
     cleanup();
   });
 

package/src/group-form-entry-workflow/GroupSessionWorkspace.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach, type Mock } from 'vitest';
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { getGlobalStore, useConfig, useSession, useStore } from '@openmrs/esm-framework';
@@ -6,23 +7,23 @@ import FormBootstrap from '../FormBootstrap';
 import GroupFormWorkflowContext from '../context/GroupFormWorkflowContext';
 import GroupSessionWorkspace from './GroupSessionWorkspace';
 
-jest.mock('@openmrs/esm-framework', () => ({
-  getGlobalStore: jest.fn(),
-  useConfig: jest.fn(),
-  useSession: jest.fn(),
-  useStore: jest.fn(),
+vi.mock('@openmrs/esm-framework', () => ({
+  getGlobalStore: vi.fn(),
+  useConfig: vi.fn(),
+  useSession: vi.fn(),
+  useStore: vi.fn(),
 }));
 
-jest.mock('uuid', () => ({
-  v4: jest.fn(() => 'generated-visit-uuid'),
+vi.mock('uuid', () => ({
+  v4: vi.fn(() => 'generated-visit-uuid'),
 }));
 
-jest.mock('../FormBootstrap', () => ({
+vi.mock('../FormBootstrap', () => ({
   __esModule: true,
-  default: jest.fn(() => <div data-testid="form-bootstrap" />),
+  default: vi.fn(() => <div data-testid="form-bootstrap" />),
 }));
 
-jest.mock('../patient-card/PatientCard', () => ({
+vi.mock('../patient-card/PatientCard', () => ({
   __esModule: true,
   default: ({ patientUuid, editEncounter }) => (
     <button data-testid={`patient-card-${patientUuid}`} onClick={() => editEncounter(patientUuid)}>
@@ -31,21 +32,21 @@ jest.mock('../patient-card/PatientCard', () => ({
   ),
 }));
 
-jest.mock('../CancelModal', () => ({
+vi.mock('../CancelModal', () => ({
   __esModule: true,
   default: () => null,
 }));
 
-jest.mock('../CompleteModal', () => ({
+vi.mock('../CompleteModal', () => ({
   __esModule: true,
   default: () => null,
 }));
 
-const mockGetGlobalStore = jest.mocked(getGlobalStore);
-const mockUseConfig = jest.mocked(useConfig);
-const mockUseSession = jest.mocked(useSession);
-const mockUseStore = jest.mocked(useStore);
-const mockFormBootstrap = FormBootstrap as jest.Mock;
+const mockGetGlobalStore = vi.mocked(getGlobalStore);
+const mockUseConfig = vi.mocked(useConfig);
+const mockUseSession = vi.mocked(useSession);
+const mockUseStore = vi.mocked(useStore);
+const mockFormBootstrap = FormBootstrap as Mock;
 
 const renderWorkspace = (contextOverrides = {}) => {
   const defaultContext = {
@@ -66,9 +67,9 @@ const renderWorkspace = (contextOverrides = {}) => {
     },
     groupVisitTypeUuid: 'visit-type-1',
     encounters: {},
-    saveEncounter: jest.fn(),
-    updateVisitUuid: jest.fn(),
-    submitForNext: jest.fn(),
+    saveEncounter: vi.fn(),
+    updateVisitUuid: vi.fn(),
+    submitForNext: vi.fn(),
   };
 
   return render(
@@ -104,7 +105,7 @@ describe('GroupSessionWorkspace', () => {
   });
 
   it('builds encounter payloads with group-session metadata when no visit exists yet', () => {
-    const updateVisitUuid = jest.fn();
+    const updateVisitUuid = vi.fn();
     renderWorkspace({ updateVisitUuid });
 
     const [formBootstrapProps] = mockFormBootstrap.mock.calls[0];
@@ -169,8 +170,8 @@ describe('GroupSessionWorkspace', () => {
 
   it('wires patient switching and save actions through the workflow callbacks', async () => {
     const user = userEvent.setup();
-    const saveEncounter = jest.fn();
-    const submitForNext = jest.fn();
+    const saveEncounter = vi.fn();
+    const submitForNext = vi.fn();
     renderWorkspace({ saveEncounter, submitForNext });
 
     const [formBootstrapProps] = mockFormBootstrap.mock.calls[0];

package/src/group-form-entry-workflow/SessionMetaWorkspace.test.tsx

@@ -1,16 +1,17 @@
 import React, { useEffect } from 'react';
+import { vi, describe, it, expect } from 'vitest';
 import { render, screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { useFormContext } from 'react-hook-form';
 import GroupFormWorkflowContext from '../context/GroupFormWorkflowContext';
 import SessionMetaWorkspace from './SessionMetaWorkspace';
 
-jest.mock('../CancelModal', () => ({
+vi.mock('../CancelModal', () => ({
   __esModule: true,
   default: () => null,
 }));
 
-jest.mock('./SessionDetailsForm', () => ({
+vi.mock('./SessionDetailsForm', () => ({
   __esModule: true,
   default: function MockSessionDetailsForm() {
     const { register, setValue } = useFormContext();
@@ -40,7 +41,7 @@ const renderSessionMetaWorkspace = (contextOverrides = {}) =>
           workflowState: 'NEW_GROUP_SESSION',
           patientUuids: ['patient-a'],
           activeGroupUuid: 'group-1',
-          setSessionMeta: jest.fn(),
+          setSessionMeta: vi.fn(),
           ...contextOverrides,
         } as never
       }
@@ -52,7 +53,7 @@ const renderSessionMetaWorkspace = (contextOverrides = {}) =>
 describe('SessionMetaWorkspace', () => {
   it('submits the session metadata with the normalized session date', async () => {
     const user = userEvent.setup();
-    const setSessionMeta = jest.fn();
+    const setSessionMeta = vi.fn();
     renderSessionMetaWorkspace({ setSessionMeta });
 
     await user.click(screen.getByRole('button', { name: 'Create New Session' }));
@@ -72,7 +73,7 @@ describe('SessionMetaWorkspace', () => {
 
   it('shows the group selection error when submitted without a chosen group', async () => {
     const user = userEvent.setup();
-    const setSessionMeta = jest.fn();
+    const setSessionMeta = vi.fn();
     renderSessionMetaWorkspace({
       activeGroupUuid: null,
       setSessionMeta,

package/src/group-form-entry-workflow/group-display-header/GroupDisplayHeader.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it } from 'vitest';
 import { render } from '@testing-library/react';
 import GroupDisplayHeader from './GroupDisplayHeader';
 

package/src/group-form-entry-workflow/group-search-header/GroupSearchHeader.test.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach } from 'vitest';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import { showSnackbar, useConfig, useSession } from '@openmrs/esm-framework';
@@ -7,7 +8,7 @@ import GroupSearchHeader from './GroupSearchHeader';
 
 let selectedGroup;
 
-jest.mock('../group-search/CompactGroupSearch', () => ({
+vi.mock('../group-search/CompactGroupSearch', () => ({
   __esModule: true,
   default: ({ selectGroupAction }) => (
     <button data-testid="compact-group-search" onClick={() => selectGroupAction(selectedGroup)}>
@@ -16,14 +17,14 @@ jest.mock('../group-search/CompactGroupSearch', () => ({
   ),
 }));
 
-jest.mock('../../add-group-modal/AddGroupModal', () => ({
+vi.mock('../../add-group-modal/AddGroupModal', () => ({
   __esModule: true,
   default: ({ isOpen }) => (isOpen ? <div data-testid="add-group-modal" /> : null),
 }));
 
-const mockShowSnackbar = jest.mocked(showSnackbar);
-const mockUseConfig = jest.mocked(useConfig);
-const mockUseSession = jest.mocked(useSession);
+const mockShowSnackbar = vi.mocked(showSnackbar);
+const mockUseConfig = vi.mocked(useConfig);
+const mockUseSession = vi.mocked(useSession);
 
 const renderGroupSearchHeader = (contextOverrides = {}) =>
   render(
@@ -31,8 +32,8 @@ const renderGroupSearchHeader = (contextOverrides = {}) =>
       value={
         {
           activeGroupUuid: null,
-          setGroup: jest.fn(),
-          destroySession: jest.fn(),
+          setGroup: vi.fn(),
+          destroySession: vi.fn(),
           ...contextOverrides,
         } as never
       }
@@ -56,7 +57,7 @@ describe('GroupSearchHeader', () => {
 
   it('blocks group selection when location enforcement is enabled and locations mismatch', async () => {
     const user = userEvent.setup();
-    const setGroup = jest.fn();
+    const setGroup = vi.fn();
     selectedGroup = {
       uuid: 'group-1',
       location: {
@@ -81,7 +82,7 @@ describe('GroupSearchHeader', () => {
 
   it('sorts cohort members by display name before storing the selected group', async () => {
     const user = userEvent.setup();
-    const setGroup = jest.fn();
+    const setGroup = vi.fn();
     selectedGroup = {
       uuid: 'group-1',
       location: {
@@ -109,7 +110,7 @@ describe('GroupSearchHeader', () => {
 
   it('opens the add-group modal and lets the user cancel the session', async () => {
     const user = userEvent.setup();
-    const destroySession = jest.fn();
+    const destroySession = vi.fn();
     renderGroupSearchHeader({ destroySession });
 
     await user.click(screen.getByRole('button', { name: 'Create New Group' }));

package/src/hooks/useGetPatient.test.tsx

@@ -1,10 +1,11 @@
 import React from 'react';
+import { vi, describe, it, expect, beforeEach, type MockedFunction } from 'vitest';
 import { act, render, screen } from '@testing-library/react';
 import { fetchCurrentPatient } from '@openmrs/esm-framework';
 import useGetPatient from './useGetPatient';
 
-jest.mock('@openmrs/esm-framework', () => ({
-  fetchCurrentPatient: jest.fn(),
+vi.mock('@openmrs/esm-framework', () => ({
+  fetchCurrentPatient: vi.fn(),
 }));
 
 type Deferred<T> = {
@@ -24,7 +25,7 @@ const createDeferred = <T,>(): Deferred<T> => {
   };
 };
 
-const mockFetchCurrentPatient = fetchCurrentPatient as jest.MockedFunction<typeof fetchCurrentPatient>;
+const mockFetchCurrentPatient = fetchCurrentPatient as MockedFunction<typeof fetchCurrentPatient>;
 
 const TestHarness = ({ patientUuid }: { patientUuid?: string }) => {
   const patient = useGetPatient(patientUuid);
@@ -35,7 +36,7 @@ const TestHarness = ({ patientUuid }: { patientUuid?: string }) => {
 
 describe('useGetPatient', () => {
   beforeEach(() => {
-    jest.clearAllMocks();
+    vi.clearAllMocks();
   });
 
   it('ignores stale responses after patientUuid changes', async () => {

package/src/setup-tests.ts

@@ -1 +1,5 @@
-import '@testing-library/jest-dom/extend-expect';
+import '@testing-library/jest-dom/vitest';
+import { afterEach } from 'vitest';
+import { cleanup } from '@testing-library/react';
+
+afterEach(cleanup);