@openmrs/esm-form-engine-lib 3.1.4-pre.1779 → 3.1.4-pre.1783

package/src/components/inputs/ui-select-extended/ui-select-extended.test.tsx

@@ -1,18 +1,17 @@
 import React from 'react';
+import userEvent from '@testing-library/user-event';
 import { act, render, screen } from '@testing-library/react';
-import { type FormSchema, type SessionMode, type OpenmrsEncounter } from '../../../types';
 import { usePatient, useSession } from '@openmrs/esm-framework';
-import { mockPatient } from '../../../../__mocks__/patient.mock';
-import { mockSessionDataResponse } from '../../../../__mocks__/session.mock';
-import { FormEngine } from '../../..';
-import uiSelectExtForm from '../../../../__mocks__/forms/rfe-forms/sample_ui-select-ext.json';
-import { assertFormHasAllFields, findSelectInput } from '../../../utils/test-utils';
-import userEvent from '@testing-library/user-event';
 import * as api from '../../../api';
+import { type FormSchema, type SessionMode, type OpenmrsEncounter } from '../../../types';
+import { assertFormHasAllFields, findSelectInput } from '../../../utils/test-utils';
+import { mockPatient } from '__mocks__/patient.mock';
+import { mockSessionDataResponse } from '__mocks__/session.mock';
+import { uiSelectExtForm } from '__mocks__/forms';
+import FormEngine from '../../../form-engine.component';
 
 const mockUsePatient = jest.mocked(usePatient);
 const mockUseSession = jest.mocked(useSession);
-global.ResizeObserver = require('resize-observer-polyfill');
 
 jest.mock('lodash-es/debounce', () => jest.fn((fn) => fn));
 
