-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into CNFT1-2753-address-type-update
- Loading branch information
Showing
10 changed files
with
396 additions
and
44 deletions.
There are no files selected for viewing
23 changes: 12 additions & 11 deletions
23
apps/modernization-ui/src/apps/patient/add/extended/AddPatientExtendedForm.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 13 additions & 15 deletions
28
apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneAndEmailMultiEntry.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 5 additions & 7 deletions
12
apps/modernization-ui/src/apps/patient/add/extended/inputs/phone/PhoneEntryView.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
127 changes: 127 additions & 0 deletions
127
apps/modernization-ui/src/apps/patient/data/phoneEmail/PhoneEmailEntryFields.spec.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| import { fireEvent, render, waitFor, screen } from '@testing-library/react'; | ||
| import { renderHook } from '@testing-library/react-hooks'; | ||
| import { act } from 'react-dom/test-utils'; | ||
| import { FormProvider, useForm } from 'react-hook-form'; | ||
| import { PhoneEmailEntry } from '../entry'; | ||
| import { PhoneEmailEntryFields } from './PhoneEmailEntryFields'; | ||
| import userEvent from '@testing-library/user-event'; | ||
|
|
||
| const mockPatientPhoneCodedValues = { | ||
| types: [{ name: 'Phone', value: 'PH' }], | ||
| uses: [{ name: 'Home', value: 'H' }] | ||
| }; | ||
|
|
||
| jest.mock('apps/patient/profile/phoneEmail/usePatientPhoneCodedValues', () => ({ | ||
| usePatientPhoneCodedValues: () => mockPatientPhoneCodedValues | ||
| })); | ||
|
|
||
| const form = renderHook(() => | ||
| useForm<PhoneEmailEntry>({ | ||
| mode: 'onBlur', | ||
| defaultValues: { | ||
| asOf: undefined, | ||
| type: undefined, | ||
| use: undefined, | ||
| countryCode: '', | ||
| phoneNumber: '', | ||
| extension: '', | ||
| email: '', | ||
| url: '', | ||
| comment: '' | ||
| } | ||
| }) | ||
| ).result.current; | ||
|
|
||
| describe('PhoneEmailEntryFields', () => { | ||
| it('should render the proper labels', () => { | ||
| const { getByLabelText } = render( | ||
| <FormProvider {...form}> | ||
| <PhoneEmailEntryFields /> | ||
| </FormProvider> | ||
| ); | ||
|
|
||
| expect(getByLabelText('Phone & email as of')).toBeInTheDocument(); | ||
| expect(getByLabelText('Type')).toBeInTheDocument(); | ||
| expect(getByLabelText('Use')).toBeInTheDocument(); | ||
| expect(getByLabelText('Country code')).toBeInTheDocument(); | ||
| expect(getByLabelText('Phone number')).toBeInTheDocument(); | ||
| expect(getByLabelText('Extension')).toBeInTheDocument(); | ||
| expect(getByLabelText('Email')).toBeInTheDocument(); | ||
| expect(getByLabelText('Phone & email comments')).toBeInTheDocument(); | ||
| }); | ||
|
|
||
| it('should require type', async () => { | ||
| const { getByLabelText, getByText } = render( | ||
| <FormProvider {...form}> | ||
| <PhoneEmailEntryFields /> | ||
| </FormProvider> | ||
| ); | ||
|
|
||
| const typeInput = getByLabelText('Type'); | ||
| act(() => { | ||
| fireEvent.blur(typeInput); | ||
| }); | ||
| await waitFor(() => { | ||
| expect(getByText('Type is required.')).toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
||
| it('should require use', async () => { | ||
| const { getByLabelText, getByText } = render( | ||
| <FormProvider {...form}> | ||
| <PhoneEmailEntryFields /> | ||
| </FormProvider> | ||
| ); | ||
|
|
||
| const useInput = getByLabelText('Use'); | ||
| act(() => { | ||
| fireEvent.blur(useInput); | ||
| }); | ||
| await waitFor(() => { | ||
| expect(getByText('Use is required.')).toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
||
| it('should require as of', async () => { | ||
| const { getByLabelText, getByText } = render( | ||
| <FormProvider {...form}> | ||
| <PhoneEmailEntryFields /> | ||
| </FormProvider> | ||
| ); | ||
|
|
||
| const asOf = getByLabelText('Phone & email as of'); | ||
| act(() => { | ||
| fireEvent.blur(asOf); | ||
| }); | ||
| await waitFor(() => { | ||
| expect(getByText('As of date is required.')).toBeInTheDocument(); | ||
| }); | ||
| }); | ||
|
|
||
| it('should be valid with as of, type, and use', async () => { | ||
| const { getByLabelText } = render( | ||
| <FormProvider {...form}> | ||
| <PhoneEmailEntryFields /> | ||
| </FormProvider> | ||
| ); | ||
|
|
||
| const asOf = getByLabelText('Phone & email as of'); | ||
| const type = getByLabelText('Type'); | ||
| const use = getByLabelText('Use'); | ||
| await screen.findByText('Use'); | ||
| act(() => { | ||
| userEvent.paste(asOf, '01/20/2020'); | ||
| fireEvent.blur(asOf); | ||
| userEvent.selectOptions(use, 'H'); | ||
| fireEvent.blur(use); | ||
| userEvent.selectOptions(type, 'PH'); | ||
| fireEvent.blur(type); | ||
| }); | ||
|
|
||
| await waitFor(() => { | ||
| expect(form.getFieldState('asOf').invalid).toBeFalsy(); | ||
| expect(form.getFieldState('type').invalid).toBeFalsy(); | ||
| expect(form.getFieldState('use').invalid).toBeFalsy(); | ||
| }); | ||
| }); | ||
| }); |
Oops, something went wrong.