@@ -145,15 +144,6 @@ describe('UiSelectExtended', () => {
   const user = userEvent.setup();
 
   beforeEach(() => {
-    Object.defineProperty(window, 'i18next', {
-      writable: true,
-      configurable: true,
-      value: {
-        language: 'en',
-        t: jest.fn(),
-      },
-    });
-
     mockUsePatient.mockImplementation(() => ({
       patient: mockPatient,
       isLoading: false,
@@ -257,18 +247,18 @@ describe('UiSelectExtended', () => {
         renderForm();
       });
 
-      const transferLocationSelect = await findSelectInput(screen, 'Transfer Location');    
+      const transferLocationSelect = await findSelectInput(screen, 'Transfer Location');
       // Open the dropdown
       await user.click(transferLocationSelect);
-    
+
       // Verify all items are displayed initially
       expect(screen.getByText('Kololo')).toBeInTheDocument();
       expect(screen.getByText('Naguru')).toBeInTheDocument();
       expect(screen.getByText('Muyenga')).toBeInTheDocument();
-    
+
       // Type input
       await user.type(transferLocationSelect, 'Nag');
-    
+
       // Verify all items are still displayed
       expect(screen.getByText('Kololo')).toBeInTheDocument();
       expect(screen.getByText('Naguru')).toBeInTheDocument();

package/src/components/inputs/unspecified/unspecified.test.tsx

@@ -1,20 +1,18 @@
 import React from 'react';
+import userEvent from '@testing-library/user-event';
 import { act, render, screen } from '@testing-library/react';
 import { usePatient, useSession } from '@openmrs/esm-framework';
+import * as api from '../../../api';
 import { type FormSchema, type SessionMode } from '../../../types';
 import { findNumberInput } from '../../../utils/test-utils';
-import unspecifiedForm from '../../../../__mocks__/forms/rfe-forms/sample_unspecified-form.json';
-import { FormEngine } from '../../..';
-import { mockPatient } from '../../../../__mocks__/patient.mock';
-import { mockSessionDataResponse } from '../../../../__mocks__/session.mock';
-import userEvent from '@testing-library/user-event';
-import * as api from '../../../api';
+import { unspecifiedForm } from '__mocks__/forms';
+import { mockPatient } from '__mocks__/patient.mock';
+import { mockSessionDataResponse } from '__mocks__/session.mock';
+import FormEngine from '../../../form-engine.component';
 
 const mockUsePatient = jest.mocked(usePatient);
 const mockUseSession = jest.mocked(useSession);
 
-global.ResizeObserver = require('resize-observer-polyfill');
-
 jest.mock('../../../api', () => {
   const originalModule = jest.requireActual('../../../api');
   return {
@@ -75,15 +73,6 @@ describe('Unspecified', () => {
   const user = userEvent.setup();
 
   beforeEach(() => {
-    Object.defineProperty(window, 'i18next', {
-      writable: true,
-      configurable: true,
-      value: {
-        language: 'en',
-        t: jest.fn(),
-      },
-    });
-
     mockUsePatient.mockImplementation(() => ({
       patient: mockPatient,
       isLoading: false,

package/src/components/label/label.component.tsx

@@ -10,7 +10,7 @@ type LabelProps = {
 const LabelField: React.FC<LabelProps> = ({ value, tooltipText }) => {
   return (
     <div className={styles.label}>
-      <DefinitionTooltip direction="bottom" tabIndex={0} definition={tooltipText}>
+      <DefinitionTooltip direction="bottom" tabIndex={0} definition={tooltipText ?? ''}>
         <span className="cds--label">{`${value}:`}</span>
       </DefinitionTooltip>
     </div>

package/src/components/renderer/field/fieldLogic.test.ts

@@ -1,5 +1,5 @@
 import { handleFieldLogic, validateFieldValue } from './fieldLogic';
-import { evaluateAsyncExpression, evaluateExpression } from '../../../utils/expression-runner';
+import { evaluateExpression } from '../../../utils/expression-runner';
 import { type FormField } from '../../../types';
 import { type FormContextProps } from '../../../provider/form-provider';
 
@@ -25,7 +25,7 @@ describe('handleFieldLogic', () => {
       formFieldAdapters: {
         obs: {
           transformFieldValue: jest.fn(),
-        }
+        },
       },
       formJson: { pages: [] },
       updateFormField: jest.fn(),
@@ -112,9 +112,7 @@ describe('validateFieldValue', () => {
 
     mockValidators = {
       required: {
-        validate: jest.fn().mockReturnValue([
-          { resultType: 'error', message: 'Field is required' },
-        ]),
+        validate: jest.fn().mockReturnValue([{ resultType: 'error', message: 'Field is required' }]),
       },
     };
 
@@ -131,11 +129,7 @@ describe('validateFieldValue', () => {
   it('should validate field value and return errors and warnings', () => {
     const result = validateFieldValue(mockField, '', mockValidators, mockContext);
 
-    expect(mockValidators.required.validate).toHaveBeenCalledWith(
-      mockField,
-      '',
-      expect.objectContaining(mockContext),
-    );
+    expect(mockValidators.required.validate).toHaveBeenCalledWith(mockField, '', expect.objectContaining(mockContext));
     expect(result.errors).toEqual([{ resultType: 'error', message: 'Field is required' }]);
     expect(result.warnings).toEqual([]);
   });

package/src/components/renderer/field/form-field-renderer.component.tsx

@@ -1,4 +1,8 @@
 import React, { useEffect, useMemo, useState } from 'react';
+import { ToastNotification } from '@carbon/react';
+import { Controller, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+import { ErrorBoundary } from 'react-error-boundary';
 import {
   type FormField,
   type FormFieldInputProps,
@@ -7,19 +11,15 @@ import {
   type ValidationResult,
   type ValueAndDisplay,
 } from '../../../types';
-import { Controller, useWatch } from 'react-hook-form';
-import { ToastNotification } from '@carbon/react';
-import { useTranslation } from 'react-i18next';
-import { ErrorBoundary } from 'react-error-boundary';
+import { getFieldControlWithFallback, getRegisteredControl } from '../../../registry/registry';
+import { handleFieldLogic, validateFieldValue } from './fieldLogic';
 import { hasRendering } from '../../../utils/common-utils';
-import { useFormProviderContext } from '../../../provider/form-provider';
 import { isEmpty } from '../../../validators/form-validator';
-import PreviousValueReview from '../../previous-value-review/previous-value-review.component';
-import { getFieldControlWithFallback, getRegisteredControl } from '../../../registry/registry';
-import styles from './form-field-renderer.scss';
 import { isTrue } from '../../../utils/boolean-utils';
+import { useFormProviderContext } from '../../../provider/form-provider';
+import PreviousValueReview from '../../previous-value-review/previous-value-review.component';
 import UnspecifiedField from '../../inputs/unspecified/unspecified.component';
-import { handleFieldLogic, validateFieldValue } from './fieldLogic';
+import styles from './form-field-renderer.scss';
 
 export interface FormFieldRendererProps {
   fieldId: string;

package/src/components/sidebar/useCurrentActivePage.test.ts

@@ -22,7 +22,6 @@ describe('useCurrentActivePage', () => {
   ] as Array<FormPage>;
 
   beforeEach(() => {
-    jest.clearAllMocks();
     jest.useFakeTimers();
   });
 

package/src/form-engine.test.tsx

@@ -14,49 +14,46 @@ import { when } from 'jest-when';
 import * as api from './api';
 import { assertFormHasAllFields, findCheckboxGroup, findSelectInput, findTextOrDateInput } from './utils/test-utils';
 import { evaluatePostSubmissionExpression } from './utils/post-submission-action-helper';
-import { mockPatient } from '__mocks__/patient.mock';
-import { mockSessionDataResponse } from '__mocks__/session.mock';
-import { mockVisit } from '__mocks__/visit.mock';
-import demoHtsForm from '__mocks__/forms/rfe-forms/demo_hts-form.json';
-import demoHtsOpenmrsForm from '__mocks__/forms/afe-forms/demo_hts-form.json';
-import filterAnswerOptionsTestForm from '__mocks__/forms/rfe-forms/filter-answer-options-test-form.json';
-import htsPocForm from '__mocks__/packages/hiv/forms/hts_poc/1.1.json';
-import labourAndDeliveryTestForm from '__mocks__/forms/rfe-forms/labour_and_delivery_test_form.json';
-import mockConceptsForm from '__mocks__/concepts.mock.json';
-import obsGroupTestForm from '__mocks__/forms/rfe-forms/obs-group-test_form.json';
-import postSubmissionTestForm from '__mocks__/forms/rfe-forms/post-submission-test-form.json';
-import referenceByMappingForm from '__mocks__/forms/rfe-forms/reference-by-mapping-form.json';
-import sampleFieldsForm from '__mocks__/forms/rfe-forms/sample_fields.json';
-import testEnrolmentForm from '__mocks__/forms/rfe-forms/test-enrolment-form.json';
-import historicalExpressionsForm from '__mocks__/forms/rfe-forms/historical-expressions-form.json';
-import mockHxpEncounter from '__mocks__/forms/rfe-forms/mockHistoricalvisitsEncounter.json';
-import mockSaveEncounter from '__mocks__/forms/rfe-forms/mockSaveEncounter.json';
-import requiredTestForm from '__mocks__/forms/rfe-forms/required-form.json';
-import conditionalRequiredTestForm from '__mocks__/forms/rfe-forms/conditional-required-form.json';
-import conditionalAnsweredForm from '__mocks__/forms/rfe-forms/conditional-answered-form.json';
-import ageValidationForm from '__mocks__/forms/rfe-forms/age-validation-form.json';
-import bmiForm from '__mocks__/forms/rfe-forms/bmi-test-form.json';
-import bsaForm from '__mocks__/forms/rfe-forms/bsa-test-form.json';
-import eddForm from '__mocks__/forms/rfe-forms/edd-test-form.json';
-import externalDataSourceForm from '__mocks__/forms/rfe-forms/external_data_source_form.json';
-import monthsOnArtForm from '__mocks__/forms/rfe-forms/months-on-art-form.json';
-import nextVisitForm from '__mocks__/forms/rfe-forms/next-visit-test-form.json';
-import viralLoadStatusForm from '__mocks__/forms/rfe-forms/viral-load-status-form.json';
-import readOnlyValidationForm from '__mocks__/forms/rfe-forms/read-only-validation-form.json';
-import jsExpressionValidationForm from '__mocks__/forms/rfe-forms/js-expression-validation-form.json';
-import hidePagesAndSectionsForm from '__mocks__/forms/rfe-forms/hide-pages-and-sections-form.json';
-import diagnosisForm from '__mocks__/forms/rfe-forms/diagnosis-test-form.json';
-import defaultValuesForm from '__mocks__/forms/rfe-forms/default-values-form.json';
-
-import FormEngine from './form-engine.component';
+import { mockConcepts, mockPatient, mockSessionDataResponse, mockVisit } from '__mocks__';
+import {
+  ageValidationForm,
+  bmiForm,
+  bsaForm,
+  conditionalAnsweredForm,
+  conditionalRequiredTestForm,
+  defaultValuesForm,
+  demoHtsForm,
+  demoHtsOpenmrsForm,
+  diagnosisForm,
+  eddForm,
+  externalDataSourceForm,
+  filterAnswerOptionsTestForm,
+  hidePagesAndSectionsForm,
+  historicalExpressionsForm,
+  htsPocForm,
+  jsExpressionValidationForm,
+  labourAndDeliveryTestForm,
+  mockHxpEncounter,
+  mockSaveEncounter,
+  monthsOnArtForm,
+  nextVisitForm,
+  obsGroupTestForm,
+  postSubmissionTestForm,
+  readOnlyValidationForm,
+  referenceByMappingForm,
+  requiredTestForm,
+  sampleFieldsForm,
+  testEnrolmentForm,
+  viralLoadStatusForm,
+} from '__mocks__/forms';
 import { type FormSchema, type OpenmrsEncounter, type SessionMode } from './types';
 import { useEncounter } from './hooks/useEncounter';
+import FormEngine from './form-engine.component';
 
 const patientUUID = '8673ee4f-e2ab-4077-ba55-4980f408773e';
 const visit = mockVisit;
 const formsResourcePath = when((url: string) => url.includes(`${restBaseUrl}/form/`));
 const clobDataResourcePath = when((url: string) => url.includes(`${restBaseUrl}/clobdata/`));
-global.ResizeObserver = require('resize-observer-polyfill');
 
 const mockOpenmrsFetch = jest.mocked(openmrsFetch);
 const mockExtensionSlot = jest.mocked(ExtensionSlot);
@@ -152,7 +149,7 @@ jest.mock('./hooks/useConcepts', () => ({
     if ([...references].join(',').includes('PIH:Occurrence of trauma,PIH:Yes,PIH:No,PIH:COUGH')) {
       return {
         isLoading: false,
-        concepts: mockConceptsForm.results,
+        concepts: mockConcepts.results,
         error: undefined,
       };
     }
@@ -178,15 +175,6 @@ describe('Form engine component', () => {
   const user = userEvent.setup();
 
   beforeEach(() => {
-    Object.defineProperty(window, 'i18next', {
-      writable: true,
-      configurable: true,
-      value: {
-        language: 'en',
-        t: jest.fn(),
-      },
-    });
-
     mockExtensionSlot.mockImplementation((ext) => <>{ext.name}</>);
     mockUsePatient.mockImplementation(() => ({
       patient: mockPatient,

package/src/hooks/useFormJson.test.tsx

@@ -2,18 +2,20 @@ import { act, renderHook } from '@testing-library/react';
 import { openmrsFetch } from '@openmrs/esm-framework';
 import { when } from 'jest-when';
 import { useFormJson } from './useFormJson';
-import artComponentBody from '__mocks__/forms/rfe-forms/component_art.json';
-import artComponentSkeleton from '__mocks__/forms/afe-forms/component_art.json';
-import formComponentBody from '__mocks__/forms/rfe-forms/form-component.json';
-import formComponentSkeleton from '__mocks__/forms/afe-forms/form-component.json';
-import miniFormBody from '__mocks__/forms/rfe-forms/mini-form.json';
-import miniFormSkeleton from '__mocks__/forms/afe-forms/mini-form.json';
-import nestedForm1Body from '__mocks__/forms/rfe-forms/nested-form1.json';
-import nestedForm1Skeleton from '__mocks__/forms/afe-forms/nested-form1.json';
-import nestedForm2Body from '__mocks__/forms/rfe-forms/nested-form2.json';
-import nestedForm2Skeleton from '__mocks__/forms/afe-forms/nested-form2.json';
-import preclinicReviewComponentBody from '__mocks__/forms/rfe-forms/component_preclinic-review.json';
-import preclinicReviewComponentSkeleton from '__mocks__/forms/afe-forms/component_preclinic-review.json';
+import {
+  artComponentBody,
+  artComponentSkeleton,
+  formComponentBody,
+  formComponentSkeleton,
+  miniFormBody,
+  miniFormSkeleton,
+  nestedForm1Body,
+  nestedForm1Skeleton,
+  nestedForm2Body,
+  nestedForm2Skeleton,
+  preclinicReviewComponentBody,
+  preclinicReviewComponentSkeleton,
+} from '__mocks__/forms';
 
 const MINI_FORM_NAME = 'Mini Form';
 const MINI_FORM_UUID = '112d73b4-79e5-4be8-b9ae-d0840f00d4cf';
@@ -161,7 +163,7 @@ describe('useFormJson', () => {
   });
 
   it('should return an error when the form is not found', async () => {
-    // setup and execute
+    const mockConsoleError = jest.spyOn(console, 'error').mockImplementation(() => {});
     let hook = null;
     await act(async () => {
       hook = renderHook(() => useFormJson(NON_EXISTENT_FORM_NAME, null, null, null));
@@ -172,6 +174,7 @@ describe('useFormJson', () => {
       'Error loading form JSON: Form with ID "non-existent-form" was not found',
     );
     expect(hook.result.current.formJson).toBe(null);
+    mockConsoleError.mockRestore();
   });
 });
 

package/src/hooks/useFormWorkspaceSize.test.ts

@@ -1,28 +1,17 @@
+import { act } from 'react';
 import { renderHook } from '@testing-library/react';
 import { useFormWorkspaceSize } from './useFormWorkspaceSize';
-import { act } from 'react';
 
 // Mock the pxToRem utility
 jest.mock('../utils/common-utils', () => ({
   pxToRem: (px: number) => px / 16, // Simulate px to rem conversion (1rem = 16px)
 }));
 
-// Mock ResizeObserver with callback ref
-let resizeCallback: (entries: any[]) => void;
-class ResizeObserverMock {
-  constructor(callback: (entries: any[]) => void) {
-    resizeCallback = callback;
-  }
-  observe = jest.fn();
-  unobserve = jest.fn();
-  disconnect = jest.fn();
-}
-
-global.ResizeObserver = ResizeObserverMock as any;
-
 describe('useFormWorkspaceSize', () => {
   let ref: { current: HTMLDivElement | null };
   let parentElement: HTMLDivElement;
+  let resizeCallback: ResizeObserverCallback | null;
+  let originalResizeObserver: typeof global.ResizeObserver;
 
   beforeEach(() => {
     // Create DOM elements
@@ -37,10 +26,26 @@ describe('useFormWorkspaceSize', () => {
       configurable: true,
       value: 400,
     });
+
+    // Store original ResizeObserver
+    originalResizeObserver = global.ResizeObserver;
+    resizeCallback = null;
+
+    // Store the ResizeObserver callback
+    global.ResizeObserver = class MockResizeObserver implements ResizeObserver {
+      constructor(callback: ResizeObserverCallback) {
+        resizeCallback = callback;
+      }
+      observe() {}
+      unobserve() {}
+      disconnect() {}
+    };
   });
 
   afterEach(() => {
-    jest.clearAllMocks();
+    // Restore original ResizeObserver
+    global.ResizeObserver = originalResizeObserver;
+    resizeCallback = null;
   });
 
   const setParentWidth = (width: number) => {
@@ -48,12 +53,28 @@ describe('useFormWorkspaceSize', () => {
       configurable: true,
       value: width,
     });
-    if (typeof resizeCallback !== 'function') {
-      return;
-    }
     // Trigger resize callback
     act(() => {
-      resizeCallback([{ target: parentElement }]);
+      if (resizeCallback) {
+        const entry: ResizeObserverEntry = {
+          target: parentElement,
+          borderBoxSize: [{ blockSize: 0, inlineSize: width }],
+          contentBoxSize: [{ blockSize: 0, inlineSize: width }],
+          contentRect: {
+            width,
+            height: 0,
+            x: 0,
+            y: 0,
+            top: 0,
+            right: width,
+            bottom: 0,
+            left: 0,
+            toJSON: () => ({}),
+          },
+          devicePixelContentBoxSize: [{ blockSize: 0, inlineSize: width }],
+        };
+        resizeCallback([entry], {} as ResizeObserver);
+      }
     });
   };
 

package/src/hooks/useInitialValues.test.ts

@@ -1,7 +1,6 @@
 import { act, renderHook, waitFor } from '@testing-library/react';
-
-import useInitialValues from './useInitialValues';
 import { type FormField } from '../types';
+import useInitialValues from './useInitialValues';
 
 export const mockFormFields: FormField[] = [
   {
@@ -51,6 +50,7 @@ describe('useInitialValues', () => {
   });
 
   it('should set error if getInitialValues rejects', async () => {
+    const mockConsole = jest.spyOn(console, 'error').mockImplementation(() => {});
     const mockError = new Error('Failed to fetch initial values');
     formProcessor.getInitialValues.mockRejectedValue(mockError);
 
@@ -58,6 +58,7 @@ describe('useInitialValues', () => {
 
     expect(result.current.error).toEqual(mockError);
     expect(result.current.isLoadingInitialValues).toBe(false);
+    mockConsole.mockRestore();
   });
 
   it('should set initial values when dependencies are loaded', async () => {

package/src/hooks/usePostSubmissionActions.test.tsx

@@ -18,8 +18,6 @@ describe('usePostSubmissionActions', () => {
 
   // Set up the mock implementation for getRegisteredPostSubmissionAction
   beforeEach(() => {
-    jest.clearAllMocks();
-    jest.spyOn(global.console, 'error').mockImplementation(() => {});
     jest.requireMock('../registry/registry').getRegisteredPostSubmissionAction.mockImplementation((actionId) => {
       if (actionId === 'action1') {
         return Promise.resolve(mockPostAction);

package/src/setup-tests.ts

@@ -0,0 +1,35 @@
+import '@testing-library/jest-dom';
+import 'jest-when';
+
+global.ResizeObserver = require('resize-observer-polyfill');
+
+// https://github.com/jsdom/jsdom/issues/1695
+window.HTMLElement.prototype.scrollIntoView = function () {};
+
+Object.defineProperty(window, 'i18next', {
+  writable: true,
+  configurable: true,
+  value: {
+    language: 'en',
+    t: jest.fn(),
+  },
+});
+
+// Mock getComputedStyle for consistent font size
+Object.defineProperty(window, 'getComputedStyle', {
+  value: () => ({
+    fontSize: '16px',
+    getPropertyValue: () => '',
+  }),
+});
+
+// Mock window.getComputedStyle for elements
+Object.defineProperty(HTMLElement.prototype, 'style', {
+  configurable: true,
+  get() {
+    return {
+      getPropertyValue: () => '',
+      setProperty: () => {},
+    };
+  },
+});

package/src/transformers/default-schema-transformer.test.ts

@@ -1,6 +1,6 @@
 import { type FormSchema } from '../types';
 import { DefaultFormSchemaTransformer } from './default-schema-transformer';
-import testForm from '__mocks__/forms/afe-forms/test-schema-transformer-form.json';
+import { testForm } from '__mocks__/forms';
 
 const expectedTransformedSchema = {
   name: 'AFE form with aliased questions',

package/src/utils/common-utils.test.ts

@@ -1,19 +1,14 @@
 import {
-  flattenObsList,
-  hasRendering,
   clearSubmission,
+  flattenObsList,
   gracefullySetSubmission,
+  hasRendering,
   hasSubmission,
   parseToLocalDateTime,
 } from './common-utils';
 import { isEmpty } from '../validators/form-validator';
-import { type FormField, type OpenmrsObs } from '../types';
-import { obsList } from '__mocks__/forms/rfe-forms/obs-list-data';
-
-jest.mock('@openmrs/esm-framework', () => ({
-  formatDate: jest.fn(),
-  restBaseUrl: 'http://openmrs.com/rest',
-}));
+import { obsList } from '__mocks__/forms';
+import { type FormField } from '../types';
 
 jest.mock('../validators/form-validator', () => ({
   isEmpty: jest.fn(),

package/src/utils/common-utils.ts

@@ -59,9 +59,16 @@ export function isViewMode(sessionMode: string) {
 
 export function parseToLocalDateTime(dateString: string): Date {
   const dateObj = dayjs(dateString).toDate();
+  if (isNaN(dateObj.getTime())) {
+    return new Date(NaN);
+  }
+
   try {
-    const localTimeTokens = dateString.split('T')[1].split(':');
-    dateObj.setHours(parseInt(localTimeTokens[0]), parseInt(localTimeTokens[1]), 0);
+    const timePart = dateString.split('T')[1];
+    if (timePart) {
+      const localTimeTokens = timePart.split(':');
+      dateObj.setHours(parseInt(localTimeTokens[0]), parseInt(localTimeTokens[1]), 0);
+    }
   } catch (e) {
     console.error(e);
   }

package/src/utils/forms-loader.test.ts

@@ -5,7 +5,7 @@ import {
   htsRetrospectiveResultingSchemaV2,
   htsWildcardResultingSchemaV2,
   testSchemaV2,
-} from '__mocks__/forms/rfe-forms/forms-loader.test.schema';
+} from '__mocks__/forms';
 
 const htsTestForms: FormJsonFile[] = [
   {

package/src/zscore-tests/bmi-age.test.tsx

@@ -2,16 +2,11 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { act, render, screen } from '@testing-library/react';
 import { type FetchResponse, openmrsFetch, usePatient, useSession } from '@openmrs/esm-framework';
+import { mockSessionDataResponse, mockVisit } from '__mocks__';
 import { mockPatientAge8 } from '__mocks__/patient.mock';
-import { mockSessionDataResponse } from '__mocks__/session.mock';
-import { mockVisit } from '__mocks__/visit.mock';
-import bmiForAgeScoreTestSchema from '__mocks__/forms/rfe-forms/zscore-bmi-for-age-form.json';
-import demoHtsForm from '__mocks__/forms/rfe-forms/demo_hts-form.json';
-import demoHtsOpenmrsForm from '__mocks__/forms/afe-forms/demo_hts-form.json';
+import { demoHtsForm, bmiForAgeScoreTestSchema, demoHtsOpenmrsForm } from '__mocks__/forms';
 import FormEngine from '../form-engine.component';
 
-global.ResizeObserver = require('resize-observer-polyfill');
-
 const patientUUID = 'e13a8696-dc58-4b8c-ae40-2a1e7dd843e7';
 const visit = mockVisit;
 

package/src/zscore-tests/height-age.test.tsx

@@ -2,16 +2,11 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { render, screen, act } from '@testing-library/react';
 import { type FetchResponse, openmrsFetch, usePatient, useSession } from '@openmrs/esm-framework';
+import { mockSessionDataResponse, mockVisit } from '__mocks__';
 import { mockPatientAge8 } from '__mocks__/patient.mock';
-import { mockSessionDataResponse } from '__mocks__/session.mock';
-import { mockVisit } from '__mocks__/visit.mock';
-import demoHtsOpenmrsForm from '__mocks__/forms/afe-forms/demo_hts-form.json';
-import demoHtsForm from '__mocks__/forms/rfe-forms/demo_hts-form.json';
-import heightForAgeZscoreTestSchema from '__mocks__/forms/rfe-forms/zscore-height-for-age-form.json';
+import { demoHtsForm, demoHtsOpenmrsForm, heightForAgeZscoreTestSchema } from '__mocks__/forms';
 import FormEngine from '../form-engine.component';
 
-global.ResizeObserver = require('resize-observer-polyfill');
-
 const patientUUID = 'e13a8696-dc58-4b8c-ae40-2a1e7dd843e7';
 const visit = mockVisit;
 

package/src/zscore-tests/weight-height.test.tsx

@@ -2,16 +2,11 @@ import React from 'react';
 import userEvent from '@testing-library/user-event';
 import { act, render, screen } from '@testing-library/react';
 import { type FetchResponse, openmrsFetch, usePatient, useSession } from '@openmrs/esm-framework';
-import { mockVisit } from '__mocks__/visit.mock';
+import { mockSessionDataResponse, mockVisit } from '__mocks__';
 import { mockPatientAge4 } from '__mocks__/patient.mock';
-import { mockSessionDataResponse } from '__mocks__/session.mock';
-import demoHtsOpenmrsForm from '__mocks__/forms/afe-forms/demo_hts-form.json';
-import demoHtsForm from '__mocks__/forms/rfe-forms/demo_hts-form.json';
-import weightForHeightZscoreTestSchema from '__mocks__/forms/rfe-forms/zscore-weight-height-form.json';
+import { demoHtsForm, demoHtsOpenmrsForm, weightForHeightZscoreTestSchema } from '__mocks__/forms';
 import FormEngine from '../form-engine.component';
 
-global.ResizeObserver = require('resize-observer-polyfill');
-
 const patientUUID = '8673ee4f-e2ab-4077-ba55-4980f408773e';
 const visit = mockVisit;
 

package/src/setupTests.ts

@@ -1,5 +0,0 @@
-import '@testing-library/jest-dom';
-import 'jest-when';
-
-// https://github.com/jsdom/jsdom/issues/1695
-window.HTMLElement.prototype.scrollIntoView = function () {};