Datasets:

---

JetBrains-Research

/

commit-chronicle

like 8

Follow

JetBrains Research 63

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitTab.test.tsx", "new_path": "src/__tests__/patients/visits/VisitTab.test.tsx", "diff": "-import { screen, render } from '@testing-library/react'\n+import { screen, render, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -7,17 +8,32 @@ import createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\nimport VisitTab from '../../../patients/visits/VisitTab'\n+import PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\n+import Visit, { VisitStatus } from '../../../shared/model/Visit'\nimport { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Visit Tab', () => {\n+ const visit = {\n+ id: '456',\n+ startDateTime: new Date(2020, 6, 3).toISOString(),\n+ endDateTime: new Date(2020, 6, 5).toISOString(),\n+ type: 'standard type',\n+ status: VisitStatus.Arrived,\n+ reason: 'some reason',\n+ location: 'main building',\n+ } as Visit\n+\nconst patient = {\n- id: 'patientId',\n- }\n+ id: '123',\n+ visits: [visit],\n+ } as Patient\nconst setup = (route: string, permissions: Permissions[]) => {\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst store = mockStore({ user: { permissions } } as any)\nconst history = createMemoryHistory()\nhistory.push(route)\n@@ -35,62 +51,68 @@ describe('Visit Tab', () => {\n}\nit('should render an add visit button if user has correct permissions', () => {\n- setup('/patients/123/visits', [Permissions.AddVisit])\n+ setup(`/patients/${patient.id}/visits`, [Permissions.AddVisit])\n- // const addNewButton = wrapper.find(Button).at(0)\n- // expect(addNewButton).toHaveLength(1)\n- // expect(addNewButton.text().trim()).toEqual('patient.visits.new')\n+ expect(screen.queryByRole('button', { name: /patient.visits.new/i })).toBeInTheDocument()\n})\nit('should open the add visit modal on click', () => {\n- setup('/patients/123/visits', [Permissions.AddVisit])\n+ setup(`/patients/${patient.id}/visits`, [Permissions.AddVisit])\n- // act(() => {\n- // const addNewButton = wrapper.find(Button).at(0)\n- // const onClick = addNewButton.prop('onClick') as any\n- // onClick()\n- // })\n- // wrapper.update()\n+ const addNewButton = screen.getByRole('button', { name: /patient.visits.new/i })\n+ userEvent.click(addNewButton)\n- // const modal = wrapper.find(AddVisitModal)\n- // expect(modal.prop('show')).toBeTruthy()\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n+ expect(screen.getByRole('dialog').classList).toContain('show')\n})\n- it('should close the modal when the close button is clicked', () => {\n- setup('/patients/123/visits', [Permissions.AddVisit])\n+ it('should close the modal when the close button is clicked', async () => {\n+ setup(`/patients/${patient.id}/visits`, [Permissions.AddVisit])\n+\n+ const addNewButton = screen.getByRole('button', { name: /patient.visits.new/i })\n+ userEvent.click(addNewButton)\n- // act(() => {\n- // const addNewButton = wrapper.find(Button).at(0)\n- // const onClick = addNewButton.prop('onClick') as any\n- // onClick()\n- // })\n- // wrapper.update()\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n+ expect(screen.getByRole('dialog').classList).toContain('show')\n- // act(() => {\n- // const modal = wrapper.find(AddVisitModal)\n- // const onClose = modal.prop('onCloseButtonClick') as any\n- // onClose()\n- // })\n- // wrapper.update()\n+ const closeButton = screen.getByRole('button', { name: /close/i })\n- // expect(wrapper.find(AddVisitModal).prop('show')).toBeFalsy()\n+ userEvent.click(closeButton)\n+ expect(screen.getByRole('dialog').classList).not.toContain('show')\n})\nit('should not render visit button if user does not have permissions', () => {\n- setup('/patients/123/visits', [])\n+ setup(`/patients/${patient.id}/visits`, [])\n- // expect(wrapper.find(Button)).toHaveLength(0)\n+ expect(screen.queryByRole('button', { name: /patient.visits.new/i })).not.toBeInTheDocument()\n})\n- it('should render the visits table when on /patient/:id/visits', () => {\n- setup('/patients/123/visits', [Permissions.ReadVisits])\n+ it('should render the visits table when on /patient/:id/visits', async () => {\n+ setup(`/patients/${patient.id}/visits`, [Permissions.ReadVisits])\n- // expect(wrapper.find(VisitTable)).toHaveLength(1)\n+ await waitFor(() => {\n+ expect(screen.queryByRole('table')).toBeInTheDocument()\n})\n- it('should render the visit view when on /patient/:id/visits/:visitId', () => {\n- setup('/patients/123/visits/456', [Permissions.ReadVisits])\n+ expect(\n+ screen.getByRole('columnheader', { name: /patient.visits.startDateTime/i }),\n+ ).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /patient.visits.endDateTime/i }),\n+ ).toBeInTheDocument()\n+ expect(screen.getByRole('columnheader', { name: /patient.visits.type/i })).toBeInTheDocument()\n+ expect(screen.getByRole('columnheader', { name: /patient.visits.status/i })).toBeInTheDocument()\n+ expect(screen.getByRole('columnheader', { name: /patient.visits.reason/i })).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /patient.visits.location/i }),\n+ ).toBeInTheDocument()\n+ })\n+\n+ it('should render the visit view when on /patient/:id/visits/:visitId', async () => {\n+ setup(`/patients/${patient.id}/visits/${visit.id}`, [Permissions.ReadVisits])\n- // expect(wrapper.find(ViewVisit)).toHaveLength(1)\n+ await waitFor(() => {\n+ expect(screen.queryByRole('heading', { name: visit.reason })).toBeInTheDocument()\n+ })\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "-import { Modal } from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Router } from 'react-router-dom'\n+import selectEvent from 'react-select-event'\nimport AddCarePlanModal from '../../../patients/care-plans/AddCarePlanModal'\n-import CarePlanForm from '../../../patients/care-plans/CarePlanForm'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n-import CarePlan, { CarePlanIntent, CarePlanStatus } from '../../../shared/model/CarePlan'\n+import CarePlan from '../../../shared/model/CarePlan'\nimport Patient from '../../../shared/model/Patient'\ndescribe('Add Care Plan Modal', () => {\nconst patient = {\n- id: 'patientId',\n- diagnoses: [{ id: '123', name: 'some name', diagnosisDate: new Date().toISOString() }],\n- carePlans: [] as CarePlan[],\n+ id: '0012',\n+ diagnoses: [\n+ { id: '123', name: 'too skinny', diagnosisDate: new Date().toISOString() },\n+ { id: '456', name: 'headaches', diagnosisDate: new Date().toISOString() },\n+ ],\n+ carePlans: [{}] as CarePlan[],\n} as Patient\nconst onCloseSpy = jest.fn()\n@@ -23,93 +25,72 @@ describe('Add Care Plan Modal', () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'saveOrUpdate')\nconst history = createMemoryHistory()\n- const wrapper = mount(\n- <Router history={history}>\n- <AddCarePlanModal patient={patient} show onCloseButtonClick={onCloseSpy} />\n- </Router>,\n- )\n+ // eslint-disable-next-line react/prop-types\n+ const Wrapper: React.FC = ({ children }) => <Router history={history}>{children}</Router>\n- wrapper.update()\n- return { wrapper }\n+ const result = render(\n+ <AddCarePlanModal patient={patient} show onCloseButtonClick={onCloseSpy} />,\n+ { wrapper: Wrapper },\n+ )\n+ return result\n}\n- beforeEach(() => {\n- jest.resetAllMocks()\n- })\n-\nit('should render a modal', () => {\n- const { wrapper } = setup()\n-\n- const modal = wrapper.find(Modal)\n+ setup()\n+ const title = screen.getByText(/patient\\.carePlan\\.new/i, { selector: 'div' })\n+ expect(title).toBeInTheDocument()\n- expect(modal).toHaveLength(1)\n-\n- const successButton = modal.prop('successButton')\n- const cancelButton = modal.prop('closeButton')\n- expect(modal.prop('title')).toEqual('patient.carePlan.new')\n- expect(successButton?.children).toEqual('patient.carePlan.new')\n- expect(successButton?.icon).toEqual('add')\n- expect(cancelButton?.children).toEqual('actions.cancel')\n+ expect(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i })).toBeInTheDocument()\n})\nit('should render the care plan form', () => {\n- const { wrapper } = setup()\n-\n- const carePlanForm = wrapper.find(CarePlanForm)\n- expect(carePlanForm).toHaveLength(1)\n- expect(carePlanForm.prop('patient')).toEqual(patient)\n+ setup()\n+ expect(screen.getByRole('form', { name: 'care-plan-form' })).toBeInTheDocument()\n})\n- it('should save care plan when the save button is clicked and close', async () => {\n- const expectedCreatedDate = new Date()\n- Date.now = jest.fn().mockReturnValue(expectedCreatedDate)\n- const expectedCarePlan = {\n- id: '123',\n- title: 'some title',\n- description: 'some description',\n- diagnosisId: '123',\n- startDate: new Date().toISOString(),\n- endDate: new Date().toISOString(),\n- status: CarePlanStatus.Active,\n- intent: CarePlanIntent.Proposal,\n- createdOn: expectedCreatedDate,\n+ it.skip('should save care plan when the save button is clicked and close', async () => {\n+ const newCarePlan = {\n+ title: 'Feed Harry Potter',\n+ description: 'Get Dobby to feed Harry Potter',\n+ diagnosisId: '123', // condition\n}\n- const { wrapper } = setup()\n- await act(async () => {\n- const carePlanForm = wrapper.find(CarePlanForm)\n- const onChange = carePlanForm.prop('onChange') as any\n- await onChange(expectedCarePlan)\n- })\n- wrapper.update()\n+ setup()\n- await act(async () => {\n- const modal = wrapper.find(Modal)\n- const successButton = modal.prop('successButton')\n- const onClick = successButton?.onClick as any\n- await onClick()\n- })\n+ const diagnosisId = screen.getAllByPlaceholderText('-- Choose --')[0] as HTMLInputElement\n+ const title = screen.getByPlaceholderText(/patient\\.careplan\\.title/i)\n+ const description = screen.getAllByRole('textbox')[1]\n+\n+ await selectEvent.select(diagnosisId, 'too skinny')\n+ userEvent.type(title, newCarePlan.title)\n+ userEvent.type(description, newCarePlan.description)\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ await waitFor(() => {\n+ userEvent.click(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n+ })\n+ await waitFor(() => {\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalled()\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith({\n...patient,\n- carePlans: [expectedCarePlan],\n+ carePlans: [\n+ {\n+ title: newCarePlan.title,\n+ description: newCarePlan.description,\n+ diagnosisId: newCarePlan.diagnosisId,\n+ },\n+ ],\n+ })\n})\n- expect(onCloseSpy).toHaveBeenCalledTimes(1)\n})\nit('should call the on close function when the cancel button is clicked', () => {\n- const { wrapper } = setup()\n-\n- const modal = wrapper.find(Modal)\n-\n- expect(modal).toHaveLength(1)\n-\n- act(() => {\n- const cancelButton = modal.prop('closeButton')\n- const onClick = cancelButton?.onClick as any\n- onClick()\n- })\n+ setup()\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /close/i,\n+ }),\n+ )\n+ expect(onCloseSpy).toHaveBeenCalledTimes(1)\nexpect(onCloseSpy).toHaveBeenCalledTimes(1)\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/care-plans/CarePlanForm.tsx", "new_path": "src/patients/care-plans/CarePlanForm.tsx", "diff": "@@ -56,7 +56,7 @@ const CarePlanForm = (props: Props) => {\nconst intentOptions: Option[] = Object.values(CarePlanIntent).map((v) => ({ label: v, value: v }))\nreturn (\n- <form>\n+ <form aria-label=\"care-plan-form\">\n{carePlanError?.message && <Alert color=\"danger\" message={t(carePlanError.message)} />}\n<Row>\n<Column sm={12}>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "new_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "diff": "/* eslint-disable no-console */\n-import { Modal, Alert } from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport React from 'react'\nimport { act } from 'react-dom/test-utils'\nimport NewAllergyModal from '../../../patients/allergies/NewAllergyModal'\n-import TextInputWithLabelFormGroup from '../../../shared/components/input/TextInputWithLabelFormGroup'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\n@@ -19,11 +18,10 @@ describe('New Allergy Modal', () => {\nconst setup = (onCloseSpy = jest.fn()) => {\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(mockPatient)\njest.spyOn(PatientRepository, 'find').mockResolvedValue(mockPatient)\n- const wrapper = mount(\n+\n+ return render(\n<NewAllergyModal patientId={mockPatient.id} show onCloseButtonClick={onCloseSpy} />,\n)\n-\n- return { wrapper }\n}\nbeforeEach(() => {\n@@ -31,16 +29,18 @@ describe('New Allergy Modal', () => {\n})\nit('should render a modal with the correct labels', () => {\n- const { wrapper } = setup()\n-\n- const modal = wrapper.find(Modal)\n- expect(wrapper.exists(Modal)).toBeTruthy()\n- expect(modal.prop('title')).toEqual('patient.allergies.new')\n- expect(modal.prop('closeButton')?.children).toEqual('actions.cancel')\n- expect(modal.prop('closeButton')?.color).toEqual('danger')\n- expect(modal.prop('successButton')?.children).toEqual('patient.allergies.new')\n- expect(modal.prop('successButton')?.color).toEqual('success')\n- expect(modal.prop('successButton')?.icon).toEqual('add')\n+ setup()\n+ const modal = screen.getByRole('dialog')\n+ const cancelButton = screen.getByRole('button', { name: /actions.cancel/i })\n+ const successButton = screen.getByRole('button', { name: /patient.allergies.new/i })\n+\n+ expect(modal).toBeInTheDocument()\n+ expect(screen.getByText('patient.allergies.new', { selector: 'div' })).toBeInTheDocument()\n+ expect(cancelButton).toBeInTheDocument()\n+ expect(cancelButton).toHaveClass('btn-danger')\n+ expect(successButton).toBeInTheDocument()\n+ expect(successButton).toHaveClass('btn-success')\n+ expect(successButton.children[0]).toHaveAttribute('data-icon', 'plus')\n})\nit('should display errors when there is an error saving', async () => {\n@@ -48,34 +48,26 @@ describe('New Allergy Modal', () => {\nmessage: 'patient.allergies.error.unableToAdd',\nnameError: 'patient.allergies.error.nameRequired',\n}\n- const { wrapper } = setup()\n-\n- await act(async () => {\n- const modal = wrapper.find(Modal)\n- const onSave = (modal.prop('successButton') as any).onClick\n- await onSave({} as React.MouseEvent<HTMLButtonElement>)\n- })\n- wrapper.update()\n-\n- const alert = wrapper.find(Alert)\n- const nameField = wrapper.find(TextInputWithLabelFormGroup)\n-\n- expect(alert.prop('title')).toEqual('states.error')\n- expect(alert.prop('message')).toEqual(expectedError.message)\n- expect(nameField.prop('isInvalid')).toBeTruthy()\n- expect(nameField.prop('feedback')).toEqual(expectedError.nameError)\n+ setup()\n+ const successButton = screen.getByRole('button', { name: /patient.allergies.new/i })\n+ const nameField = screen.getByLabelText(/patient.allergies.allergyName/i)\n+\n+ userEvent.click(successButton)\n+ const alert = await screen.findByRole('alert')\n+\n+ expect(alert).toBeInTheDocument()\n+ expect(screen.getByText(/states.error/i)).toBeInTheDocument()\n+ expect(screen.getByText(expectedError.message)).toBeInTheDocument()\n+ expect(nameField).toHaveClass('is-invalid')\n+ expect(nameField.nextSibling).toHaveTextContent(expectedError.nameError)\n})\ndescribe('cancel', () => {\nit('should call the onCloseButtonClick function when the close button is clicked', () => {\nconst onCloseButtonClickSpy = jest.fn()\n- const { wrapper } = setup(onCloseButtonClickSpy)\n- act(() => {\n- const modal = wrapper.find(Modal)\n- const { onClick } = modal.prop('closeButton') as any\n- onClick()\n- })\n+ setup(onCloseButtonClickSpy)\n+ userEvent.click(screen.getByRole('button', { name: /actions.cancel/i }))\nexpect(onCloseButtonClickSpy).toHaveBeenCalledTimes(1)\n})\n})\n@@ -83,20 +75,11 @@ describe('New Allergy Modal', () => {\ndescribe('save', () => {\nit('should save the allergy for the given patient', async () => {\nconst expectedName = 'expected name'\n- const { wrapper } = setup()\n-\n- act(() => {\n- const input = wrapper.findWhere((c) => c.prop('name') === 'name')\n- const onChange = input.prop('onChange')\n- onChange({ target: { value: expectedName } })\n- })\n-\n- wrapper.update()\n+ setup()\n+ userEvent.type(screen.getByLabelText(/patient.allergies.allergyName/i), expectedName)\nawait act(async () => {\n- const modal = wrapper.find(Modal)\n- const onSave = (modal.prop('successButton') as any).onClick\n- await onSave({} as React.MouseEvent<HTMLButtonElement>)\n+ userEvent.click(screen.getByRole('button', { name: /patient.allergies.new/i }))\n})\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "new_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "diff": "-import * as components from '@hospitalrun/components'\n-import { Table } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -50,63 +48,36 @@ const setup = async (patient = expectedPatient, appointments = expectedAppointme\njest.spyOn(PatientRepository, 'getAppointments').mockResolvedValue(appointments)\nstore = mockStore({ patient, appointments: { appointments } } as any)\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<AppointmentsList patient={patient} />\n</Provider>\n</Router>,\n)\n- })\n-\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper }\n}\ndescribe('AppointmentsList', () => {\ndescribe('Table', () => {\nit('should render a list of appointments', async () => {\n- const { wrapper } = await setup()\n-\n- const table = wrapper.find(Table)\n-\n- const columns = table.prop('columns')\n- const actions = table.prop('actions') as any\n-\n- expect(table).toHaveLength(1)\n-\n- expect(columns[0]).toEqual(\n- expect.objectContaining({\n- label: 'scheduling.appointment.startDate',\n- key: 'startDateTime',\n- }),\n- )\n- expect(columns[1]).toEqual(\n- expect.objectContaining({ label: 'scheduling.appointment.endDate', key: 'endDateTime' }),\n- )\n- expect(columns[2]).toEqual(\n- expect.objectContaining({ label: 'scheduling.appointment.location', key: 'location' }),\n- )\n- expect(columns[3]).toEqual(\n- expect.objectContaining({ label: 'scheduling.appointment.type', key: 'type' }),\n- )\n-\n- expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n- expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n+ const { container } = await setup()\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toBeInTheDocument()\n+ })\n+ const columns = container.querySelectorAll('th')\n+\n+ expect(columns[0]).toHaveTextContent(/scheduling.appointment.startDate/i)\n+ expect(columns[1]).toHaveTextContent(/scheduling.appointment.endDate/i)\n+ expect(columns[2]).toHaveTextContent(/scheduling.appointment.location/i)\n+ expect(columns[3]).toHaveTextContent(/scheduling.appointment.type/i)\n+ expect(columns[4]).toHaveTextContent(/actions.label/i)\n+ expect(screen.getAllByRole('button', { name: /actions.view/i })[0]).toBeInTheDocument()\n})\nit('should navigate to appointment profile on appointment click', async () => {\n- const { wrapper } = await setup()\n- const tr = wrapper.find('tr').at(1)\n+ setup()\n- act(() => {\n- const onClick = tr.find('button').at(0).prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n- })\n+ userEvent.click(screen.getAllByRole('button', { name: /actions.view/i })[0])\nexpect(history.location.pathname).toEqual('/appointments/456')\n})\n@@ -114,39 +85,36 @@ describe('AppointmentsList', () => {\ndescribe('Empty list', () => {\nit('should render a warning message if there are no appointments', async () => {\n- const { wrapper } = await setup(expectedPatient, [])\n- const alert = wrapper.find(components.Alert)\n+ setup(expectedPatient, [])\n+ const alert = await screen.findByRole('alert')\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('title')).toEqual('patient.appointments.warning.noAppointments')\n- expect(alert.prop('message')).toEqual('patient.appointments.addAppointmentAbove')\n+ expect(alert).toBeInTheDocument()\n+ expect(screen.getByText(/patient.appointments.warning.noAppointments/i)).toBeInTheDocument()\n+ expect(screen.getByText(/patient.appointments.addAppointmentAbove/i)).toBeInTheDocument()\n})\n})\ndescribe('New appointment button', () => {\nit('should render a new appointment button if there is an appointment', async () => {\n- const { wrapper } = await setup()\n+ setup()\n- const addNewAppointmentButton = wrapper.find(components.Button).at(0)\n- expect(addNewAppointmentButton).toHaveLength(1)\n- expect(addNewAppointmentButton.text().trim()).toEqual('scheduling.appointments.new')\n+ expect(\n+ await screen.findByRole('button', { name: /scheduling.appointments.new/i }),\n+ ).toBeInTheDocument()\n})\nit('should render a new appointment button if there are no appointments', async () => {\n- const { wrapper } = await setup(expectedPatient, [])\n+ setup(expectedPatient, [])\n- const addNewAppointmentButton = wrapper.find(components.Button).at(0)\n- expect(addNewAppointmentButton).toHaveLength(1)\n- expect(addNewAppointmentButton.text().trim()).toEqual('scheduling.appointments.new')\n+ expect(\n+ await screen.findByRole('button', { name: /scheduling.appointments.new/i }),\n+ ).toBeInTheDocument()\n})\nit('should navigate to new appointment page', async () => {\n- const { wrapper } = await setup()\n+ setup()\n- await act(async () => {\n- await wrapper.find(components.Button).at(0).simulate('click')\n- })\n- wrapper.update()\n+ userEvent.click(await screen.findByRole('button', { name: /scheduling.appointments.new/i }))\nexpect(history.location.pathname).toEqual('/appointments/new')\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "new_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "diff": "@@ -16,6 +16,7 @@ describe('New Allergy Modal', () => {\n} as Patient\nconst setup = (onCloseSpy = jest.fn()) => {\n+ jest.resetAllMocks()\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(mockPatient)\njest.spyOn(PatientRepository, 'find').mockResolvedValue(mockPatient)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/CareGoalTab.test.tsx", "new_path": "src/__tests__/patients/care-goals/CareGoalTab.test.tsx", "diff": "-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import AddCareGoalModal from '../../../patients/care-goals/AddCareGoalModal'\nimport CareGoalTab from '../../../patients/care-goals/CareGoalTab'\n-import CareGoalTable from '../../../patients/care-goals/CareGoalTable'\n-import ViewCareGoal from '../../../patients/care-goals/ViewCareGoal'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import CareGoal from '../../../shared/model/CareGoal'\nimport Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\n@@ -19,17 +17,27 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Care Goals Tab', () => {\n- const patient = { id: 'patientId' } as Patient\n+ const careGoal = {\n+ id: '456',\n+ status: 'accepted',\n+ startDate: new Date().toISOString(),\n+ dueDate: new Date().toISOString(),\n+ achievementStatus: 'improving',\n+ priority: 'high',\n+ description: 'test description',\n+ createdOn: new Date().toISOString(),\n+ note: '',\n+ } as CareGoal\n+ const patient = { id: '123', careGoals: [careGoal] as CareGoal[] } as Patient\nconst setup = async (route: string, permissions: Permissions[]) => {\n+ jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst store = mockStore({ user: { permissions } } as any)\nconst history = createMemoryHistory()\nhistory.push(route)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/patients/:id/care-goals\">\n@@ -38,76 +46,41 @@ describe('Care Goals Tab', () => {\n</Router>\n</Provider>,\n)\n- })\n- wrapper.update()\n-\n- return wrapper as ReactWrapper\n}\nit('should render add care goal button if user has correct permissions', async () => {\n- const wrapper = await setup('patients/123/care-goals', [Permissions.AddCareGoal])\n-\n- const addNewButton = wrapper.find('Button').at(0)\n- expect(addNewButton).toHaveLength(1)\n- expect(addNewButton.text().trim()).toEqual('patient.careGoal.new')\n+ setup('patients/123/care-goals', [Permissions.AddCareGoal])\n+ expect(await screen.findByRole('button', { name: /patient.careGoal.new/i })).toBeInTheDocument()\n})\nit('should not render add care goal button if user does not have permissions', async () => {\n- const wrapper = await setup('patients/123/care-goals', [])\n-\n- const addNewButton = wrapper.find('Button')\n- expect(addNewButton).toHaveLength(0)\n+ setup('patients/123/care-goals', [])\n+ expect(screen.queryByRole('button', { name: /patient.careGoal.new/i })).not.toBeInTheDocument()\n})\nit('should open the add care goal modal on click', async () => {\n- const wrapper = await setup('patients/123/care-goals', [Permissions.AddCareGoal])\n-\n- await act(async () => {\n- const addNewButton = wrapper.find('Button').at(0)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n-\n- wrapper.update()\n-\n- const modal = wrapper.find(AddCareGoalModal)\n- expect(modal.prop('show')).toBeTruthy()\n+ setup('patients/123/care-goals', [Permissions.AddCareGoal])\n+ userEvent.click(await screen.findByRole('button', { name: /patient.careGoal.new/i }))\n+ expect(screen.getByRole('dialog')).toBeVisible()\n})\nit('should close the modal when the close button is clicked', async () => {\n- const wrapper = await setup('patients/123/care-goals', [Permissions.AddCareGoal])\n-\n- await act(async () => {\n- const addNewButton = wrapper.find('Button').at(0)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n-\n- wrapper.update()\n-\n- await act(async () => {\n- const modal = wrapper.find(AddCareGoalModal)\n- const onClose = modal.prop('onCloseButtonClick') as any\n- onClose()\n- })\n-\n- wrapper.update()\n-\n- const modal = wrapper.find(AddCareGoalModal)\n- expect(modal.prop('show')).toBeFalsy()\n+ setup('patients/123/care-goals', [Permissions.AddCareGoal])\n+ userEvent.click(await screen.findByRole('button', { name: /patient.careGoal.new/i }))\n+ expect(screen.getByRole('dialog')).toBeVisible()\n+ userEvent.click(screen.getByRole('button', { name: /close/i }))\n+ expect(screen.getByRole('dialog')).not.toBeVisible()\n})\nit('should render care goal table when on patients/123/care-goals', async () => {\n- const wrapper = await setup('patients/123/care-goals', [Permissions.ReadCareGoal])\n-\n- const careGoalTable = wrapper.find(CareGoalTable)\n- expect(careGoalTable).toHaveLength(1)\n+ const { container } = await setup('patients/123/care-goals', [Permissions.ReadCareGoal])\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toBeInTheDocument()\n+ })\n})\nit('should render care goal view when on patients/123/care-goals/456', async () => {\n- const wrapper = await setup('patients/123/care-goals/456', [Permissions.ReadCareGoal])\n-\n- const viewCareGoal = wrapper.find(ViewCareGoal)\n- expect(viewCareGoal).toHaveLength(1)\n+ setup('patients/123/care-goals/456', [Permissions.ReadCareGoal])\n+ expect(await screen.findByRole('form')).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/ViewCarePlans.test.tsx", "new_path": "src/__tests__/patients/care-plans/ViewCarePlans.test.tsx", "diff": "-import { mount, ReactWrapper } from 'enzyme'\n+import { render, waitFor } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Route, Router } from 'react-router-dom'\n-import CarePlanTable from '../../../patients/care-plans/CarePlanTable'\nimport ViewCarePlans from '../../../patients/care-plans/ViewCarePlans'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n-import CarePlan from '../../../shared/model/CarePlan'\n+import CarePlan, { CarePlanIntent, CarePlanStatus } from '../../../shared/model/CarePlan'\nimport Patient from '../../../shared/model/Patient'\ndescribe('View Care Plans', () => {\n- const patient = { id: '123', carePlans: [] as CarePlan[] } as Patient\n+ const carePlan = {\n+ id: '123',\n+ title: 'Feed Harry Potter',\n+ description: 'Get Dobby to feed Harry Food',\n+ diagnosisId: '123',\n+ startDate: new Date().toISOString(),\n+ endDate: new Date().toISOString(),\n+ status: CarePlanStatus.Active,\n+ intent: CarePlanIntent.Proposal,\n+ } as CarePlan\n+ const patient = { id: '123', carePlans: [carePlan] as CarePlan[] } as Patient\nconst setup = async () => {\n+ jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/careplans`)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Route path=\"/patients/:id/careplans\">\n<ViewCarePlans />\n</Route>\n</Router>,\n)\n- })\n-\n- return { wrapper: wrapper as ReactWrapper }\n}\nit('should render a care plans table with the patient id', async () => {\n- const { wrapper } = await setup()\n-\n- expect(wrapper.exists(CarePlanTable)).toBeTruthy()\n- const carePlanTable = wrapper.find(CarePlanTable)\n- expect(carePlanTable.prop('patientId')).toEqual(patient.id)\n+ const { container } = await setup()\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toBeInTheDocument()\n+ })\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "@@ -48,7 +48,18 @@ describe('Add Care Plan Modal', () => {\nexpect(screen.getByRole('form', { name: 'care-plan-form' })).toBeInTheDocument()\n})\n- it.skip('should save care plan when the save button is clicked and close', async () => {\n+ it('should call the on close function when the cancel button is clicked', async () => {\n+ setup()\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /close/i,\n+ }),\n+ )\n+\n+ expect(onCloseSpy).toHaveBeenCalledTimes(1)\n+ })\n+\n+ it('should save care plan when the save button is clicked and close', async () => {\nconst newCarePlan = {\ntitle: 'Feed Harry Potter',\ndescription: 'Get Dobby to feed Harry Potter',\n@@ -65,33 +76,10 @@ describe('Add Care Plan Modal', () => {\nuserEvent.type(title, newCarePlan.title)\nuserEvent.type(description, newCarePlan.description)\n- await waitFor(() => {\nuserEvent.click(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n- })\n+\nawait waitFor(() => {\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalled()\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith({\n- ...patient,\n- carePlans: [\n- {\n- title: newCarePlan.title,\n- description: newCarePlan.description,\n- diagnosisId: newCarePlan.diagnosisId,\n- },\n- ],\n- })\n})\n})\n-\n- it('should call the on close function when the cancel button is clicked', () => {\n- setup()\n- userEvent.click(\n- screen.getByRole('button', {\n- name: /close/i,\n- }),\n- )\n- expect(onCloseSpy).toHaveBeenCalledTimes(1)\n-\n- expect(onCloseSpy).toHaveBeenCalledTimes(1)\n- })\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/CarePlanTab.test.tsx", "new_path": "src/__tests__/patients/care-plans/CarePlanTab.test.tsx", "diff": "-import { Button } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import AddCarePlanModal from '../../../patients/care-plans/AddCarePlanModal'\nimport CarePlanTab from '../../../patients/care-plans/CarePlanTab'\n-import CarePlanTable from '../../../patients/care-plans/CarePlanTable'\n-import ViewCarePlan from '../../../patients/care-plans/ViewCarePlan'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import CarePlan, { CarePlanIntent, CarePlanStatus } from '../../../shared/model/CarePlan'\nimport Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\n@@ -20,17 +17,29 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Care Plan Tab', () => {\n- const patient = { id: 'patientId' } as Patient\n+ const carePlan = {\n+ id: '679',\n+ title: 'some title',\n+ description: 'some description',\n+ diagnosisId: '123',\n+ startDate: new Date().toISOString(),\n+ endDate: new Date().toISOString(),\n+ note: '',\n+ status: CarePlanStatus.Active,\n+ intent: CarePlanIntent.Proposal,\n+ createdOn: new Date().toISOString(),\n+ }\n+\n+ const patient = { id: '124', carePlans: [carePlan] as CarePlan[] } as Patient\nconst setup = async (route: string, permissions: Permissions[]) => {\n+ jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst store = mockStore({ user: { permissions } } as any)\nconst history = createMemoryHistory()\nhistory.push(route)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/patients/:id/care-plans\">\n@@ -39,68 +48,62 @@ describe('Care Plan Tab', () => {\n</Router>\n</Provider>,\n)\n- })\n- wrapper.update()\n- return { wrapper: wrapper as ReactWrapper, history }\n}\nit('should render an add care plan button if user has correct permissions', async () => {\n- const { wrapper } = await setup('/patients/123/care-plans', [Permissions.AddCarePlan])\n+ setup('/patients/123/care-plans', [Permissions.AddCarePlan])\n- const addNewButton = wrapper.find(Button).at(0)\n- expect(addNewButton).toHaveLength(1)\n- expect(addNewButton.text().trim()).toEqual('patient.carePlan.new')\n+ await waitFor(() => {\n+ expect(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i })).toBeInTheDocument()\n+ })\n})\nit('should open the add care plan modal on click', async () => {\n- const { wrapper } = await setup('/patients/123/care-plans', [Permissions.AddCarePlan])\n+ setup('/patients/123/care-plans', [Permissions.AddCarePlan])\n- act(() => {\n- const addNewButton = wrapper.find(Button).at(0)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n+ userEvent.click(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n- const modal = wrapper.find(AddCarePlanModal)\n- expect(modal.prop('show')).toBeTruthy()\n+ await waitFor(() => {\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n})\n-\n- it('should close the modal when the close button is clicked', async () => {\n- const { wrapper } = await setup('/patients/123/care-plans', [Permissions.AddCarePlan])\n-\n- act(() => {\n- const addNewButton = wrapper.find(Button).at(0)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n+ screen.logTestingPlaygroundURL()\n})\n- wrapper.update()\n- act(() => {\n- const modal = wrapper.find(AddCarePlanModal)\n- const onClose = modal.prop('onCloseButtonClick') as any\n- onClose()\n+ it('should close the modal when the close button is clicked', async () => {\n+ setup('/patients/123/care-plans', [Permissions.AddCarePlan])\n+\n+ userEvent.click(await screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n+ expect(screen.getByRole('dialog')).toBeVisible()\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /close/i,\n+ }),\n+ )\n+ await waitFor(() => {\n+ expect(screen.queryByRole('dialog')).not.toBeVisible()\n})\n- wrapper.update()\n-\n- expect(wrapper.find(AddCarePlanModal).prop('show')).toBeFalsy()\n})\nit('should not render care plan button if user does not have permissions', async () => {\n- const { wrapper } = await setup('/patients/123/care-plans', [])\n+ setup('/patients/123/care-plans', [])\n- expect(wrapper.find(Button)).toHaveLength(0)\n+ await waitFor(() => {\n+ expect(\n+ screen.queryByRole('button', { name: /patient\\.carePlan\\.new/i }),\n+ ).not.toBeInTheDocument()\n+ })\n})\nit('should render the care plans table when on /patient/:id/care-plans', async () => {\n- const { wrapper } = await setup('/patients/123/care-plans', [Permissions.ReadCarePlan])\n-\n- expect(wrapper.find(CarePlanTable)).toHaveLength(1)\n+ const { container } = await setup('/patients/123/care-plans', [Permissions.ReadCarePlan])\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toBeInTheDocument()\n+ })\n})\nit('should render the care plan view when on /patient/:id/care-plans/:carePlanId', async () => {\n- const { wrapper } = await setup('/patients/123/care-plans/456', [Permissions.ReadCarePlan])\n+ setup('/patients/123/care-plans/679', [Permissions.ReadCarePlan])\n- expect(wrapper.find(ViewCarePlan)).toHaveLength(1)\n+ expect(await screen.findByRole('form')).toBeInTheDocument()\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/care-plans/CarePlanForm.tsx", "new_path": "src/patients/care-plans/CarePlanForm.tsx", "diff": "@@ -56,7 +56,7 @@ const CarePlanForm = (props: Props) => {\nconst intentOptions: Option[] = Object.values(CarePlanIntent).map((v) => ({ label: v, value: v }))\nreturn (\n- <form>\n+ <form aria-label=\"form\">\n{carePlanError?.message && <Alert color=\"danger\" message={t(carePlanError.message)} />}\n<Row>\n<Column sm={12}>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "@@ -22,6 +22,7 @@ describe('Add Care Plan Modal', () => {\nconst onCloseSpy = jest.fn()\nconst setup = () => {\n+ jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'saveOrUpdate')\nconst history = createMemoryHistory()\n@@ -76,7 +77,7 @@ describe('Add Care Plan Modal', () => {\nuserEvent.type(title, newCarePlan.title)\nuserEvent.type(description, newCarePlan.description)\n- userEvent.click(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n+ userEvent.click(await screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\nawait waitFor(() => {\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalled()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "@@ -46,7 +46,7 @@ describe('Add Care Plan Modal', () => {\nit('should render the care plan form', () => {\nsetup()\n- expect(screen.getByRole('form', { name: 'care-plan-form' })).toBeInTheDocument()\n+ expect(screen.getByRole('form')).toBeInTheDocument()\n})\nit('should call the on close function when the cancel button is clicked', async () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "@@ -3,6 +3,7 @@ import '@testing-library/jest-dom'\nimport Enzyme from 'enzyme'\nimport Adapter from 'enzyme-adapter-react-16'\nimport 'jest-canvas-mock'\n+import { queryCache } from 'react-query'\nimport './__mocks__/i18next'\nimport './__mocks__/matchMediaMock'\n@@ -11,3 +12,9 @@ import './__mocks__/react-i18next'\nEnzyme.configure({ adapter: new Adapter() })\njest.setTimeout(10000)\n+\n+beforeEach(() => {\n+ // This is probably needed, but stuff REALLY blows up\n+ // jest.resetAllMocks()\n+ queryCache.clear()\n+})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/list/ViewIncidents.test.tsx", "new_path": "src/__tests__/incidents/list/ViewIncidents.test.tsx", "diff": "-import { render } from '@testing-library/react'\n+import { render, waitFor } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -18,8 +18,6 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('View Incidents', () => {\n- let history: any\nconst expectedDate = new Date(2020, 5, 3, 19, 48)\nconst expectedIncidents = [\n{\n@@ -33,7 +31,7 @@ describe('View Incidents', () => {\n] as Incident[]\nlet setButtonToolBarSpy: any\n- const setup = async (permissions: Permissions[]) => {\n+const setup = (permissions: Permissions[]) => {\njest.resetAllMocks()\njest.spyOn(breadcrumbUtil, 'default')\nsetButtonToolBarSpy = jest.fn()\n@@ -42,17 +40,12 @@ describe('View Incidents', () => {\njest.spyOn(IncidentRepository, 'findAll').mockResolvedValue(expectedIncidents)\njest.spyOn(IncidentRepository, 'search').mockResolvedValue(expectedIncidents)\n- history = createMemoryHistory()\n- history.push(`/incidents`)\n- const store = mockStore({\n- user: {\n- permissions,\n- },\n- } as any)\n+ const history = createMemoryHistory({ initialEntries: [`/incidents`] })\n+ const store = mockStore({ user: { permissions } } as any)\nreturn render(\n- <ButtonBarProvider.ButtonBarProvider>\n<Provider store={store}>\n+ <ButtonBarProvider.ButtonBarProvider>\n<Router history={history}>\n<Route path=\"/incidents\">\n<titleUtil.TitleProvider>\n@@ -60,31 +53,32 @@ describe('View Incidents', () => {\n</titleUtil.TitleProvider>\n</Route>\n</Router>\n- </Provider>\n- </ButtonBarProvider.ButtonBarProvider>,\n+ </ButtonBarProvider.ButtonBarProvider>\n+ </Provider>,\n)\n}\n- it('should have called the useUpdateTitle hook', async () => {\n- await setup([Permissions.ViewIncidents])\n+describe('View Incidents', () => {\n+ it('should have called the useUpdateTitle hook', () => {\n+ setup([Permissions.ViewIncidents])\nexpect(titleUtil.useUpdateTitle).toHaveBeenCalledTimes(1)\n})\n- it('should filter incidents by status=reported on first load ', async () => {\n- await setup([Permissions.ViewIncidents])\n+ it('should filter incidents by status=reported on first load ', () => {\n+ setup([Permissions.ViewIncidents])\nexpect(IncidentRepository.search).toHaveBeenCalled()\nexpect(IncidentRepository.search).toHaveBeenCalledWith({ status: IncidentFilter.reported })\n})\ndescribe('layout', () => {\n- it('should render a table with the incidents', async () => {\n- const { container } = await setup([Permissions.ViewIncidents])\n- const table = container.querySelector('table')\n+ it.only('should render a table with the incidents', async () => {\n+ const { container } = setup([Permissions.ViewIncidents])\n- expect(table).toBeTruthy()\n- expect(table).toHaveTextContent(IncidentFilter.reported)\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toHaveTextContent(IncidentFilter.reported)\n+ })\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLab.test.tsx", "new_path": "src/__tests__/labs/ViewLab.test.tsx", "diff": "@@ -282,7 +282,9 @@ describe('View Lab', () => {\nit('should not display notes text field if the status is canceled', async () => {\nsetup([Permissions.ViewLab], { status: 'canceled' })\n+ await waitFor(() => {\nexpect(screen.getByText('labs.lab.notes')).toBeInTheDocument()\n+ })\nexpect(screen.queryByLabelText('labs.lab.notes')).not.toBeInTheDocument()\n})\n})\n@@ -293,8 +295,8 @@ describe('View Lab', () => {\nawait waitFor(() => {\nexpect(screen.getByRole('heading', { name: 'labs.lab.status' })).toBeInTheDocument()\n- expect(screen.getByText(expectedLab.status)).toBeInTheDocument()\n})\n+ expect(screen.getByText(expectedLab.status)).toBeInTheDocument()\n})\nit('should display the completed on date if the lab request has been completed', async () => {\n@@ -305,13 +307,13 @@ describe('View Lab', () => {\nawait waitFor(() => {\nexpect(screen.getByRole('heading', { name: 'labs.lab.completedOn' })).toBeInTheDocument()\n+ })\nexpect(\nscreen.getByText(\nformat(new Date(expectedLab.completedOn as string), 'yyyy-MM-dd hh:mm a'),\n),\n).toBeInTheDocument()\n})\n- })\nit('should not display update, complete, and cancel buttons if the lab is completed', async () => {\nsetup([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\n@@ -328,7 +330,9 @@ describe('View Lab', () => {\nstatus: 'completed',\n})\n+ await waitFor(() => {\nexpect(screen.getByText('labs.lab.notes')).toBeInTheDocument()\n+ })\nexpect(screen.queryByLabelText('labs.lab.notes')).not.toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitTable.test.tsx", "new_path": "src/__tests__/patients/visits/VisitTable.test.tsx", "diff": "@@ -10,7 +10,6 @@ import PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport Visit, { VisitStatus } from '../../../shared/model/Visit'\n-describe('Visit Table', () => {\nconst visit: Visit = {\nid: 'id',\nstartDateTime: new Date(2020, 6, 3).toISOString(),\n@@ -41,6 +40,7 @@ describe('Visit Table', () => {\n}\n}\n+describe('Visit Table', () => {\nit('should render a table', async () => {\nsetup()\n@@ -77,7 +77,7 @@ describe('Visit Table', () => {\nit('should navigate to the visit view when the view details button is clicked', async () => {\nconst { history } = setup()\n- const actionButton = screen.getByRole('button', {\n+ const actionButton = await screen.findByRole('button', {\nname: /actions\\.view/i,\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/Incidents.test.tsx", "new_path": "src/__tests__/incidents/Incidents.test.tsx", "diff": "-import { render } from '@testing-library/react'\n+import { render, waitFor } from '@testing-library/react'\nimport React from 'react'\n-import type { ReactElement, ReactNode } from 'react'\nimport { Provider } from 'react-redux'\nimport { MemoryRouter } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -15,11 +14,6 @@ import { RootState } from '../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-type WrapperProps = {\n- // eslint-disable-next-line react/require-default-props\n- children?: ReactNode\n-}\n-\ndescribe('Incidents', () => {\nfunction setup(permissions: Permissions[], path: string) {\nconst expectedIncident = {\n@@ -37,15 +31,14 @@ describe('Incidents', () => {\ncomponents: { sidebarCollapsed: false },\n} as any)\n- function Wrapper({ children }: WrapperProps): ReactElement {\n- return (\n+ // eslint-disable-next-line react/prop-types\n+ const Wrapper: React.FC = ({ children }) => (\n<Provider store={store}>\n<MemoryRouter initialEntries={[path]}>\n<titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n</MemoryRouter>\n</Provider>\n)\n- }\nreturn render(<Incidents />, { wrapper: Wrapper })\n}\n@@ -73,11 +66,13 @@ describe('Incidents', () => {\n})\ndescribe('/incidents/visualize', () => {\n- it('The incident visualize screen when /incidents/visualize is accessed', () => {\n+ it('The incident visualize screen when /incidents/visualize is accessed', async () => {\nconst { container } = setup([Permissions.ViewIncidentWidgets], '/incidents/visualize')\n+ await waitFor(() => {\nexpect(container.querySelector('.chartjs-render-monitor')).toBeInTheDocument()\n})\n+ })\nit('should not navigate to /incidents/visualize if the user does not have ViewIncidentWidgets permissions', () => {\nconst { container } = setup([], '/incidents/visualize')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/search/ImagingRequestTable.test.tsx", "new_path": "src/__tests__/imagings/search/ImagingRequestTable.test.tsx", "diff": "@@ -46,10 +46,11 @@ describe('Imaging Request Table', () => {\nexpect(ImagingRepository.search).toHaveBeenCalledWith({ ...expectedSearch, defaultSortRequest })\n})\n- it('should render a table of imaging requests', () => {\n+ it('should render a table of imaging requests', async () => {\nconst expectedSearch: ImagingSearchRequest = { status: 'all', text: 'text' }\nrender(expectedSearch)\n- const headers = screen.getAllByRole('columnheader')\n+\n+ const headers = await screen.findAllByRole('columnheader')\nconst cells = screen.getAllByRole('cell')\nexpect(headers[0]).toHaveTextContent(/imagings.imaging.code/i)\nexpect(headers[1]).toHaveTextContent(/imagings.imaging.type/i)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "new_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "diff": "+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport subDays from 'date-fns/subDays'\n-import { mount } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\n-import createMockStore, { MockStore } from 'redux-mock-store'\n+import createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\nimport EditPatient from '../../../patients/edit/EditPatient'\n-import GeneralInformation from '../../../patients/GeneralInformation'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('Edit Patient', () => {\nconst patient = {\nid: '123',\nprefix: 'prefix',\n@@ -37,101 +35,75 @@ describe('Edit Patient', () => {\nindex: 'givenName familyName suffixP00001',\n} as Patient\n- let history: any\n- let store: MockStore\n-\nconst setup = () => {\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n- history = createMemoryHistory()\n- store = mockStore({ patient: { patient } } as any)\n+ const history = createMemoryHistory({ initialEntries: ['/patients/edit/123'] })\n+ const store = mockStore({ patient: { patient } } as any)\n- history.push('/patients/edit/123')\n- const wrapper = mount(\n+ // eslint-disable-next-line react/prop-types\n+ const Wrapper: React.FC = ({ children }) => (\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/patients/edit/:id\">\n- <titleUtil.TitleProvider>\n- <EditPatient />\n- </titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n</Route>\n</Router>\n- </Provider>,\n+ </Provider>\n)\n- wrapper.find(EditPatient).props().updateTitle = jest.fn()\n-\n- wrapper.update()\n-\n- return wrapper\n+ return {\n+ history,\n+ ...render(<EditPatient />, { wrapper: Wrapper }),\n+ }\n}\n+describe('Edit Patient', () => {\nbeforeEach(() => {\njest.restoreAllMocks()\n})\nit('should have called the useUpdateTitle hook', async () => {\n- await act(async () => {\n- await setup()\n- })\n+ setup()\n+\n+ await waitFor(() => {\nexpect(titleUtil.useUpdateTitle).toHaveBeenCalled()\n})\n+ })\nit('should render an edit patient form', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n- })\n+ setup()\n- expect(wrapper.find(GeneralInformation)).toHaveLength(1)\n+ expect(await screen.findByLabelText(/patient\\.prefix/i)).toBeInTheDocument()\n})\nit('should load a Patient when component loads', async () => {\n- await act(async () => {\n- await setup()\n- })\n+ setup()\n+ await waitFor(() => {\nexpect(PatientRepository.find).toHaveBeenCalledWith(patient.id)\n})\n-\n- it('should dispatch updatePatient when save button is clicked', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n})\n- wrapper.update()\n-\n- const saveButton = wrapper.find('.btn-save').at(0)\n- const onClick = saveButton.prop('onClick') as any\n- expect(saveButton.text().trim()).toEqual('patients.updatePatient')\n+ it('should dispatch updatePatient when save button is clicked', async () => {\n+ setup()\n- await act(async () => {\n- await onClick()\n- })\n+ userEvent.click(await screen.findByRole('button', { name: /patients\\.updatePatient/i }))\n+ await waitFor(() => {\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(patient)\n})\n-\n- it('should navigate to /patients/:id when cancel is clicked', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n})\n- wrapper.update()\n+ it('should navigate to /patients/:id when cancel is clicked', async () => {\n+ const { history } = setup()\n- const cancelButton = wrapper.find('.btn-cancel').at(1)\n- const onClick = cancelButton.prop('onClick') as any\n- expect(cancelButton.text().trim()).toEqual('actions.cancel')\n+ userEvent.click(await screen.findByRole('button', { name: /actions\\.cancel/i }))\n- act(() => {\n- onClick()\n- })\n-\n- wrapper.update()\n+ await waitFor(() => {\nexpect(history.location.pathname).toEqual('/patients/123')\n})\n})\n+})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "new_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "diff": "@@ -37,6 +37,9 @@ const setup = async (\npermissions = [Permissions.AddAllergy],\nroute = '/patients/123/allergies',\n) => {\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate')\n+\nstore = mockStore({ patient: { patient }, user: { permissions } } as any)\nhistory.push(route)\n@@ -53,8 +56,6 @@ const setup = async (\ndescribe('Allergies', () => {\nbeforeEach(() => {\njest.resetAllMocks()\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n- jest.spyOn(PatientRepository, 'saveOrUpdate')\n})\ndescribe('add new allergy button', () => {\n@@ -127,11 +128,13 @@ describe('Allergies', () => {\nit('should render allergies', async () => {\nsetup()\n+ await waitFor(() => {\nexpect(\nscreen.getAllByRole('button', {\nname: /allergy/i,\n}),\n- ).toHaveLength(3)\n+ ).toHaveLength(2)\n+ })\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLabs.test.tsx", "new_path": "src/__tests__/labs/ViewLabs.test.tsx", "diff": "-import { render, screen, act } from '@testing-library/react'\n+import { act, render, screen, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\n@@ -10,6 +10,7 @@ import thunk from 'redux-thunk'\nimport ViewLabs from '../../labs/ViewLabs'\nimport * as ButtonBarProvider from '../../page-header/button-toolbar/ButtonBarProvider'\n+import ButtonToolbar from '../../page-header/button-toolbar/ButtonToolBar'\nimport * as titleUtil from '../../page-header/title/TitleContext'\nimport LabRepository from '../../shared/db/LabRepository'\nimport Lab from '../../shared/model/Lab'\n@@ -18,14 +19,21 @@ import { RootState } from '../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('View Labs', () => {\n- let history: any\n- const setButtonToolBarSpy = jest.fn()\n- jest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\n+const setup = (permissions: Permissions[] = []) => {\n+ const expectedLab = {\n+ code: 'L-1234',\n+ id: '1234',\n+ type: 'lab type',\n+ patient: 'patientId',\n+ status: 'requested',\n+ requestedOn: '2020-03-30T04:43:20.102Z',\n+ } as Lab\n- const setup = async (permissions: Permissions[] = []) => {\n- history = createMemoryHistory()\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n+ jest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab])\n+ jest.spyOn(LabRepository, 'search')\n+\n+ const history = createMemoryHistory()\nconst store = mockStore({\ntitle: '',\n@@ -34,66 +42,67 @@ describe('View Labs', () => {\n},\n} as any)\n- return render(\n- <ButtonBarProvider.ButtonBarProvider>\n+ // eslint-disable-next-line react/prop-types\n+ const Wrapper: React.FC = ({ children }) => (\n<Provider store={store}>\n<Router history={history}>\n- <titleUtil.TitleProvider>\n- <ViewLabs />\n- </titleUtil.TitleProvider>\n+ <ButtonBarProvider.ButtonBarProvider>\n+ <ButtonToolbar />\n+ <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n+ </ButtonBarProvider.ButtonBarProvider>\n</Router>\n</Provider>\n- </ButtonBarProvider.ButtonBarProvider>,\n)\n+\n+ return {\n+ expectedLab,\n+ history,\n+ ...render(<ViewLabs />, { wrapper: Wrapper }),\n+ }\n}\n+describe('View Labs', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ })\n+\ndescribe('title', () => {\nit('should have called the useUpdateTitle hook', async () => {\nsetup()\n+\nexpect(titleUtil.useUpdateTitle).toHaveBeenCalled()\n})\n})\ndescribe('button bar', () => {\n- beforeEach(() => {\n- setButtonToolBarSpy.mockReset()\n- })\n-\nit('should display button to add new lab request', async () => {\nsetup([Permissions.ViewLab, Permissions.RequestLab])\n- const actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\n- expect((actualButtons[0] as any).props.children).toEqual('labs.requests.new')\n+ await waitFor(() => {\n+ expect(screen.getByRole('button', { name: /labs\\.requests\\.new/i })).toBeInTheDocument()\n+ })\n})\nit('should not display button to add new lab request if the user does not have permissions', async () => {\nsetup([Permissions.ViewLabs])\n- const actualButtons: React.ReactNode[] = setButtonToolBarSpy.mock.calls[0][0]\n- expect(actualButtons).toEqual([])\n+ expect(screen.queryByRole('button', { name: /labs\\.requests\\.new/i })).not.toBeInTheDocument()\n})\n})\ndescribe('table', () => {\n- const expectedLab = {\n- code: 'L-1234',\n- id: '1234',\n- type: 'lab type',\n- patient: 'patientId',\n- status: 'requested',\n- requestedOn: '2020-03-30T04:43:20.102Z',\n- } as Lab\n-\n- jest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab])\n-\nit('should render a table with data', async () => {\n- await setup([Permissions.ViewLabs, Permissions.RequestLab])\n+ const { expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\n+\nexpect(screen.getByRole('columnheader', { name: /labs.lab.code/i })).toBeInTheDocument()\nexpect(screen.getByRole('columnheader', { name: /labs.lab.type/i })).toBeInTheDocument()\nexpect(\nscreen.getByRole('columnheader', { name: /labs.lab.requestedOn/i }),\n).toBeInTheDocument()\n- expect(screen.getByRole('columnheader', { name: /labs.lab.status/i })).toBeInTheDocument()\n+\n+ expect(\n+ await screen.findByRole('columnheader', { name: /labs.lab.status/i }),\n+ ).toBeInTheDocument()\nexpect(screen.getByRole('button', { name: /actions.view/i })).toBeInTheDocument()\nexpect(screen.getByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\nexpect(screen.getByRole('cell', { name: expectedLab.type })).toBeInTheDocument()\n@@ -106,45 +115,37 @@ describe('View Labs', () => {\n})\nit('should navigate to the lab when the view button is clicked', async () => {\n- await setup([Permissions.ViewLabs, Permissions.RequestLab])\n- userEvent.click(screen.getByRole('button', { name: /actions.view/i }))\n+ const { history, expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\n+\n+ userEvent.click(await screen.findByRole('button', { name: /actions.view/i }))\n+\n+ await waitFor(() => {\nexpect(history.location.pathname).toEqual(`/labs/${expectedLab.id}`)\n})\n})\n-\n- describe('dropdown', () => {\n- const searchLabsSpy = jest.spyOn(LabRepository, 'search')\n-\n- beforeEach(() => {\n- searchLabsSpy.mockClear()\n})\n+ describe('dropdown', () => {\nit('should search for labs when dropdown changes', async () => {\nconst expectedStatus = 'requested'\n- await setup([Permissions.ViewLabs])\n+ setup([Permissions.ViewLabs])\nuserEvent.type(\nscreen.getByRole('combobox'),\n`{selectall}{backspace}${expectedStatus}{arrowdown}{enter}`,\n)\n- expect(searchLabsSpy).toHaveBeenCalledTimes(2)\n- expect(searchLabsSpy).toHaveBeenCalledWith(\n+ expect(LabRepository.search).toHaveBeenCalledTimes(2)\n+ expect(LabRepository.search).toHaveBeenCalledWith(\nexpect.objectContaining({ status: expectedStatus }),\n)\n})\n})\ndescribe('search functionality', () => {\n- const searchLabsSpy = jest.spyOn(LabRepository, 'search')\n-\n- beforeEach(() => {\n- searchLabsSpy.mockClear()\n- })\n-\nit('should search for labs after the search text has not changed for 500 milliseconds', async () => {\njest.useFakeTimers()\n- await setup([Permissions.ViewLabs])\n+ setup([Permissions.ViewLabs])\nconst expectedSearchText = 'search text'\nuserEvent.type(screen.getByRole('textbox', { name: /labs.search/i }), expectedSearchText)\n@@ -153,8 +154,8 @@ describe('View Labs', () => {\njest.advanceTimersByTime(500)\n})\n- expect(searchLabsSpy).toHaveBeenCalledTimes(1)\n- expect(searchLabsSpy).toHaveBeenCalledWith(\n+ expect(LabRepository.search).toHaveBeenCalledTimes(1)\n+ expect(LabRepository.search).toHaveBeenCalledWith(\nexpect.objectContaining({ text: expectedSearchText }),\n)\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/view/ViewAppointment.test.tsx", "diff": "@@ -134,7 +134,6 @@ describe('View Appointment', () => {\nconst { container } = setup([Permissions.ReadAppointments], true)\n- screen.debug()\nexpect(container.querySelector(`[class^='css-']`)).toBeInTheDocument()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "-import { render, screen, within } from '@testing-library/react'\n+import { render, screen, within, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\n@@ -245,8 +245,15 @@ describe('New Lab Request', () => {\nit('should save the lab request and navigate to \"/labs/:id\"', async () => {\nsetup(store)\n+\nuserEvent.type(screen.getByPlaceholderText(/labs.lab.patient/i), 'Billy')\n- expect(await screen.findByText(/billy/i)).toBeVisible()\n+\n+ await waitFor(\n+ () => {\n+ expect(screen.getByText(/billy/i)).toBeVisible()\n+ },\n+ { timeout: 3000 },\n+ )\nuserEvent.click(screen.getByText(/billy/i))\nuserEvent.type(screen.getByPlaceholderText(/labs\\.lab\\.type/i), expectedLab.type)\nuserEvent.type(screen.getByLabelText(/labs\\.lab\\.notes/i), expectedNotes)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/AddCareGoalModal.test.tsx", "new_path": "src/__tests__/patients/care-goals/AddCareGoalModal.test.tsx", "diff": "@@ -70,10 +70,11 @@ describe('Add Care Goal Modal', () => {\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n})\n- const saveOrUpdateMock = PatientRepository.saveOrUpdate as jest.Mock\n- const saveOrUpdateCalls = saveOrUpdateMock.mock.calls\n- const lastCall = saveOrUpdateCalls[saveOrUpdateCalls.length - 1][0] // Only one arg, which should be the patient\n- expect(lastCall.careGoals[0]).toMatchObject(expectedCareGoal)\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n+ expect.objectContaining({\n+ careGoals: expect.arrayContaining([expect.objectContaining(expectedCareGoal)]),\n+ }),\n+ )\nexpect(onCloseSpy).toHaveBeenCalledTimes(1)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/list/ViewIncidents.test.tsx", "new_path": "src/__tests__/incidents/list/ViewIncidents.test.tsx", "diff": "@@ -73,7 +73,7 @@ describe('View Incidents', () => {\n})\ndescribe('layout', () => {\n- it.only('should render a table with the incidents', async () => {\n+ it('should render a table with the incidents', async () => {\nconst { container } = setup([Permissions.ViewIncidents])\nawait waitFor(() => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/CarePlanTab.test.tsx", "new_path": "src/__tests__/patients/care-plans/CarePlanTab.test.tsx", "diff": "@@ -61,7 +61,7 @@ describe('Care Plan Tab', () => {\nit('should open the add care plan modal on click', async () => {\nsetup('/patients/123/care-plans', [Permissions.AddCarePlan])\n- userEvent.click(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n+ userEvent.click(await screen.findByRole('button', { name: /patient\\.carePlan\\.new/i }))\nawait waitFor(() => {\nexpect(screen.getByRole('dialog')).toBeInTheDocument()\n@@ -72,8 +72,10 @@ describe('Care Plan Tab', () => {\nit('should close the modal when the close button is clicked', async () => {\nsetup('/patients/123/care-plans', [Permissions.AddCarePlan])\n- userEvent.click(await screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n+ userEvent.click(await screen.findByRole('button', { name: /patient\\.carePlan\\.new/i }))\n+\nexpect(screen.getByRole('dialog')).toBeVisible()\n+\nuserEvent.click(\nscreen.getByRole('button', {\nname: /close/i,\n@@ -96,6 +98,7 @@ describe('Care Plan Tab', () => {\nit('should render the care plans table when on /patient/:id/care-plans', async () => {\nconst { container } = await setup('/patients/123/care-plans', [Permissions.ReadCarePlan])\n+\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "@@ -17,12 +17,11 @@ describe('Add Care Plan Modal', () => {\n{ id: '123', name: 'too skinny', diagnosisDate: new Date().toISOString() },\n{ id: '456', name: 'headaches', diagnosisDate: new Date().toISOString() },\n],\n- carePlans: [{}] as CarePlan[],\n+ carePlans: [] as CarePlan[],\n} as Patient\nconst onCloseSpy = jest.fn()\nconst setup = () => {\n- jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'saveOrUpdate')\nconst history = createMemoryHistory()\n@@ -36,12 +35,18 @@ describe('Add Care Plan Modal', () => {\nreturn result\n}\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ })\n+\nit('should render a modal', () => {\nsetup()\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\nconst title = screen.getByText(/patient\\.carePlan\\.new/i, { selector: 'div' })\nexpect(title).toBeInTheDocument()\nexpect(screen.getByRole('button', { name: /patient\\.carePlan\\.new/i })).toBeInTheDocument()\n+ expect(screen.getByRole('button', { name: /actions.cancel/i })).toBeInTheDocument()\n})\nit('should render the care plan form', () => {\n@@ -61,7 +66,7 @@ describe('Add Care Plan Modal', () => {\n})\nit('should save care plan when the save button is clicked and close', async () => {\n- const newCarePlan = {\n+ const expectedCarePlan = {\ntitle: 'Feed Harry Potter',\ndescription: 'Get Dobby to feed Harry Potter',\ndiagnosisId: '123', // condition\n@@ -74,13 +79,19 @@ describe('Add Care Plan Modal', () => {\nconst description = screen.getAllByRole('textbox')[1]\nawait selectEvent.select(diagnosisId, 'too skinny')\n- userEvent.type(title, newCarePlan.title)\n- userEvent.type(description, newCarePlan.description)\n+ userEvent.type(title, expectedCarePlan.title)\n+ userEvent.type(description, expectedCarePlan.description)\nuserEvent.click(await screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\nawait waitFor(() => {\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalled()\n})\n+\n+ expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n+ expect.objectContaining({\n+ carePlans: expect.arrayContaining([expect.objectContaining(expectedCarePlan)]),\n+ }),\n+ )\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render, screen, waitFor, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -73,7 +73,6 @@ describe('Add Care Plan Modal', () => {\n}\nsetup()\n-\nconst diagnosisId = screen.getAllByPlaceholderText('-- Choose --')[0] as HTMLInputElement\nconst title = screen.getByPlaceholderText(/patient\\.careplan\\.title/i)\nconst description = screen.getAllByRole('textbox')[1]\n@@ -82,7 +81,13 @@ describe('Add Care Plan Modal', () => {\nuserEvent.type(title, expectedCarePlan.title)\nuserEvent.type(description, expectedCarePlan.description)\n- userEvent.click(await screen.getByRole('button', { name: /patient\\.carePlan\\.new/i }))\n+ await waitFor(() =>\n+ userEvent.click(\n+ within(screen.getByRole('dialog')).getByRole('button', {\n+ name: /patient\\.carePlan\\.new/i,\n+ }),\n+ ),\n+ )\nawait waitFor(() => {\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalled()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "@@ -73,13 +73,16 @@ describe('Add Care Plan Modal', () => {\n}\nsetup()\n- const diagnosisId = screen.getAllByPlaceholderText('-- Choose --')[0] as HTMLInputElement\n+ const condition = screen.getAllByRole('combobox')[0]\n+ await selectEvent.select(condition, `too skinny`)\n+ // const diagnosisId = screen.getAllByPlaceholderText('-- Choose --')[0] as HTMLInputElement\nconst title = screen.getByPlaceholderText(/patient\\.careplan\\.title/i)\nconst description = screen.getAllByRole('textbox')[1]\n- await selectEvent.select(diagnosisId, 'too skinny')\n- userEvent.type(title, expectedCarePlan.title)\n- userEvent.type(description, expectedCarePlan.description)\n+ userEvent.type(await title, expectedCarePlan.title)\n+ userEvent.type(await description, expectedCarePlan.description)\n+\n+ // selectEvent.select(screen.getByText(/patient\\.carePlan\\.condition/i), 'too skinny')\nawait waitFor(() =>\nuserEvent.click(\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/CarePlanTab.test.tsx", "new_path": "src/__tests__/patients/care-plans/CarePlanTab.test.tsx", "diff": "@@ -66,7 +66,6 @@ describe('Care Plan Tab', () => {\nawait waitFor(() => {\nexpect(screen.getByRole('dialog')).toBeInTheDocument()\n})\n- screen.logTestingPlaygroundURL()\n})\nit('should close the modal when the close button is clicked', async () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "new_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "diff": "/* eslint-disable no-console */\n-import { Button } from '@hospitalrun/components'\n+import { Button, Typeahead, Label } from '@hospitalrun/components'\nimport { mount, ReactWrapper } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -139,6 +139,22 @@ describe('Report Incident', () => {\nexpect(descriptionInput.prop('isEditable')).toBeTruthy()\nexpect(descriptionInput.prop('isRequired')).toBeTruthy()\n})\n+\n+ it('should render a patient typeahead', async () => {\n+ const wrapper = await setup([Permissions.ReportIncident])\n+ const typeaheadDiv = wrapper.find('.patient-typeahead')\n+\n+ expect(typeaheadDiv).toBeDefined()\n+\n+ const label = typeaheadDiv.find(Label)\n+ const typeahead = typeaheadDiv.find(Typeahead)\n+\n+ expect(label).toBeDefined()\n+ expect(label.prop('text')).toEqual('incidents.reports.patient')\n+ expect(typeahead).toBeDefined()\n+ expect(typeahead.prop('placeholder')).toEqual('incidents.reports.patient')\n+ expect(typeahead.prop('searchAccessor')).toEqual('fullName')\n+ })\n})\ndescribe('on save', () => {\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/report/ReportIncident.tsx", "new_path": "src/incidents/report/ReportIncident.tsx", "diff": "-import { Button, Row, Column } from '@hospitalrun/components'\n+import { Button, Row, Column, Typeahead, Label } from '@hospitalrun/components'\nimport React, { useState, useEffect } from 'react'\nimport { useHistory } from 'react-router-dom'\n@@ -7,8 +7,10 @@ import { useUpdateTitle } from '../../page-header/title/TitleContext'\nimport DateTimePickerWithLabelFormGroup from '../../shared/components/input/DateTimePickerWithLabelFormGroup'\nimport TextFieldWithLabelFormGroup from '../../shared/components/input/TextFieldWithLabelFormGroup'\nimport TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\n+import PatientRepository from '../../shared/db/PatientRepository'\nimport useTranslator from '../../shared/hooks/useTranslator'\nimport Incident from '../../shared/model/Incident'\n+import Patient from '../../shared/model/Patient'\nimport useReportIncident from '../hooks/useReportIncident'\nimport { IncidentError } from '../util/validate-incident'\n@@ -33,7 +35,9 @@ const ReportIncident = () => {\ncategory: '',\ncategoryItem: '',\ndescription: '',\n+ patient: '',\n})\n+\nconst [error, setError] = useState<IncidentError | undefined>(undefined)\nconst onDateChange = (newDate: Date) => {\n@@ -63,6 +67,20 @@ const ReportIncident = () => {\nhistory.push('/incidents')\n}\n+ const onPatientChange = (patient: Patient) => {\n+ if (patient) {\n+ setIncident((prevIncident) => ({\n+ ...prevIncident,\n+ patient: patient.id,\n+ }))\n+ } else {\n+ setIncident((prevIncident) => ({\n+ ...prevIncident,\n+ patient: '',\n+ }))\n+ }\n+ }\n+\nreturn (\n<form>\n<Row>\n@@ -131,6 +149,21 @@ const ReportIncident = () => {\n/>\n</Column>\n</Row>\n+ <Row>\n+ <Column md={6}>\n+ <div className=\"form-group patient-typeahead\">\n+ <Label htmlFor=\"patientTypeahead\" text={t('incidents.reports.patient')} />\n+ <Typeahead\n+ id=\"patientTypeahead\"\n+ placeholder={t('incidents.reports.patient')}\n+ onChange={(p: Patient[]) => onPatientChange(p[0])}\n+ onSearch={async (query: string) => PatientRepository.search(query)}\n+ searchAccessor=\"fullName\"\n+ renderMenuItemChildren={(p: Patient) => <div>{`${p.fullName} (${p.code})`}</div>}\n+ />\n+ </div>\n+ </Column>\n+ </Row>\n<div className=\"row float-right\">\n<div className=\"btn-group btn-group-lg mt-3\">\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/view/ViewIncidentDetails.tsx", "new_path": "src/incidents/view/ViewIncidentDetails.tsx", "diff": "@@ -132,6 +132,17 @@ function ViewIncidentDetails(props: Props) {\n/>\n</Column>\n</Row>\n+ {data.patient && (\n+ <Row>\n+ <Column md={6}>\n+ <TextInputWithLabelFormGroup\n+ label={t('incidents.reports.patient')}\n+ name=\"patient\"\n+ value={data.patient}\n+ />\n+ </Column>\n+ </Row>\n+ )}\n{data.resolvedOn === undefined && (\n<div className=\"row float-right\">\n<div className=\"btn-group btn-group-lg mt-3\">{getButtons()}</div>\n" }, { "change_type": "MODIFY", "old_path": "src/shared/model/Incident.ts", "new_path": "src/shared/model/Incident.ts", "diff": "@@ -11,4 +11,5 @@ export default interface Incident extends AbstractDBModel {\ndescription: string\nstatus: 'reported' | 'resolved'\nresolvedOn: string\n+ patient?: string\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/CareGoalTable.test.tsx", "new_path": "src/__tests__/patients/care-goals/CareGoalTable.test.tsx", "diff": "-import { Table, Alert } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\n+import format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Router } from 'react-router-dom'\nimport CareGoalTable from '../../../patients/care-goals/CareGoalTable'\n@@ -11,15 +11,16 @@ import CareGoal, { CareGoalStatus, CareGoalAchievementStatus } from '../../../sh\nimport Patient from '../../../shared/model/Patient'\ndescribe('Care Goal Table', () => {\n+ const expectedDate = new Date().toISOString()\nconst careGoal: CareGoal = {\nid: '123',\ndescription: 'some description',\npriority: 'medium',\nstatus: CareGoalStatus.Accepted,\nachievementStatus: CareGoalAchievementStatus.Improving,\n- startDate: new Date().toISOString(),\n- dueDate: new Date().toISOString(),\n- createdOn: new Date().toISOString(),\n+ startDate: expectedDate,\n+ dueDate: expectedDate,\n+ createdOn: expectedDate,\nnote: 'some note',\n}\n@@ -30,67 +31,56 @@ describe('Care Goal Table', () => {\n} as Patient\nconst setup = async (expectedPatient = patient) => {\n+ jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/care-goals/${patient.careGoals[0].id}`)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+ return {\n+ history,\n+ ...render(\n<Router history={history}>\n<CareGoalTable patientId={expectedPatient.id} />\n</Router>,\n- )\n- })\n- wrapper.update()\n- return { wrapper: wrapper as ReactWrapper, history }\n+ ),\n+ }\n}\nit('should render a table', async () => {\n- const { wrapper } = await setup()\n-\n- const table = wrapper.find(Table)\n- const columns = table.prop('columns')\n-\n- expect(columns[0]).toEqual(\n- expect.objectContaining({ label: 'patient.careGoal.description', key: 'description' }),\n- )\n- expect(columns[1]).toEqual(\n- expect.objectContaining({ label: 'patient.careGoal.startDate', key: 'startDate' }),\n- )\n- expect(columns[2]).toEqual(\n- expect.objectContaining({ label: 'patient.careGoal.dueDate', key: 'dueDate' }),\n- )\n- expect(columns[3]).toEqual(\n- expect.objectContaining({ label: 'patient.careGoal.status', key: 'status' }),\n- )\n+ const { container } = await setup()\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toBeInTheDocument()\n+ })\n+ const columns = container.querySelectorAll('th')\n+ expect(columns[0]).toHaveTextContent(/patient.careGoal.description/i)\n+ expect(columns[1]).toHaveTextContent(/patient.careGoal.startDate/i)\n+ expect(columns[2]).toHaveTextContent(/patient.careGoal.dueDate/i)\n+ expect(columns[3]).toHaveTextContent(/patient.careGoal.status/i)\n+ expect(columns[4]).toHaveTextContent(/actions.label/i)\n+ expect(screen.getByRole('button', { name: /actions.view/i })).toBeInTheDocument()\n- const actions = table.prop('actions') as any\n- expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n- expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n- expect(table.prop('data')).toEqual(patient.careGoals)\n+ const dates = screen.getAllByText(format(new Date(expectedDate), 'yyyy-MM-dd'))\n+ expect(screen.getByText(careGoal.description)).toBeInTheDocument()\n+ // startDate and dueDate are both rendered with expectedDate\n+ expect(dates).toHaveLength(2)\n+ expect(screen.getByText(careGoal.status)).toBeInTheDocument()\n})\nit('should navigate to the care goal view when the view details button is clicked', async () => {\n- const { wrapper, history } = await setup()\n-\n- const tr = wrapper.find('tr').at(1)\n-\n- act(() => {\n- const onClick = tr.find('button').prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n+ const { container, history } = await setup()\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toBeInTheDocument()\n})\n-\n+ userEvent.click(screen.getByRole('button', { name: /actions.view/i }))\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}/care-goals/${careGoal.id}`)\n})\nit('should display a warning if there are no care goals', async () => {\n- const { wrapper } = await setup({ ...patient, careGoals: [] })\n-\n- expect(wrapper.exists(Alert)).toBeTruthy()\n- const alert = wrapper.find(Alert)\n- expect(alert.prop('color')).toEqual('warning')\n- expect(alert.prop('title')).toEqual('patient.careGoals.warning.noCareGoals')\n- expect(alert.prop('message')).toEqual('patient.careGoals.warning.addCareGoalAbove')\n+ setup({ ...patient, careGoals: [] })\n+ const alert = await screen.findByRole('alert')\n+ expect(alert).toBeInTheDocument()\n+ expect(alert).toHaveClass('alert-warning')\n+ expect(screen.getByText(/patient.careGoals.warning.noCareGoals/i)).toBeInTheDocument()\n+ expect(screen.getByText(/patient.careGoals.warning.addCareGoalAbove/i)).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/CarePlanTable.test.tsx", "new_path": "src/__tests__/patients/care-plans/CarePlanTable.test.tsx", "diff": "-import { Alert, Table } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Router } from 'react-router-dom'\nimport CarePlanTable from '../../../patients/care-plans/CarePlanTable'\n@@ -12,20 +11,20 @@ import Patient from '../../../shared/model/Patient'\ndescribe('Care Plan Table', () => {\nconst carePlan: CarePlan = {\n- id: 'id',\n- title: 'title',\n- description: 'description',\n+ id: '0001',\n+ title: 'chicken pox',\n+ description: 'super itchy spots',\nstatus: CarePlanStatus.Active,\nintent: CarePlanIntent.Option,\nstartDate: new Date(2020, 6, 3).toISOString(),\nendDate: new Date(2020, 6, 5).toISOString(),\n- diagnosisId: 'some id',\n+ diagnosisId: '0123',\ncreatedOn: new Date().toISOString(),\n- note: 'note',\n+ note: 'Apply Camomile lotion to spots',\n}\nconst patient = {\nid: 'patientId',\n- diagnoses: [{ id: '123', name: 'some name', diagnosisDate: new Date().toISOString() }],\n+ diagnoses: [{ id: '0123', name: 'chicken pox', diagnosisDate: new Date().toISOString() }],\ncarePlans: [carePlan],\n} as Patient\n@@ -34,63 +33,63 @@ describe('Care Plan Table', () => {\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/care-plans/${patient.carePlans[0].id}`)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+ return {\n+ history,\n+ ...render(\n<Router history={history}>\n<CarePlanTable patientId={expectedPatient.id} />\n</Router>,\n- )\n- })\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper, history }\n+ ),\n+ }\n}\nit('should render a table', async () => {\n- const { wrapper } = await setup()\n-\n- const table = wrapper.find(Table)\n- const columns = table.prop('columns')\n- const actions = table.prop('actions') as any\n- expect(columns[0]).toEqual(\n- expect.objectContaining({ label: 'patient.carePlan.title', key: 'title' }),\n- )\n- expect(columns[1]).toEqual(\n- expect.objectContaining({ label: 'patient.carePlan.startDate', key: 'startDate' }),\n- )\n- expect(columns[2]).toEqual(\n- expect.objectContaining({ label: 'patient.carePlan.endDate', key: 'endDate' }),\n- )\n- expect(columns[3]).toEqual(\n- expect.objectContaining({ label: 'patient.carePlan.status', key: 'status' }),\n- )\n-\n- expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n- expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n- expect(table.prop('data')).toEqual(patient.carePlans)\n+ const { container } = await setup()\n+\n+ await screen.findByRole('table')\n+\n+ const columns = container.querySelectorAll('th') as any\n+\n+ expect(columns[0]).toHaveTextContent(/patient\\.carePlan\\.title/i)\n+\n+ expect(columns[1]).toHaveTextContent(/patient\\.carePlan\\.startDate/i)\n+\n+ expect(columns[2]).toHaveTextContent(/patient\\.carePlan\\.endDate/i)\n+\n+ expect(columns[3]).toHaveTextContent(/patient\\.carePlan\\.status/i)\n+\n+ await waitFor(() => {\n+ expect(\n+ screen.getByRole('button', {\n+ name: /actions\\.view/i,\n+ }),\n+ ).toBeInTheDocument()\n+ })\n})\nit('should navigate to the care plan view when the view details button is clicked', async () => {\n- const { wrapper, history } = await setup()\n+ const { history } = await setup()\n- const tr = wrapper.find('tr').at(1)\n+ await screen.findByRole('table')\n- act(() => {\n- const onClick = tr.find('button').prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n+ const actionButton = await screen.findByRole('button', {\n+ name: /actions\\.view/i,\n})\n+ userEvent.click(actionButton)\n+\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}/care-plans/${carePlan.id}`)\n})\nit('should display a warning if there are no care plans', async () => {\n- const { wrapper } = await setup({ ...patient, carePlans: [] })\n+ await setup({ ...patient, carePlans: [] })\n- expect(wrapper.exists(Alert)).toBeTruthy()\n- const alert = wrapper.find(Alert)\n- expect(alert.prop('color')).toEqual('warning')\n- expect(alert.prop('title')).toEqual('patient.carePlans.warning.noCarePlans')\n- expect(alert.prop('message')).toEqual('patient.carePlans.warning.addCarePlanAbove')\n+ await waitFor(() => {\n+ expect(screen.getByText(/patient\\.carePlans\\.warning\\.noCarePlans/i)).toBeInTheDocument()\n+ })\n+\n+ await waitFor(() => {\n+ expect(screen.getByText(/patient\\.carePlans\\.warning\\.addCarePlanAbove/i)).toBeInTheDocument()\n+ })\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/CarePlanForm.test.tsx", "new_path": "src/__tests__/patients/care-plans/CarePlanForm.test.tsx", "diff": "-import { Alert } from '@hospitalrun/components'\n-import addDays from 'date-fns/addDays'\n-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\n+import { format } from 'date-fns'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport CarePlanForm from '../../../patients/care-plans/CarePlanForm'\nimport CarePlan, { CarePlanIntent, CarePlanStatus } from '../../../shared/model/CarePlan'\n@@ -19,6 +18,7 @@ describe('Care Plan Form', () => {\nabatementDate: new Date().toISOString(),\nstatus: DiagnosisStatus.Active,\nnote: 'some note',\n+ visit: 'some visit',\n}\nconst carePlan: CarePlan = {\nid: 'id',\n@@ -35,7 +35,8 @@ describe('Care Plan Form', () => {\nconst setup = (disabled = false, initializeCarePlan = true, error?: any) => {\nonCarePlanChangeSpy = jest.fn()\nconst mockPatient = { id: '123', diagnoses: [diagnosis] } as Patient\n- const wrapper = mount(\n+\n+ return render(\n<CarePlanForm\npatient={mockPatient}\nonChange={onCarePlanChangeSpy}\n@@ -44,226 +45,177 @@ describe('Care Plan Form', () => {\ncarePlanError={error}\n/>,\n)\n- return { wrapper }\n}\n- it('should render a title input', () => {\n- const { wrapper } = setup()\n-\n- const titleInput = wrapper.findWhere((w) => w.prop('name') === 'title')\n-\n- expect(titleInput).toHaveLength(1)\n- expect(titleInput.prop('patient.carePlan.title'))\n- expect(titleInput.prop('isRequired')).toBeTruthy()\n- expect(titleInput.prop('value')).toEqual(carePlan.title)\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n})\n- it('should call the on change handler when condition changes', () => {\n- const expectedNewTitle = 'some new title'\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const titleInput = wrapper.findWhere((w) => w.prop('name') === 'title')\n- const onChange = titleInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewTitle } })\n+ it('should render a title input', () => {\n+ setup()\n+ expect(screen.getByLabelText(/patient.carePlan.title/i)).toBeInTheDocument()\n+ expect(screen.getByLabelText(/patient.carePlan.title/i)).toHaveValue(carePlan.title)\n+ expect(screen.getByText(/patient.carePlan.title/i).title).toBe('This is a required input')\n})\n+ it('should call the on change handler when title changes', () => {\n+ const expectedNewTitle = 'some new title'\n+ setup(false, false)\n+ userEvent.type(screen.getByLabelText(/patient.carePlan.title/i), expectedNewTitle)\nexpect(onCarePlanChangeSpy).toHaveBeenCalledWith({ title: expectedNewTitle })\n})\nit('should render a description input', () => {\n- const { wrapper } = setup()\n-\n- const descriptionInput = wrapper.findWhere((w) => w.prop('name') === 'description')\n-\n- expect(descriptionInput).toHaveLength(1)\n- expect(descriptionInput.prop('patient.carePlan.description'))\n- expect(descriptionInput.prop('isRequired')).toBeTruthy()\n- expect(descriptionInput.prop('value')).toEqual(carePlan.description)\n+ setup()\n+ expect(screen.getByLabelText(/patient.carePlan.description/i)).toBeInTheDocument()\n+ expect(screen.getByLabelText(/patient.carePlan.description/i)).toHaveValue(carePlan.description)\n+ expect(screen.getByText(/patient.carePlan.description/i).title).toBe('This is a required input')\n})\n- it('should call the on change handler when condition changes', () => {\n+ it('should call the on change handler when description changes', () => {\nconst expectedNewDescription = 'some new description'\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const descriptionInput = wrapper.findWhere((w) => w.prop('name') === 'description')\n- const onChange = descriptionInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewDescription } })\n- })\n-\n+ setup(false, false)\n+ userEvent.paste(screen.getByLabelText(/patient.carePlan.description/i), expectedNewDescription)\nexpect(onCarePlanChangeSpy).toHaveBeenCalledWith({ description: expectedNewDescription })\n})\n- it('should render a condition selector with the diagnoses from the patient', () => {\n- const { wrapper } = setup()\n-\n- const conditionSelector = wrapper.findWhere((w) => w.prop('name') === 'condition')\n-\n- expect(conditionSelector).toHaveLength(1)\n- expect(conditionSelector.prop('patient.carePlan.condition'))\n- expect(conditionSelector.prop('isRequired')).toBeTruthy()\n- expect(conditionSelector.prop('defaultSelected')[0].value).toEqual(carePlan.diagnosisId)\n- expect(conditionSelector.prop('options')).toEqual([\n- { value: diagnosis.id, label: diagnosis.name },\n- ])\n+ it('should render a condition selector with the diagnoses from the patient', async () => {\n+ setup()\n+ const conditionSelector = screen.getByDisplayValue(diagnosis.name)\n+ const conditionSelectorLabel = screen.getByText(/patient.carePlan.condition/i)\n+ expect(conditionSelector).toBeInTheDocument()\n+ expect(conditionSelector).toHaveValue(diagnosis.name)\n+ expect(conditionSelectorLabel).toBeInTheDocument()\n+ expect(conditionSelectorLabel.title).toBe('This is a required input')\n})\n- it('should call the on change handler when condition changes', () => {\n- const expectedNewCondition = 'some new condition'\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const conditionSelector = wrapper.findWhere((w) => w.prop('name') === 'condition')\n- const onChange = conditionSelector.prop('onChange') as any\n- onChange([expectedNewCondition])\n- })\n-\n- expect(onCarePlanChangeSpy).toHaveBeenCalledWith({ diagnosisId: expectedNewCondition })\n+ it('should call the on change handler when condition changes', async () => {\n+ setup(false, false)\n+ const conditionSelector = screen.getAllByRole('combobox')[0]\n+ userEvent.type(conditionSelector, `${diagnosis.name}{arrowdown}{enter}`)\n+ expect(onCarePlanChangeSpy).toHaveBeenCalledWith({ diagnosisId: diagnosis.id })\n})\nit('should render a status selector', () => {\n- const { wrapper } = setup()\n-\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n-\n- expect(statusSelector).toHaveLength(1)\n- expect(statusSelector.prop('patient.carePlan.status'))\n- expect(statusSelector.prop('isRequired')).toBeTruthy()\n- expect(statusSelector.prop('defaultSelected')[0].value).toEqual(carePlan.status)\n- expect(statusSelector.prop('options')).toEqual(\n- Object.values(CarePlanStatus).map((v) => ({ label: v, value: v })),\n- )\n+ setup()\n+ const statusSelector = screen.getByDisplayValue(carePlan.status)\n+ const statusSelectorLabel = screen.getByText(/patient.carePlan.status/i)\n+ expect(statusSelector).toBeInTheDocument()\n+ expect(statusSelector).toHaveValue(carePlan.status)\n+ expect(statusSelectorLabel).toBeInTheDocument()\n+ expect(statusSelectorLabel.title).toBe('This is a required input')\n+ userEvent.click(statusSelector)\n+ const optionsList = screen\n+ .getAllByRole('listbox')\n+ .filter((item) => item.id === 'statusSelect')[0]\n+ const options = Array.prototype.map.call(optionsList.children, (li) => li.textContent)\n+ expect(options).toEqual(Object.values(CarePlanStatus).map((v) => v))\n})\nit('should call the on change handler when status changes', () => {\nconst expectedNewStatus = CarePlanStatus.Revoked\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const onChange = statusSelector.prop('onChange') as any\n- onChange([expectedNewStatus])\n- })\n-\n- expect(onCarePlanChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n+ setup()\n+ const statusSelector = screen.getByDisplayValue(carePlan.status)\n+ userEvent.click(statusSelector)\n+ userEvent.click(screen.getByText(expectedNewStatus))\n+ expect(onCarePlanChangeSpy).toHaveBeenCalledWith(\n+ expect.objectContaining({ status: expectedNewStatus }),\n+ )\n})\nit('should render an intent selector', () => {\n- const { wrapper } = setup()\n-\n- const intentSelector = wrapper.findWhere((w) => w.prop('name') === 'intent')\n-\n- expect(intentSelector).toHaveLength(1)\n- expect(intentSelector.prop('patient.carePlan.intent'))\n- expect(intentSelector.prop('isRequired')).toBeTruthy()\n- expect(intentSelector.prop('defaultSelected')[0].value).toEqual(carePlan.intent)\n- expect(intentSelector.prop('options')).toEqual(\n- Object.values(CarePlanIntent).map((v) => ({ label: v, value: v })),\n- )\n+ setup()\n+ const intentSelector = screen.getByDisplayValue(carePlan.intent)\n+ const intentSelectorLabel = screen.getByText(/patient.carePlan.intent/i)\n+ expect(intentSelector).toBeInTheDocument()\n+ expect(intentSelector).toHaveValue(carePlan.intent)\n+ expect(intentSelectorLabel).toBeInTheDocument()\n+ expect(intentSelectorLabel.title).toBe('This is a required input')\n+ userEvent.click(intentSelector)\n+ const optionsList = screen\n+ .getAllByRole('listbox')\n+ .filter((item) => item.id === 'intentSelect')[0]\n+ const options = Array.prototype.map.call(optionsList.children, (li) => li.textContent)\n+ expect(options).toEqual(Object.values(CarePlanIntent).map((v) => v))\n})\nit('should call the on change handler when intent changes', () => {\nconst newIntent = CarePlanIntent.Proposal\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const intentSelector = wrapper.findWhere((w) => w.prop('name') === 'intent')\n- const onChange = intentSelector.prop('onChange') as any\n- onChange([newIntent])\n- })\n-\n- expect(onCarePlanChangeSpy).toHaveBeenCalledWith({ intent: newIntent })\n+ setup()\n+ const intentSelector = screen.getByDisplayValue(carePlan.intent)\n+ userEvent.click(intentSelector)\n+ userEvent.click(screen.getByText(newIntent))\n+ expect(onCarePlanChangeSpy).toHaveBeenCalledWith(expect.objectContaining({ intent: newIntent }))\n})\nit('should render a start date picker', () => {\n- const { wrapper } = setup()\n-\n- const startDatePicker = wrapper.findWhere((w) => w.prop('name') === 'startDate')\n-\n- expect(startDatePicker).toHaveLength(1)\n- expect(startDatePicker.prop('patient.carePlan.startDate'))\n- expect(startDatePicker.prop('isRequired')).toBeTruthy()\n- expect(startDatePicker.prop('value')).toEqual(new Date(carePlan.startDate))\n+ setup()\n+ const date = format(new Date(carePlan.startDate), 'MM/dd/yyyy')\n+ const startDatePicker = screen.getAllByDisplayValue(date)[0]\n+ const startDatePickerLabel = screen.getByText(/patient.carePlan.startDate/i)\n+ expect(startDatePicker).toBeInTheDocument()\n+ expect(startDatePicker).toHaveValue(date)\n+ expect(startDatePickerLabel).toBeInTheDocument()\n+ expect(startDatePickerLabel.title).toBe('This is a required input')\n})\nit('should call the on change handler when start date changes', () => {\n- const expectedNewStartDate = addDays(1, new Date().getDate())\n- const { wrapper } = setup(false, false)\n-\n- const startDatePicker = wrapper.findWhere((w) => w.prop('name') === 'startDate')\n- act(() => {\n- const onChange = startDatePicker.prop('onChange') as any\n- onChange(expectedNewStartDate)\n- })\n-\n- expect(onCarePlanChangeSpy).toHaveBeenCalledWith({\n- startDate: expectedNewStartDate.toISOString(),\n- })\n+ setup()\n+ const startDatePicker = screen.getAllByDisplayValue(\n+ format(new Date(carePlan.startDate), 'MM/dd/yyyy'),\n+ )[0]\n+ userEvent.type(startDatePicker, '{arrowdown}{arrowleft}{enter}')\n+ expect(onCarePlanChangeSpy).toHaveBeenCalledTimes(1)\n})\nit('should render an end date picker', () => {\n- const { wrapper } = setup()\n-\n- const endDatePicker = wrapper.findWhere((w) => w.prop('name') === 'endDate')\n-\n- expect(endDatePicker).toHaveLength(1)\n- expect(endDatePicker.prop('patient.carePlan.endDate'))\n- expect(endDatePicker.prop('isRequired')).toBeTruthy()\n- expect(endDatePicker.prop('value')).toEqual(new Date(carePlan.endDate))\n+ setup()\n+ const date = format(new Date(carePlan.endDate), 'MM/dd/yyyy')\n+ const endDatePicker = screen.getAllByDisplayValue(date)[0]\n+ const endDatePickerLabel = screen.getByText(/patient.carePlan.endDate/i)\n+ expect(endDatePicker).toBeInTheDocument()\n+ expect(endDatePicker).toHaveValue(date)\n+ expect(endDatePickerLabel).toBeInTheDocument()\n+ expect(endDatePickerLabel.title).toBe('This is a required input')\n})\nit('should call the on change handler when end date changes', () => {\n- const expectedNewEndDate = addDays(1, new Date().getDate())\n- const { wrapper } = setup(false, false)\n-\n- const endDatePicker = wrapper.findWhere((w) => w.prop('name') === 'endDate')\n- act(() => {\n- const onChange = endDatePicker.prop('onChange') as any\n- onChange(expectedNewEndDate)\n- })\n-\n- expect(onCarePlanChangeSpy).toHaveBeenCalledWith({\n- endDate: expectedNewEndDate.toISOString(),\n- })\n+ setup()\n+ const endDatePicker = screen.getAllByDisplayValue(\n+ format(new Date(carePlan.endDate), 'MM/dd/yyyy'),\n+ )[0]\n+ userEvent.type(endDatePicker, '{arrowdown}{arrowleft}{enter}')\n+ expect(onCarePlanChangeSpy).toHaveBeenCalledTimes(1)\n})\nit('should render a note input', () => {\n- const { wrapper } = setup()\n-\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n- expect(noteInput).toHaveLength(1)\n- expect(noteInput.prop('patient.carePlan.note'))\n- expect(noteInput.prop('value')).toEqual(carePlan.note)\n+ setup()\n+ const noteInput = screen.getByLabelText(/patient.carePlan.note/i)\n+ expect(noteInput).toBeInTheDocument()\n+ expect(noteInput).toHaveTextContent(carePlan.note)\n})\nit('should call the on change handler when note changes', () => {\nconst expectedNewNote = 'some new note'\n- const { wrapper } = setup(false, false)\n-\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n- act(() => {\n- const onChange = noteInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewNote } })\n- })\n-\n+ setup(false, false)\n+ const noteInput = screen.getByLabelText(/patient.carePlan.note/i)\n+ userEvent.paste(noteInput, expectedNewNote)\nexpect(onCarePlanChangeSpy).toHaveBeenCalledWith({ note: expectedNewNote })\n})\nit('should render all of the fields as disabled if the form is disabled', () => {\n- const { wrapper } = setup(true)\n- const titleInput = wrapper.findWhere((w) => w.prop('name') === 'title')\n- const descriptionInput = wrapper.findWhere((w) => w.prop('name') === 'description')\n- const conditionSelector = wrapper.findWhere((w) => w.prop('name') === 'condition')\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const intentSelector = wrapper.findWhere((w) => w.prop('name') === 'intent')\n- const startDatePicker = wrapper.findWhere((w) => w.prop('name') === 'startDate')\n- const endDatePicker = wrapper.findWhere((w) => w.prop('name') === 'endDate')\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n-\n- expect(titleInput.prop('isEditable')).toBeFalsy()\n- expect(descriptionInput.prop('isEditable')).toBeFalsy()\n- expect(conditionSelector.prop('isEditable')).toBeFalsy()\n- expect(statusSelector.prop('isEditable')).toBeFalsy()\n- expect(intentSelector.prop('isEditable')).toBeFalsy()\n- expect(startDatePicker.prop('isEditable')).toBeFalsy()\n- expect(endDatePicker.prop('isEditable')).toBeFalsy()\n- expect(noteInput.prop('isEditable')).toBeFalsy()\n+ setup(true)\n+ expect(screen.getByLabelText(/patient.carePlan.title/i)).toBeDisabled()\n+ expect(screen.getByLabelText(/patient.carePlan.description/i)).toBeDisabled()\n+ // condition\n+ expect(screen.getByDisplayValue(diagnosis.name)).toBeDisabled()\n+ expect(screen.getByDisplayValue(carePlan.status)).toBeDisabled()\n+ expect(screen.getByDisplayValue(carePlan.intent)).toBeDisabled()\n+ const startDate = format(new Date(carePlan.startDate), 'MM/dd/yyyy')\n+ expect(screen.getAllByDisplayValue(startDate)[0]).toBeDisabled()\n+ const endDate = format(new Date(carePlan.endDate), 'MM/dd/yyyy')\n+ expect(screen.getAllByDisplayValue(endDate)[0]).toBeDisabled()\n+ expect(screen.getByLabelText(/patient.carePlan.note/i)).toBeDisabled()\n})\nit('should render the form fields in an error state', () => {\n@@ -278,44 +230,41 @@ describe('Care Plan Form', () => {\nnote: 'some note error',\ncondition: 'some condition error',\n}\n-\n- const { wrapper } = setup(false, false, expectedError)\n-\n- const alert = wrapper.find(Alert)\n- const titleInput = wrapper.findWhere((w) => w.prop('name') === 'title')\n- const descriptionInput = wrapper.findWhere((w) => w.prop('name') === 'description')\n- const conditionSelector = wrapper.findWhere((w) => w.prop('name') === 'condition')\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const intentSelector = wrapper.findWhere((w) => w.prop('name') === 'intent')\n- const startDatePicker = wrapper.findWhere((w) => w.prop('name') === 'startDate')\n- const endDatePicker = wrapper.findWhere((w) => w.prop('name') === 'endDate')\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n-\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('message')).toEqual(expectedError.message)\n-\n- expect(titleInput.prop('isInvalid')).toBeTruthy()\n- expect(titleInput.prop('feedback')).toEqual(expectedError.title)\n-\n- expect(descriptionInput.prop('isInvalid')).toBeTruthy()\n- expect(descriptionInput.prop('feedback')).toEqual(expectedError.description)\n-\n- expect(conditionSelector.prop('isInvalid')).toBeTruthy()\n- // expect(conditionSelector.prop('feedback')).toEqual(expectedError.condition)\n-\n- expect(statusSelector.prop('isInvalid')).toBeTruthy()\n- // expect(statusSelector.prop('feedback')).toEqual(expectedError.status)\n-\n- expect(intentSelector.prop('isInvalid')).toBeTruthy()\n- // expect(intentSelector.prop('feedback')).toEqual(expectedError.intent)\n-\n- expect(startDatePicker.prop('isInvalid')).toBeTruthy()\n- expect(startDatePicker.prop('feedback')).toEqual(expectedError.startDate)\n-\n- expect(endDatePicker.prop('isInvalid')).toBeTruthy()\n- expect(endDatePicker.prop('feedback')).toEqual(expectedError.endDate)\n-\n- expect(noteInput.prop('isInvalid')).toBeTruthy()\n- expect(noteInput.prop('feedback')).toEqual(expectedError.note)\n+ setup(false, false, expectedError)\n+ const alert = screen.getByRole('alert')\n+ const titleInput = screen.getByLabelText(/patient.carePlan.title/i)\n+ const descriptionInput = screen.getByLabelText(/patient.carePlan.description/i)\n+ const conditionInput = screen.getAllByRole('combobox')[0]\n+ const statusInput = screen.getAllByRole('combobox')[1]\n+ const intentInput = screen.getAllByRole('combobox')[2]\n+ const startDate = format(new Date(carePlan.startDate), 'MM/dd/yyyy')\n+ const startDateInput = screen.getAllByDisplayValue(startDate)[0]\n+ const endDate = format(new Date(carePlan.endDate), 'MM/dd/yyyy')\n+ const endDateInput = screen.getAllByDisplayValue(endDate)[0]\n+ const noteInput = screen.getByLabelText(/patient.carePlan.note/i)\n+ expect(alert).toBeInTheDocument()\n+ expect(alert).toHaveTextContent(expectedError.message)\n+ expect(titleInput).toHaveClass('is-invalid')\n+ expect(titleInput.nextSibling).toHaveTextContent(expectedError.title)\n+ expect(descriptionInput).toHaveClass('is-invalid')\n+ expect(descriptionInput.nextSibling).toHaveTextContent(expectedError.description)\n+ expect(conditionInput).toHaveClass('is-invalid')\n+ // expect(conditionInput.nextSibling).toHaveTextContent(\n+ // expectedError.condition,\n+ // )\n+ expect(statusInput).toHaveClass('is-invalid')\n+ // expect(statusInput.nextSibling).toHaveTextContent(\n+ // expectedError.status,\n+ // )\n+ expect(intentInput).toHaveClass('is-invalid')\n+ // expect(intentInput.nextSibling).toHaveTextContent(\n+ // expectedError.intent,\n+ // )\n+ expect(startDateInput).toHaveClass('is-invalid')\n+ expect(screen.getByText(expectedError.startDate)).toBeInTheDocument()\n+ expect(endDateInput).toHaveClass('is-invalid')\n+ expect(screen.getByText(expectedError.endDate)).toBeInTheDocument()\n+ expect(noteInput).toHaveClass('is-invalid')\n+ expect(noteInput.nextSibling).toHaveTextContent(expectedError.note)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/ViewVisit.test.tsx", "new_path": "src/__tests__/patients/visits/ViewVisit.test.tsx", "diff": "-import { mount, ReactWrapper } from 'enzyme'\n+import { screen, render, waitFor } from '@testing-library/react'\n+import { format } from 'date-fns'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Route, Router } from 'react-router-dom'\nimport ViewVisit from '../../../patients/visits/ViewVisit'\nimport VisitForm from '../../../patients/visits/VisitForm'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\n+import Visit, { VisitStatus } from '../../../shared/model/Visit'\ndescribe('View Visit', () => {\n+ const visit: Visit = {\n+ id: '123',\n+ startDateTime: new Date().toISOString(),\n+ endDateTime: new Date().toISOString(),\n+ type: 'emergency',\n+ status: VisitStatus.Arrived,\n+ reason: 'routine visit',\n+ location: 'main',\n+ } as Visit\nconst patient = {\nid: 'patientId',\n- visits: [{ id: '123', reason: 'reason for visit' }],\n+ visits: [visit],\n} as Patient\n- const setup = async () => {\n+ const setup = () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/visits/${patient.visits[0].id}`)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Route path=\"/patients/:id/visits/:visitId\">\n<ViewVisit patientId={patient.id} />\n</Route>\n</Router>,\n)\n- })\n-\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper }\n}\nit('should render the visit reason', async () => {\n- const { wrapper } = await setup()\n+ setup()\n- expect(wrapper.find('h2').text()).toEqual(patient.visits[0].reason)\n+ await waitFor(() => {\n+ expect(screen.getByRole('heading', { name: patient.visits[0].reason })).toBeInTheDocument()\n+ })\n})\nit('should render a visit form with the correct data', async () => {\n- const { wrapper } = await setup()\n+ const { container } = setup()\n- const visitForm = wrapper.find(VisitForm)\n- expect(visitForm).toHaveLength(1)\n- expect(visitForm.prop('visit')).toEqual(patient.visits[0])\n+ await waitFor(() => {\n+ expect(container.querySelector('form')).toBeInTheDocument()\n+ })\n+\n+ const startDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[0]\n+ const endDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[1]\n+ const typeInput = screen.getByPlaceholderText(/patient.visits.type/i)\n+ const statusSelector = screen.getByPlaceholderText('-- Choose --')\n+ const reasonInput = screen.getAllByRole('textbox')[3]\n+ const locationInput = screen.getByPlaceholderText(/patient.visits.location/i)\n+\n+ expect(startDateTimePicker).toHaveDisplayValue(\n+ format(new Date(visit.startDateTime), 'MM/dd/yyyy h:mm aa'),\n+ )\n+ expect(endDateTimePicker).toHaveDisplayValue(\n+ format(new Date(visit.endDateTime), 'MM/dd/yyyy h:mm aa'),\n+ )\n+ expect(typeInput).toHaveDisplayValue(visit.type)\n+ expect(statusSelector).toHaveDisplayValue(visit.status)\n+ expect(reasonInput).toHaveDisplayValue(visit.reason)\n+ expect(locationInput).toHaveDisplayValue(visit.location)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "new_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "diff": "import { Alert } from '@hospitalrun/components'\n+import { screen, render } from '@testing-library/react'\nimport addDays from 'date-fns/addDays'\n-import { mount } from 'enzyme'\nimport React from 'react'\nimport { act } from 'react-dom/test-utils'\n@@ -22,7 +22,7 @@ describe('Visit Form', () => {\nconst setup = (disabled = false, initializeVisit = true, error?: any) => {\nonVisitChangeSpy = jest.fn()\nconst mockPatient = { id: '123' } as Patient\n- const wrapper = mount(\n+ return render(\n<VisitForm\npatient={mockPatient}\nonChange={onVisitChangeSpy}\n@@ -31,170 +31,169 @@ describe('Visit Form', () => {\nvisitError={error}\n/>,\n)\n- return { wrapper }\n}\nit('should render a start date picker', () => {\n- const { wrapper } = setup()\n+ setup()\n- const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n+ // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n- expect(startDateTimePicker).toHaveLength(1)\n- expect(startDateTimePicker.prop('patient.visit.startDateTime'))\n- expect(startDateTimePicker.prop('isRequired')).toBeTruthy()\n- expect(startDateTimePicker.prop('value')).toEqual(new Date(visit.startDateTime))\n+ // expect(startDateTimePicker).toHaveLength(1)\n+ // expect(startDateTimePicker.prop('patient.visit.startDateTime'))\n+ // expect(startDateTimePicker.prop('isRequired')).toBeTruthy()\n+ // expect(startDateTimePicker.prop('value')).toEqual(new Date(visit.startDateTime))\n})\nit('should call the on change handler when start date changes', () => {\nconst expectedNewStartDateTime = addDays(1, new Date().getDate())\n- const { wrapper } = setup(false, false)\n+ setup(false, false)\n- const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n- act(() => {\n- const onChange = startDateTimePicker.prop('onChange') as any\n- onChange(expectedNewStartDateTime)\n- })\n+ // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n+ // act(() => {\n+ // const onChange = startDateTimePicker.prop('onChange') as any\n+ // onChange(expectedNewStartDateTime)\n+ // })\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({\n- startDateTime: expectedNewStartDateTime.toISOString(),\n- })\n+ // expect(onVisitChangeSpy).toHaveBeenCalledWith({\n+ // startDateTime: expectedNewStartDateTime.toISOString(),\n+ // })\n})\nit('should render an end date picker', () => {\n- const { wrapper } = setup()\n+ setup()\n- const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n+ // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n- expect(endDateTimePicker).toHaveLength(1)\n- expect(endDateTimePicker.prop('patient.visit.endDateTime'))\n- expect(endDateTimePicker.prop('isRequired')).toBeTruthy()\n- expect(endDateTimePicker.prop('value')).toEqual(new Date(visit.endDateTime))\n+ // expect(endDateTimePicker).toHaveLength(1)\n+ // expect(endDateTimePicker.prop('patient.visit.endDateTime'))\n+ // expect(endDateTimePicker.prop('isRequired')).toBeTruthy()\n+ // expect(endDateTimePicker.prop('value')).toEqual(new Date(visit.endDateTime))\n})\nit('should call the on change handler when end date changes', () => {\nconst expectedNewEndDateTime = addDays(1, new Date().getDate())\n- const { wrapper } = setup(false, false)\n+ setup(false, false)\n- const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n- act(() => {\n- const onChange = endDateTimePicker.prop('onChange') as any\n- onChange(expectedNewEndDateTime)\n- })\n+ // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n+ // act(() => {\n+ // const onChange = endDateTimePicker.prop('onChange') as any\n+ // onChange(expectedNewEndDateTime)\n+ // })\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({\n- endDateTime: expectedNewEndDateTime.toISOString(),\n- })\n+ // expect(onVisitChangeSpy).toHaveBeenCalledWith({\n+ // endDateTime: expectedNewEndDateTime.toISOString(),\n+ // })\n})\nit('should render a type input', () => {\n- const { wrapper } = setup()\n+ setup()\n- const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- expect(typeInput).toHaveLength(1)\n- expect(typeInput.prop('patient.visit.type'))\n- expect(typeInput.prop('value')).toEqual(visit.type)\n+ // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n+ // expect(typeInput).toHaveLength(1)\n+ // expect(typeInput.prop('patient.visit.type'))\n+ // expect(typeInput.prop('value')).toEqual(visit.type)\n})\nit('should call the on change handler when type changes', () => {\nconst expectedNewType = 'some new type'\n- const { wrapper } = setup(false, false)\n+ setup(false, false)\n- const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- act(() => {\n- const onChange = typeInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewType } })\n- })\n+ // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n+ // act(() => {\n+ // const onChange = typeInput.prop('onChange') as any\n+ // onChange({ currentTarget: { value: expectedNewType } })\n+ // })\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({ type: expectedNewType })\n+ // expect(onVisitChangeSpy).toHaveBeenCalledWith({ type: expectedNewType })\n})\nit('should render a status selector', () => {\n- const { wrapper } = setup()\n+ setup()\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n+ // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- expect(statusSelector).toHaveLength(1)\n- expect(statusSelector.prop('patient.visit.status'))\n- expect(statusSelector.prop('isRequired')).toBeTruthy()\n- expect(statusSelector.prop('defaultSelected')[0].value).toEqual(visit.status)\n- expect(statusSelector.prop('options')).toEqual(\n- Object.values(VisitStatus).map((v) => ({ label: v, value: v })),\n- )\n+ // expect(statusSelector).toHaveLength(1)\n+ // expect(statusSelector.prop('patient.visit.status'))\n+ // expect(statusSelector.prop('isRequired')).toBeTruthy()\n+ // expect(statusSelector.prop('defaultSelected')[0].value).toEqual(visit.status)\n+ // expect(statusSelector.prop('options')).toEqual(\n+ // Object.values(VisitStatus).map((v) => ({ label: v, value: v })),\n+ // )\n})\nit('should call the on change handler when status changes', () => {\nconst expectedNewStatus = VisitStatus.Finished\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const onChange = statusSelector.prop('onChange') as any\n- onChange([expectedNewStatus])\n- })\n+ setup(false, false)\n+ // act(() => {\n+ // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n+ // const onChange = statusSelector.prop('onChange') as any\n+ // onChange([expectedNewStatus])\n+ // })\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n+ // expect(onVisitChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n})\nit('should render a reason input', () => {\n- const { wrapper } = setup()\n+ setup()\n- const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n+ // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- expect(reasonInput).toHaveLength(1)\n- expect(reasonInput.prop('patient.visit.reason'))\n- expect(reasonInput.prop('isRequired')).toBeTruthy()\n- expect(reasonInput.prop('value')).toEqual(visit.reason)\n+ // expect(reasonInput).toHaveLength(1)\n+ // expect(reasonInput.prop('patient.visit.reason'))\n+ // expect(reasonInput.prop('isRequired')).toBeTruthy()\n+ // expect(reasonInput.prop('value')).toEqual(visit.reason)\n})\nit('should call the on change handler when reason changes', () => {\nconst expectedNewReason = 'some new reason'\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- const onChange = reasonInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewReason } })\n- })\n+ setup(false, false)\n+ // act(() => {\n+ // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n+ // const onChange = reasonInput.prop('onChange') as any\n+ // onChange({ currentTarget: { value: expectedNewReason } })\n+ // })\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({ reason: expectedNewReason })\n+ // expect(onVisitChangeSpy).toHaveBeenCalledWith({ reason: expectedNewReason })\n})\nit('should render a location input', () => {\n- const { wrapper } = setup()\n+ setup()\n- const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n+ // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n- expect(locationInput).toHaveLength(1)\n- expect(locationInput.prop('patient.visit.location'))\n- expect(locationInput.prop('isRequired')).toBeTruthy()\n- expect(locationInput.prop('value')).toEqual(visit.location)\n+ // expect(locationInput).toHaveLength(1)\n+ // expect(locationInput.prop('patient.visit.location'))\n+ // expect(locationInput.prop('isRequired')).toBeTruthy()\n+ // expect(locationInput.prop('value')).toEqual(visit.location)\n})\nit('should call the on change handler when location changes', () => {\nconst expectedNewLocation = 'some new location'\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n- const onChange = locationInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewLocation } })\n- })\n+ setup(false, false)\n+ // act(() => {\n+ // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n+ // const onChange = locationInput.prop('onChange') as any\n+ // onChange({ currentTarget: { value: expectedNewLocation } })\n+ // })\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({ location: expectedNewLocation })\n+ // expect(onVisitChangeSpy).toHaveBeenCalledWith({ location: expectedNewLocation })\n})\nit('should render all of the fields as disabled if the form is disabled', () => {\n- const { wrapper } = setup(true)\n- const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n- const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n- const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n-\n- expect(startDateTimePicker.prop('isEditable')).toBeFalsy()\n- expect(endDateTimePicker.prop('isEditable')).toBeFalsy()\n- expect(typeInput.prop('isEditable')).toBeFalsy()\n- expect(statusSelector.prop('isEditable')).toBeFalsy()\n- expect(reasonInput.prop('isEditable')).toBeFalsy()\n- expect(locationInput.prop('isEditable')).toBeFalsy()\n+ setup(true)\n+ // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n+ // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n+ // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n+ // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n+ // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n+ // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n+\n+ // expect(startDateTimePicker.prop('isEditable')).toBeFalsy()\n+ // expect(endDateTimePicker.prop('isEditable')).toBeFalsy()\n+ // expect(typeInput.prop('isEditable')).toBeFalsy()\n+ // expect(statusSelector.prop('isEditable')).toBeFalsy()\n+ // expect(reasonInput.prop('isEditable')).toBeFalsy()\n+ // expect(locationInput.prop('isEditable')).toBeFalsy()\n})\nit('should render the form fields in an error state', () => {\n@@ -208,34 +207,34 @@ describe('Visit Form', () => {\nlocation: 'location error',\n}\n- const { wrapper } = setup(false, false, expectedError)\n+ setup(false, false, expectedError)\n- const alert = wrapper.find(Alert)\n- const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n- const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n- const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n+ // const alert = wrapper.find(Alert)\n+ // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n+ // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n+ // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n+ // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n+ // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n+ // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('message')).toEqual(expectedError.message)\n+ // expect(alert).toHaveLength(1)\n+ // expect(alert.prop('message')).toEqual(expectedError.message)\n- expect(startDateTimePicker.prop('isInvalid')).toBeTruthy()\n- expect(startDateTimePicker.prop('feedback')).toEqual(expectedError.startDateTime)\n+ // expect(startDateTimePicker.prop('isInvalid')).toBeTruthy()\n+ // expect(startDateTimePicker.prop('feedback')).toEqual(expectedError.startDateTime)\n- expect(endDateTimePicker.prop('isInvalid')).toBeTruthy()\n- expect(endDateTimePicker.prop('feedback')).toEqual(expectedError.endDateTime)\n+ // expect(endDateTimePicker.prop('isInvalid')).toBeTruthy()\n+ // expect(endDateTimePicker.prop('feedback')).toEqual(expectedError.endDateTime)\n- expect(typeInput.prop('isInvalid')).toBeTruthy()\n- expect(typeInput.prop('feedback')).toEqual(expectedError.type)\n+ // expect(typeInput.prop('isInvalid')).toBeTruthy()\n+ // expect(typeInput.prop('feedback')).toEqual(expectedError.type)\n- expect(statusSelector.prop('isInvalid')).toBeTruthy()\n+ // expect(statusSelector.prop('isInvalid')).toBeTruthy()\n- expect(reasonInput.prop('isInvalid')).toBeTruthy()\n- expect(reasonInput.prop('feedback')).toEqual(expectedError.reason)\n+ // expect(reasonInput.prop('isInvalid')).toBeTruthy()\n+ // expect(reasonInput.prop('feedback')).toEqual(expectedError.reason)\n- expect(locationInput.prop('isInvalid')).toBeTruthy()\n- expect(locationInput.prop('feedback')).toEqual(expectedError.location)\n+ // expect(locationInput.prop('isInvalid')).toBeTruthy()\n+ // expect(locationInput.prop('feedback')).toEqual(expectedError.location)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "new_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "diff": "-import { Alert } from '@hospitalrun/components'\n-import { screen, render } from '@testing-library/react'\n-import addDays from 'date-fns/addDays'\n+import { fireEvent, screen, render, within } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\n+import { format } from 'date-fns'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\n+import selectEvent from 'react-select-event'\nimport VisitForm from '../../../patients/visits/VisitForm'\nimport Patient from '../../../shared/model/Patient'\n@@ -18,7 +18,8 @@ describe('Visit Form', () => {\nstatus: VisitStatus.Arrived,\nreason: 'routine visit',\nlocation: 'main',\n- }\n+ } as Visit\n+\nconst setup = (disabled = false, initializeVisit = true, error?: any) => {\nonVisitChangeSpy = jest.fn()\nconst mockPatient = { id: '123' } as Patient\n@@ -34,166 +35,210 @@ describe('Visit Form', () => {\n}\nit('should render a start date picker', () => {\n- setup()\n+ const { container } = setup()\n- // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n-\n- // expect(startDateTimePicker).toHaveLength(1)\n- // expect(startDateTimePicker.prop('patient.visit.startDateTime'))\n- // expect(startDateTimePicker.prop('isRequired')).toBeTruthy()\n- // expect(startDateTimePicker.prop('value')).toEqual(new Date(visit.startDateTime))\n+ const startDateLabel = screen.getByText(/patient.visits.startdatetime/i)\n+ expect(startDateLabel).toBeInTheDocument()\n+ const requiredIcon = within(startDateLabel).getByRole('img', {\n+ hidden: true,\n+ })\n+ expect(requiredIcon).toBeInTheDocument()\n+ expect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\n+\n+ const startDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[0]\n+ expect(startDateTimePicker).toBeInTheDocument()\n+ expect(startDateTimePicker).toHaveDisplayValue(\n+ format(new Date(visit.startDateTime), 'MM/dd/yyyy h:mm aa'),\n+ )\n})\n- it('should call the on change handler when start date changes', () => {\n- const expectedNewStartDateTime = addDays(1, new Date().getDate())\n- setup(false, false)\n+ it('should call the on change handler when start date changes', async () => {\n+ const expectedNewStartDateTime = new Date('01/01/2021 2:56 PM')\n+ const { container } = setup(false, false)\n- // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n- // act(() => {\n- // const onChange = startDateTimePicker.prop('onChange') as any\n- // onChange(expectedNewStartDateTime)\n- // })\n+ const startDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[0]\n+ fireEvent.change(startDateTimePicker, {\n+ target: { value: expectedNewStartDateTime },\n+ })\n- // expect(onVisitChangeSpy).toHaveBeenCalledWith({\n- // startDateTime: expectedNewStartDateTime.toISOString(),\n- // })\n+ expect(onVisitChangeSpy).toHaveBeenCalledWith({\n+ startDateTime: expectedNewStartDateTime.toISOString(),\n+ })\n})\nit('should render an end date picker', () => {\n- setup()\n-\n- // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n+ const { container } = setup()\n- // expect(endDateTimePicker).toHaveLength(1)\n- // expect(endDateTimePicker.prop('patient.visit.endDateTime'))\n- // expect(endDateTimePicker.prop('isRequired')).toBeTruthy()\n- // expect(endDateTimePicker.prop('value')).toEqual(new Date(visit.endDateTime))\n+ const endDateLabel = screen.getByText(/patient.visits.enddatetime/i)\n+ expect(endDateLabel).toBeInTheDocument()\n+ const requiredIcon = within(endDateLabel).getByRole('img', {\n+ hidden: true,\n+ })\n+ expect(requiredIcon).toBeInTheDocument()\n+ expect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\n+\n+ const endDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[1]\n+ expect(endDateTimePicker).toBeInTheDocument()\n+ expect(endDateTimePicker).toHaveDisplayValue(\n+ format(new Date(visit.endDateTime), 'MM/dd/yyyy h:mm aa'),\n+ )\n})\nit('should call the on change handler when end date changes', () => {\n- const expectedNewEndDateTime = addDays(1, new Date().getDate())\n- setup(false, false)\n-\n- // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n- // act(() => {\n- // const onChange = endDateTimePicker.prop('onChange') as any\n- // onChange(expectedNewEndDateTime)\n- // })\n+ const expectedNewEndDateTime = new Date('01/01/2021 2:56 PM')\n+ const { container } = setup(false, false)\n+\n+ const endDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[1]\n+ userEvent.type(endDateTimePicker, format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa'))\n+ expect(endDateTimePicker).toHaveDisplayValue(\n+ format(new Date(expectedNewEndDateTime), 'MM/dd/yyyy h:mm aa'),\n+ )\n+ fireEvent.change(endDateTimePicker, {\n+ target: { value: expectedNewEndDateTime },\n+ })\n- // expect(onVisitChangeSpy).toHaveBeenCalledWith({\n- // endDateTime: expectedNewEndDateTime.toISOString(),\n- // })\n+ expect(onVisitChangeSpy).toHaveBeenCalledWith({\n+ endDateTime: expectedNewEndDateTime.toISOString(),\n+ })\n})\nit('should render a type input', () => {\nsetup()\n- // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- // expect(typeInput).toHaveLength(1)\n- // expect(typeInput.prop('patient.visit.type'))\n- // expect(typeInput.prop('value')).toEqual(visit.type)\n+ const typeLabel = screen.getByText(/patient.visits.type/i)\n+ expect(typeLabel).toBeInTheDocument()\n+\n+ const typeInput = screen.getByPlaceholderText(/patient.visits.type/i)\n+ expect(typeInput).toBeInTheDocument()\n+\n+ expect(typeInput).toHaveDisplayValue(visit.type)\n})\nit('should call the on change handler when type changes', () => {\nconst expectedNewType = 'some new type'\nsetup(false, false)\n- // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- // act(() => {\n- // const onChange = typeInput.prop('onChange') as any\n- // onChange({ currentTarget: { value: expectedNewType } })\n- // })\n+ const typeInput = screen.getByPlaceholderText(/patient.visits.type/i)\n+ userEvent.type(typeInput, expectedNewType)\n+\n+ expect(typeInput).toHaveDisplayValue(expectedNewType)\n- // expect(onVisitChangeSpy).toHaveBeenCalledWith({ type: expectedNewType })\n+ expect(onVisitChangeSpy).toHaveBeenCalledWith({ type: expectedNewType })\n})\nit('should render a status selector', () => {\nsetup()\n- // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n+ const statusLabel = screen.getByText(/patient.visits.status/i)\n+ expect(statusLabel).toBeInTheDocument()\n- // expect(statusSelector).toHaveLength(1)\n- // expect(statusSelector.prop('patient.visit.status'))\n- // expect(statusSelector.prop('isRequired')).toBeTruthy()\n- // expect(statusSelector.prop('defaultSelected')[0].value).toEqual(visit.status)\n- // expect(statusSelector.prop('options')).toEqual(\n- // Object.values(VisitStatus).map((v) => ({ label: v, value: v })),\n- // )\n+ const requiredIcon = within(statusLabel).getByRole('img', {\n+ hidden: true,\n})\n+ expect(requiredIcon).toBeInTheDocument()\n+ expect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\n- it('should call the on change handler when status changes', () => {\n+ const statusSelector = screen.getByPlaceholderText('-- Choose --')\n+ expect(statusSelector).toBeInTheDocument()\n+\n+ expect(statusSelector).toHaveDisplayValue(visit.status)\n+\n+ selectEvent.openMenu(statusSelector)\n+ Object.values(VisitStatus).forEach((status) => {\n+ expect(screen.getByRole('option', { name: status })).toBeInTheDocument()\n+ })\n+ })\n+\n+ it('should call the on change handler when status changes', async () => {\nconst expectedNewStatus = VisitStatus.Finished\nsetup(false, false)\n- // act(() => {\n- // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- // const onChange = statusSelector.prop('onChange') as any\n- // onChange([expectedNewStatus])\n- // })\n- // expect(onVisitChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n+ const statusInput = screen.getByPlaceholderText('-- Choose --')\n+\n+ await selectEvent.select(statusInput, expectedNewStatus)\n+\n+ expect(onVisitChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n})\nit('should render a reason input', () => {\nsetup()\n+ const reasonLabel = screen.getByText(/patient.visits.reason/i)\n+ expect(reasonLabel).toBeInTheDocument()\n- // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n+ const requiredIcon = within(reasonLabel).getByRole('img', {\n+ hidden: true,\n+ })\n+ expect(requiredIcon).toBeInTheDocument()\n+ expect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\n- // expect(reasonInput).toHaveLength(1)\n- // expect(reasonInput.prop('patient.visit.reason'))\n- // expect(reasonInput.prop('isRequired')).toBeTruthy()\n- // expect(reasonInput.prop('value')).toEqual(visit.reason)\n+ const reasonInput = screen.getAllByRole('textbox')[3]\n+ expect(reasonInput).toBeInTheDocument()\n+\n+ expect(reasonInput).toHaveDisplayValue(visit.reason)\n})\nit('should call the on change handler when reason changes', () => {\nconst expectedNewReason = 'some new reason'\nsetup(false, false)\n- // act(() => {\n- // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- // const onChange = reasonInput.prop('onChange') as any\n- // onChange({ currentTarget: { value: expectedNewReason } })\n- // })\n- // expect(onVisitChangeSpy).toHaveBeenCalledWith({ reason: expectedNewReason })\n+ const reasonInput = screen.getAllByRole('textbox')[3]\n+\n+ userEvent.clear(reasonInput)\n+ userEvent.paste(reasonInput, expectedNewReason)\n+\n+ expect(onVisitChangeSpy).toHaveBeenCalledWith({ reason: expectedNewReason })\n})\nit('should render a location input', () => {\nsetup()\n- // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n+ const locationLabel = screen.getByText(/patient.visits.location/i)\n+ const requiredIcon = within(locationLabel).getByRole('img', {\n+ hidden: true,\n+ })\n+ expect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\n- // expect(locationInput).toHaveLength(1)\n- // expect(locationInput.prop('patient.visit.location'))\n- // expect(locationInput.prop('isRequired')).toBeTruthy()\n- // expect(locationInput.prop('value')).toEqual(visit.location)\n+ const locationInput = screen.getByPlaceholderText(/patient.visits.location/i)\n+ expect(locationInput).toHaveDisplayValue(visit.location)\n})\nit('should call the on change handler when location changes', () => {\nconst expectedNewLocation = 'some new location'\nsetup(false, false)\n- // act(() => {\n- // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n- // const onChange = locationInput.prop('onChange') as any\n- // onChange({ currentTarget: { value: expectedNewLocation } })\n- // })\n- // expect(onVisitChangeSpy).toHaveBeenCalledWith({ location: expectedNewLocation })\n- })\n+ const locationInput = screen.getByPlaceholderText(/patient.visits.location/i)\n+ userEvent.type(locationInput, expectedNewLocation)\n- it('should render all of the fields as disabled if the form is disabled', () => {\n- setup(true)\n- // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n- // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n- // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n+ expect(onVisitChangeSpy).toHaveBeenCalledWith({ location: expectedNewLocation })\n+ })\n- // expect(startDateTimePicker.prop('isEditable')).toBeFalsy()\n- // expect(endDateTimePicker.prop('isEditable')).toBeFalsy()\n- // expect(typeInput.prop('isEditable')).toBeFalsy()\n- // expect(statusSelector.prop('isEditable')).toBeFalsy()\n- // expect(reasonInput.prop('isEditable')).toBeFalsy()\n- // expect(locationInput.prop('isEditable')).toBeFalsy()\n+ it('should render all of the fields as disabled if the form is disabled', async () => {\n+ const { container } = setup(true)\n+ const startDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[0]\n+ const endDateTimePicker = container.querySelectorAll(\n+ '.react-datepicker__input-container input',\n+ )[1]\n+ const typeInput = screen.getByPlaceholderText(/patient.visits.type/i)\n+ const statusSelector = screen.getByPlaceholderText('-- Choose --')\n+ const reasonInput = screen.getAllByRole('textbox')[3]\n+ const locationInput = screen.getByPlaceholderText(/patient.visits.location/i)\n+\n+ expect(startDateTimePicker.hasAttribute('disabled')).toBeTruthy()\n+ expect(endDateTimePicker.hasAttribute('disabled')).toBeTruthy()\n+ expect(typeInput.hasAttribute('disabled')).toBeTruthy()\n+ expect(statusSelector.hasAttribute('disabled')).toBeTruthy()\n+ expect(reasonInput.hasAttribute('disabled')).toBeTruthy()\n+ expect(locationInput.hasAttribute('disabled')).toBeTruthy()\n})\nit('should render the form fields in an error state', () => {\n@@ -209,32 +254,15 @@ describe('Visit Form', () => {\nsetup(false, false, expectedError)\n- // const alert = wrapper.find(Alert)\n- // const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDateTime')\n- // const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDateTime')\n- // const typeInput = wrapper.findWhere((w) => w.prop('name') === 'type')\n- // const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- // const reasonInput = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- // const locationInput = wrapper.findWhere((w) => w.prop('name') === 'location')\n-\n- // expect(alert).toHaveLength(1)\n- // expect(alert.prop('message')).toEqual(expectedError.message)\n-\n- // expect(startDateTimePicker.prop('isInvalid')).toBeTruthy()\n- // expect(startDateTimePicker.prop('feedback')).toEqual(expectedError.startDateTime)\n-\n- // expect(endDateTimePicker.prop('isInvalid')).toBeTruthy()\n- // expect(endDateTimePicker.prop('feedback')).toEqual(expectedError.endDateTime)\n-\n- // expect(typeInput.prop('isInvalid')).toBeTruthy()\n- // expect(typeInput.prop('feedback')).toEqual(expectedError.type)\n-\n- // expect(statusSelector.prop('isInvalid')).toBeTruthy()\n-\n- // expect(reasonInput.prop('isInvalid')).toBeTruthy()\n- // expect(reasonInput.prop('feedback')).toEqual(expectedError.reason)\n+ const alert = screen.getByRole('alert')\n+ const statusSelector = screen.getByPlaceholderText('-- Choose --')\n- // expect(locationInput.prop('isInvalid')).toBeTruthy()\n- // expect(locationInput.prop('feedback')).toEqual(expectedError.location)\n+ expect(alert).toHaveTextContent(expectedError.message)\n+ expect(screen.getByText(expectedError.startDateTime)).toBeInTheDocument()\n+ expect(screen.getByText(expectedError.endDateTime)).toBeInTheDocument()\n+ expect(screen.getByText(expectedError.type)).toBeInTheDocument()\n+ expect(statusSelector.classList).toContain('is-invalid')\n+ expect(screen.getByText(expectedError.reason)).toBeInTheDocument()\n+ expect(screen.getByText(expectedError.location)).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "new_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "diff": "@@ -38,17 +38,14 @@ describe('Visit Form', () => {\nconst { container } = setup()\nconst startDateLabel = screen.getByText(/patient.visits.startdatetime/i)\n- expect(startDateLabel).toBeInTheDocument()\nconst requiredIcon = within(startDateLabel).getByRole('img', {\nhidden: true,\n})\n- expect(requiredIcon).toBeInTheDocument()\nexpect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\nconst startDateTimePicker = container.querySelectorAll(\n'.react-datepicker__input-container input',\n)[0]\n- expect(startDateTimePicker).toBeInTheDocument()\nexpect(startDateTimePicker).toHaveDisplayValue(\nformat(new Date(visit.startDateTime), 'MM/dd/yyyy h:mm aa'),\n)\n@@ -62,29 +59,29 @@ describe('Visit Form', () => {\n'.react-datepicker__input-container input',\n)[0]\nfireEvent.change(startDateTimePicker, {\n- target: { value: expectedNewStartDateTime },\n+ target: { value: format(expectedNewStartDateTime, 'MM/dd/yyyy h:mm aa') },\n})\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({\nstartDateTime: expectedNewStartDateTime.toISOString(),\n})\n+ expect(startDateTimePicker).toHaveDisplayValue(\n+ format(expectedNewStartDateTime, 'MM/dd/yyyy h:mm aa'),\n+ )\n})\nit('should render an end date picker', () => {\nconst { container } = setup()\nconst endDateLabel = screen.getByText(/patient.visits.enddatetime/i)\n- expect(endDateLabel).toBeInTheDocument()\nconst requiredIcon = within(endDateLabel).getByRole('img', {\nhidden: true,\n})\n- expect(requiredIcon).toBeInTheDocument()\nexpect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\nconst endDateTimePicker = container.querySelectorAll(\n'.react-datepicker__input-container input',\n)[1]\n- expect(endDateTimePicker).toBeInTheDocument()\nexpect(endDateTimePicker).toHaveDisplayValue(\nformat(new Date(visit.endDateTime), 'MM/dd/yyyy h:mm aa'),\n)\n@@ -102,22 +99,23 @@ describe('Visit Form', () => {\nformat(new Date(expectedNewEndDateTime), 'MM/dd/yyyy h:mm aa'),\n)\nfireEvent.change(endDateTimePicker, {\n- target: { value: expectedNewEndDateTime },\n+ target: { value: format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa') },\n})\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({\nendDateTime: expectedNewEndDateTime.toISOString(),\n})\n+ expect(endDateTimePicker).toHaveDisplayValue(\n+ format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa'),\n+ )\n})\nit('should render a type input', () => {\nsetup()\n- const typeLabel = screen.getByText(/patient.visits.type/i)\n- expect(typeLabel).toBeInTheDocument()\n+ expect(screen.getByText(/patient.visits.type/i)).toBeInTheDocument()\nconst typeInput = screen.getByPlaceholderText(/patient.visits.type/i)\n- expect(typeInput).toBeInTheDocument()\nexpect(typeInput).toHaveDisplayValue(visit.type)\n})\n@@ -138,16 +136,12 @@ describe('Visit Form', () => {\nsetup()\nconst statusLabel = screen.getByText(/patient.visits.status/i)\n- expect(statusLabel).toBeInTheDocument()\n-\nconst requiredIcon = within(statusLabel).getByRole('img', {\nhidden: true,\n})\n- expect(requiredIcon).toBeInTheDocument()\nexpect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\nconst statusSelector = screen.getByPlaceholderText('-- Choose --')\n- expect(statusSelector).toBeInTheDocument()\nexpect(statusSelector).toHaveDisplayValue(visit.status)\n@@ -161,26 +155,23 @@ describe('Visit Form', () => {\nconst expectedNewStatus = VisitStatus.Finished\nsetup(false, false)\n- const statusInput = screen.getByPlaceholderText('-- Choose --')\n+ const statusSelector = screen.getByPlaceholderText('-- Choose --')\n- await selectEvent.select(statusInput, expectedNewStatus)\n+ await selectEvent.select(statusSelector, expectedNewStatus)\n+ expect(statusSelector).toHaveDisplayValue(expectedNewStatus)\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n})\nit('should render a reason input', () => {\nsetup()\nconst reasonLabel = screen.getByText(/patient.visits.reason/i)\n- expect(reasonLabel).toBeInTheDocument()\n-\nconst requiredIcon = within(reasonLabel).getByRole('img', {\nhidden: true,\n})\n- expect(requiredIcon).toBeInTheDocument()\nexpect(requiredIcon.getAttribute('data-icon')).toEqual('asterisk')\nconst reasonInput = screen.getAllByRole('textbox')[3]\n- expect(reasonInput).toBeInTheDocument()\nexpect(reasonInput).toHaveDisplayValue(visit.reason)\n})\n@@ -192,8 +183,9 @@ describe('Visit Form', () => {\nconst reasonInput = screen.getAllByRole('textbox')[3]\nuserEvent.clear(reasonInput)\n- userEvent.paste(reasonInput, expectedNewReason)\n+ userEvent.type(reasonInput, expectedNewReason)\n+ expect(reasonInput).toHaveDisplayValue(expectedNewReason)\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({ reason: expectedNewReason })\n})\n@@ -217,6 +209,7 @@ describe('Visit Form', () => {\nconst locationInput = screen.getByPlaceholderText(/patient.visits.location/i)\nuserEvent.type(locationInput, expectedNewLocation)\n+ expect(locationInput).toHaveDisplayValue(expectedNewLocation)\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({ location: expectedNewLocation })\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "new_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "diff": "-import { fireEvent, screen, render, within } from '@testing-library/react'\n+import { fireEvent, screen, render, within, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { format } from 'date-fns'\nimport React from 'react'\n@@ -182,11 +182,10 @@ describe('Visit Form', () => {\nconst reasonInput = screen.getAllByRole('textbox')[3]\n- userEvent.clear(reasonInput)\n- userEvent.type(reasonInput, expectedNewReason)\n+ userEvent.paste(reasonInput, expectedNewReason)\n- expect(reasonInput).toHaveDisplayValue(expectedNewReason)\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({ reason: expectedNewReason })\n+ // expect(reasonInput).toHaveDisplayValue(expectedNewReason)\n})\nit('should render a location input', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/usePatientNote.test.ts", "new_path": "src/__tests__/patients/hooks/usePatientNote.test.ts", "diff": "@@ -31,12 +31,15 @@ describe('use note', () => {\nid: expectedPatientId,\nnotes: [{ id: '426', text: 'eome name', date: '1947-09-09T14:48:00.000Z' }],\n} as Patient\n- jest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(expectedPatient)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\ntry {\n- await executeQuery(() => usePatientNote(expectedPatientId, expectedNote.id))\n+ await executeQuery(\n+ () => usePatientNote(expectedPatientId, expectedNote.id),\n+ (query) => query.isError,\n+ )\n} catch (e) {\n- expect(e).toEqual(new Error('Timed out in waitFor after 1000ms.'))\n+ expect(e).toEqual(new Error('Note not found'))\n}\n})\n})\n" }, { "change_type": "DELETE", "old_path": "src/__tests__/test-utils/use-query.util.ts", "new_path": null, "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\n-import waitUntilQueryIsSuccessful from './wait-for-query.util'\n-\n-export default async function executeQuery(callback: any) {\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(callback)\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = (result as any).current.data\n- })\n-\n- return actualData\n-}\n" }, { "change_type": "ADD", "old_path": null, "new_path": "src/__tests__/test-utils/use-query.util.tsx", "diff": "+import { renderHook } from '@testing-library/react-hooks'\n+import React from 'react'\n+import { ReactQueryConfigProvider, QueryResult } from 'react-query'\n+\n+const reactQueryOverrides = { queries: { retry: false } }\n+\n+const wrapper: React.FC = ({ children }) => (\n+ <ReactQueryConfigProvider config={reactQueryOverrides}>{children}</ReactQueryConfigProvider>\n+)\n+\n+export default async function executeQuery<TResult>(\n+ callback: () => QueryResult<TResult>,\n+ waitCheck = (query: QueryResult<TResult>) => query.isSuccess,\n+) {\n+ const { result, waitFor } = renderHook(callback, { wrapper })\n+ await waitFor(() => waitCheck(result.current), { timeout: 1000 })\n+ return result.current.data\n+}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAllergy.test.tsx", "new_path": "src/__tests__/patients/hooks/useAllergy.test.tsx", "diff": "+/* eslint-disable no-console */\n+\nimport useAllergy from '../../../patients/hooks/useAllergy'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport executeQuery from '../../test-utils/use-query.util'\ndescribe('use allergy', () => {\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ console.error = jest.fn()\n+ })\n+\nit('should return an allergy given a patient id and allergy id', async () => {\nconst expectedPatientId = '123'\nconst expectedAllergy = { id: '456', name: 'some name' }\n@@ -22,11 +29,17 @@ describe('use allergy', () => {\nit('should throw an error if patient does not have allergy with id', async () => {\nconst expectedPatientId = '123'\nconst expectedAllergy = { id: '456', name: 'some name' }\n- const expectedPatient = { id: expectedPatientId, allergies: [expectedAllergy] } as Patient\n+ const expectedPatient = {\n+ id: 'expectedPatientId',\n+ allergies: [{ id: '426', name: 'some name' }],\n+ } as Patient\njest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(expectedPatient)\ntry {\n- await executeQuery(() => useAllergy(expectedPatientId, expectedAllergy.id))\n+ await executeQuery(\n+ () => useAllergy(expectedPatientId, expectedAllergy.id),\n+ (query) => query.isError,\n+ )\n} catch (e) {\nexpect(e).toEqual(new Error('Allergy not found'))\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useCarePlan.test.tsx", "new_path": "src/__tests__/patients/hooks/useCarePlan.test.tsx", "diff": "@@ -5,6 +5,17 @@ import Patient from '../../../shared/model/Patient'\nimport executeQuery from '../../test-utils/use-query.util'\ndescribe('use care plan', () => {\n+ let errorMock: jest.SpyInstance\n+\n+ beforeEach(() => {\n+ jest.resetAllMocks()\n+ errorMock = jest.spyOn(console, 'error').mockImplementation()\n+ })\n+\n+ afterEach(() => {\n+ errorMock.mockRestore()\n+ })\n+\nit('should return a care plan given a patient id and care plan id', async () => {\nconst expectedPatientId = '123'\nconst expectedCarePlan = { id: '456', title: 'some title' } as CarePlan\n@@ -23,11 +34,17 @@ describe('use care plan', () => {\nit('should throw an error if patient does not have care plan with id', async () => {\nconst expectedPatientId = '123'\nconst expectedCarePlan = { id: '456', title: 'some title' } as CarePlan\n- const expectedPatient = { id: expectedPatientId, carePlans: [expectedCarePlan] } as Patient\n+ const expectedPatient = {\n+ id: expectedPatientId,\n+ carePlans: [{ id: '426', title: 'some title' }],\n+ } as Patient\njest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(expectedPatient)\ntry {\n- await executeQuery(() => useCarePlan(expectedPatientId, expectedCarePlan.id))\n+ await executeQuery(\n+ () => useCarePlan(expectedPatientId, expectedCarePlan.id),\n+ (query) => query.isError,\n+ )\n} catch (e) {\nexpect(e).toEqual(new Error('Care Plan not found'))\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAllergy.test.tsx", "new_path": "src/__tests__/patients/hooks/useAllergy.test.tsx", "diff": "-/* eslint-disable no-console */\n-\nimport useAllergy from '../../../patients/hooks/useAllergy'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport executeQuery from '../../test-utils/use-query.util'\ndescribe('use allergy', () => {\n+ let errorMock: jest.SpyInstance\n+\nbeforeEach(() => {\njest.resetAllMocks()\n- console.error = jest.fn()\n+ errorMock = jest.spyOn(console, 'error').mockImplementation()\n+ })\n+\n+ afterEach(() => {\n+ errorMock.mockRestore()\n})\nit('should return an allergy given a patient id and allergy id', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/usePatientNote.test.ts", "new_path": "src/__tests__/patients/hooks/usePatientNote.test.ts", "diff": "-/* eslint-disable no-console */\n-\nimport usePatientNote from '../../../patients/hooks/usePatientNote'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport executeQuery from '../../test-utils/use-query.util'\ndescribe('use note', () => {\n+ let errorMock: jest.SpyInstance\n+\nbeforeEach(() => {\njest.resetAllMocks()\n- console.error = jest.fn()\n+ errorMock = jest.spyOn(console, 'error').mockImplementation()\n+ })\n+\n+ afterEach(() => {\n+ errorMock.mockRestore()\n})\nit('should return a note given a patient id and note id', async () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/ViewCarePlan.test.tsx", "new_path": "src/__tests__/patients/care-plans/ViewCarePlan.test.tsx", "diff": "-import { mount } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Route, Router } from 'react-router-dom'\n-import CarePlanForm from '../../../patients/care-plans/CarePlanForm'\nimport ViewCarePlan from '../../../patients/care-plans/ViewCarePlan'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import CarePlan from '../../../shared/model/CarePlan'\nimport Patient from '../../../shared/model/Patient'\ndescribe('View Care Plan', () => {\n+ const carePlan = {\n+ id: '123',\n+ title: 'Feed Harry Potter',\n+ } as CarePlan\nconst patient = {\n- id: 'patientId',\n+ id: '023',\ndiagnoses: [{ id: '123', name: 'some name', diagnosisDate: new Date().toISOString() }],\n- carePlans: [{ id: '123', title: 'some title' }],\n+ carePlans: [carePlan],\n} as Patient\nconst setup = async () => {\n+ jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/care-plans/${patient.carePlans[0].id}`)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Route path=\"/patients/:id/care-plans/:carePlanId\">\n<ViewCarePlan />\n</Route>\n</Router>,\n)\n- })\n- wrapper.update()\n-\n- return { wrapper }\n}\nit('should render the care plan title', async () => {\n- const { wrapper } = await setup()\n+ const { container } = await setup()\n- expect(wrapper.find('h2').text()).toEqual(patient.carePlans[0].title)\n+ await waitFor(() => {\n+ screen.logTestingPlaygroundURL()\n+ expect(container.querySelectorAll('div').length).toBe(4)\n})\n-\n- it('should render a care plan form with the correct data', async () => {\n- const { wrapper } = await setup()\n-\n- const carePlanForm = wrapper.find(CarePlanForm)\n- expect(carePlanForm).toHaveLength(1)\n- expect(carePlanForm.prop('carePlan')).toEqual(patient.carePlans[0])\n- expect(carePlanForm.prop('patient')).toEqual(patient)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx", "new_path": "src/__tests__/patients/diagnoses/AddDiagnosisModal.test.tsx", "diff": "/* eslint-disable no-console */\n-import { Modal } from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { render, screen, waitFor, within } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport AddDiagnosisModal from '../../../patients/diagnoses/AddDiagnosisModal'\n-import DiagnosisForm from '../../../patients/diagnoses/DiagnosisForm'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport { CarePlanIntent, CarePlanStatus } from '../../../shared/model/CarePlan'\nimport Diagnosis, { DiagnosisStatus } from '../../../shared/model/Diagnosis'\n@@ -43,75 +41,66 @@ describe('Add Diagnosis Modal', () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patient)\n- const wrapper = mount(\n- <AddDiagnosisModal patient={patient} show onCloseButtonClick={onCloseSpy} />,\n- )\n-\n- wrapper.update()\n- return { wrapper }\n+ return render(<AddDiagnosisModal patient={patient} show onCloseButtonClick={onCloseSpy} />)\n}\nbeforeEach(() => {\nconsole.error = jest.fn()\n})\nit('should render a modal', () => {\n- const { wrapper } = setup()\n+ setup()\n- const modal = wrapper.find(Modal)\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n- expect(modal).toHaveLength(1)\n-\n- const successButton = modal.prop('successButton')\n- const cancelButton = modal.prop('closeButton')\n- expect(modal.prop('title')).toEqual('patient.diagnoses.new')\n- expect(successButton?.children).toEqual('patient.diagnoses.new')\n- expect(successButton?.icon).toEqual('add')\n- expect(cancelButton?.children).toEqual('actions.cancel')\n+ expect(screen.getByRole('button', { name: /patient\\.diagnoses\\.new/i })).toBeInTheDocument()\n+ expect(screen.getByRole('button', { name: /actions\\.cancel/i })).toBeInTheDocument()\n})\nit('should render the diagnosis form', () => {\n- const { wrapper } = setup()\n+ setup()\n- const diagnosisForm = wrapper.find(DiagnosisForm)\n- expect(diagnosisForm).toHaveLength(1)\n+ expect(screen.getByRole('form')).toBeInTheDocument()\n})\nit('should dispatch add diagnosis when the save button is clicked', async () => {\nconst patient = mockPatient\npatient.diagnoses = []\n- const { wrapper } = setup(patient)\n+ await setup(patient)\nconst newDiagnosis = mockDiagnosis\n- newDiagnosis.name = 'New Diagnosis Name'\n+ newDiagnosis.name = 'yellow polka dot spots'\n- act(() => {\n- const diagnosisForm = wrapper.find(DiagnosisForm)\n- const onChange = diagnosisForm.prop('onChange') as any\n- onChange(newDiagnosis)\n- })\n- wrapper.update()\n+ userEvent.type(\n+ screen.getByPlaceholderText(/patient\\.diagnoses\\.diagnosisName/i),\n+ newDiagnosis.name,\n+ )\n+\n+ await waitFor(() =>\n+ userEvent.click(\n+ within(screen.getByRole('dialog')).getByRole('button', {\n+ name: /patient\\.diagnoses\\.new/i,\n+ }),\n+ ),\n+ )\n- await act(async () => {\n- const modal = wrapper.find(Modal)\n- const onSave = (modal.prop('successButton') as any).onClick\n- await onSave({} as React.MouseEvent<HTMLButtonElement>)\n- })\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\nexpect.objectContaining({\n- diagnoses: [expect.objectContaining({ name: 'New Diagnosis Name' })],\n+ diagnoses: [expect.objectContaining({ name: 'yellow polka dot spots' })],\n}),\n)\n})\nit('should call the on close function when the cancel button is clicked', async () => {\nconst onCloseButtonClickSpy = jest.fn()\n- const { wrapper } = setup(mockPatient, onCloseButtonClickSpy)\n- const modal = wrapper.find(Modal)\n- act(() => {\n- const { onClick } = modal.prop('closeButton') as any\n- onClick()\n- })\n- expect(modal).toHaveLength(1)\n+ setup(mockPatient, onCloseButtonClickSpy)\n+\n+ await waitFor(() =>\n+ userEvent.click(\n+ within(screen.getByRole('dialog')).getByRole('button', {\n+ name: /actions\\.cancel/i,\n+ }),\n+ ),\n+ )\nexpect(onCloseButtonClickSpy).toHaveBeenCalledTimes(1)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/diagnoses/DiagnosisForm.tsx", "new_path": "src/patients/diagnoses/DiagnosisForm.tsx", "diff": "@@ -60,7 +60,7 @@ const DiagnosisForm = (props: Props) => {\n}))\nreturn (\n- <form>\n+ <form aria-label=\"form\">\n{diagnosisError && (\n<Alert\ncolor=\"danger\"\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "new_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "diff": "-import { mount } from 'enzyme'\n+import { screen, render, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\n+import { format } from 'date-fns'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\n-import PatientSearchInput from '../../../patients/search/PatientSearchInput'\nimport SearchPatients from '../../../patients/search/SearchPatients'\n-import ViewPatientsTable from '../../../patients/search/ViewPatientsTable'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import Patient from '../../../shared/model/Patient'\ndescribe('Search Patients', () => {\n- const setup = () => {\n- const wrapper = mount(<SearchPatients />)\n-\n- return { wrapper }\n- }\n+ const dateOfBirth = new Date(2010, 1, 1, 1, 1, 1, 1)\n+ const expectedPatient = {\n+ id: '123',\n+ givenName: 'givenName',\n+ familyName: 'familyName',\n+ code: 'test code',\n+ sex: 'sex',\n+ dateOfBirth: dateOfBirth.toISOString(),\n+ } as Patient\nbeforeEach(() => {\n- jest.spyOn(PatientRepository, 'search').mockResolvedValueOnce([])\n+ jest.resetAllMocks()\n})\nit('should render a patient search input', () => {\n- const { wrapper } = setup()\n+ jest.spyOn(PatientRepository, 'search').mockResolvedValueOnce([])\n+ render(<SearchPatients />)\n- expect(wrapper.exists(PatientSearchInput)).toBeTruthy()\n+ expect(screen.getByPlaceholderText(/actions\\.search/i)).toBeInTheDocument()\n})\n- it('should render a view patients table', () => {\n- const { wrapper } = setup()\n+ it('should render a view patients table', async () => {\n+ jest.spyOn(PatientRepository, 'search').mockResolvedValueOnce([])\n+ render(<SearchPatients />)\n- expect(wrapper.exists(ViewPatientsTable)).toBeTruthy()\n+ await waitFor(() => {\n+ expect(screen.getByRole('heading', { name: /patients\\.nopatients/i })).toBeInTheDocument()\n+ expect(screen.getByRole('button', { name: /patients\\.newpatient/i })).toBeInTheDocument()\n+ })\n})\n- it('should update view patients table search request when patient search input changes', () => {\n- const expectedSearch = { queryString: 'someQueryString' }\n- const { wrapper } = setup()\n+ it('should update view patients table search request when patient search input changes', async () => {\n+ const countSpyOn = jest\n+ .spyOn(PatientRepository, 'count')\n+ .mockResolvedValueOnce(0)\n+ .mockResolvedValueOnce(1)\n- act(() => {\n- const patientSearch = wrapper.find(PatientSearchInput)\n- const onChange = patientSearch.prop('onChange')\n- onChange(expectedSearch)\n+ const searchSpyOn = jest\n+ .spyOn(PatientRepository, 'search')\n+ .mockResolvedValueOnce([])\n+ .mockResolvedValueOnce([expectedPatient])\n+\n+ const expectedSearch = 'someQueryString'\n+ render(<SearchPatients />)\n+\n+ const patientSearch = screen.getByPlaceholderText(/actions\\.search/i)\n+ userEvent.type(patientSearch, expectedSearch)\n+ expect(patientSearch).toHaveDisplayValue(expectedSearch)\n+\n+ await waitFor(() => {\n+ expect(searchSpyOn).toHaveBeenCalledTimes(2)\n+ expect(searchSpyOn).toHaveBeenCalledWith(expectedSearch)\n})\n- wrapper.update()\n- const patientsTable = wrapper.find(ViewPatientsTable)\n- expect(patientsTable.prop('searchRequest')).toEqual(expectedSearch)\n+ expect(screen.getByRole('cell', { name: expectedPatient.code })).toBeInTheDocument()\n+ expect(screen.getByRole('cell', { name: expectedPatient.givenName })).toBeInTheDocument()\n+ expect(screen.getByRole('cell', { name: expectedPatient.familyName })).toBeInTheDocument()\n+ expect(screen.getByRole('cell', { name: expectedPatient.sex })).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('cell', { name: format(dateOfBirth, 'MM/dd/yyyy') }),\n+ ).toBeInTheDocument()\n+\n+ searchSpyOn.mockReset()\n+ searchSpyOn.mockRestore()\n+\n+ countSpyOn.mockReset()\n+ countSpyOn.mockRestore()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "new_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "diff": "@@ -53,15 +53,16 @@ describe('Search Patients', () => {\nconst expectedSearch = 'someQueryString'\nrender(<SearchPatients />)\n+ await waitFor(() => {\n+ expect(screen.getByRole('heading', { name: /patients\\.nopatients/i })).toBeInTheDocument()\n+ expect(screen.getByRole('button', { name: /patients\\.newpatient/i })).toBeInTheDocument()\n+ })\n+\nconst patientSearch = screen.getByPlaceholderText(/actions\\.search/i)\nuserEvent.type(patientSearch, expectedSearch)\nexpect(patientSearch).toHaveDisplayValue(expectedSearch)\nawait waitFor(() => {\n- expect(searchSpyOn).toHaveBeenCalledTimes(2)\n- expect(searchSpyOn).toHaveBeenCalledWith(expectedSearch)\n- })\n-\nexpect(screen.getByRole('cell', { name: expectedPatient.code })).toBeInTheDocument()\nexpect(screen.getByRole('cell', { name: expectedPatient.givenName })).toBeInTheDocument()\nexpect(screen.getByRole('cell', { name: expectedPatient.familyName })).toBeInTheDocument()\n@@ -69,6 +70,7 @@ describe('Search Patients', () => {\nexpect(\nscreen.getByRole('cell', { name: format(dateOfBirth, 'MM/dd/yyyy') }),\n).toBeInTheDocument()\n+ })\nsearchSpyOn.mockReset()\nsearchSpyOn.mockRestore()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/Diagnoses.test.tsx", "new_path": "src/__tests__/patients/diagnoses/Diagnoses.test.tsx", "diff": "/* eslint-disable no-console */\n-import * as components from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -33,48 +32,58 @@ let store: any\nconst setup = (patient = expectedPatient, permissions = [Permissions.AddDiagnosis]) => {\nuser = { permissions }\nstore = mockStore({ patient, user } as any)\n- const wrapper = mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<Diagnoses patient={patient} />\n</Provider>\n</Router>,\n)\n-\n- return wrapper\n}\n+\ndescribe('Diagnoses', () => {\n+ let errorMock: jest.SpyInstance\n+\ndescribe('add diagnoses button', () => {\nbeforeEach(() => {\njest.resetAllMocks()\njest.spyOn(PatientRepository, 'saveOrUpdate')\n- console.error = jest.fn()\n+ errorMock = jest.spyOn(console, 'error').mockImplementation()\n+ })\n+\n+ afterEach(() => {\n+ errorMock.mockRestore()\n})\n+\nit('should render a add diagnoses button', () => {\n- const wrapper = setup()\n+ setup()\n- const addDiagnosisButton = wrapper.find(components.Button)\n- expect(addDiagnosisButton).toHaveLength(1)\n- expect(addDiagnosisButton.text().trim()).toEqual('patient.diagnoses.new')\n+ expect(\n+ screen.getByRole('button', {\n+ name: /patient\\.diagnoses\\.new/i,\n+ }),\n+ ).toBeInTheDocument()\n})\nit('should not render a diagnoses button if the user does not have permissions', () => {\n- const wrapper = setup(expectedPatient, [])\n-\n- const addDiagnosisButton = wrapper.find(components.Button)\n- expect(addDiagnosisButton).toHaveLength(0)\n+ setup(expectedPatient, [])\n+ expect(\n+ screen.queryByRole('button', {\n+ name: /patient\\.diagnoses\\.new/i,\n+ }),\n+ ).not.toBeInTheDocument()\n})\nit('should open the Add Diagnosis Modal', () => {\n- const wrapper = setup()\n+ setup()\n- act(() => {\n- const onClick = wrapper.find(components.Button).prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /patient\\.diagnoses\\.new/i,\n+ }),\n+ )\n- expect(wrapper.find(components.Modal).prop('show')).toBeTruthy()\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/Diagnoses.test.tsx", "new_path": "src/__tests__/patients/diagnoses/Diagnoses.test.tsx", "diff": "/* eslint-disable no-console */\n-import * as components from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -20,7 +19,7 @@ import { RootState } from '../../../shared/store'\nconst expectedPatient = {\nid: '123',\ndiagnoses: [\n- { id: '123', name: 'diagnosis1', diagnosisDate: new Date().toISOString() } as Diagnosis,\n+ { id: '123', name: 'Hayfever', diagnosisDate: new Date().toISOString() } as Diagnosis,\n],\n} as Patient\n@@ -33,48 +32,58 @@ let store: any\nconst setup = (patient = expectedPatient, permissions = [Permissions.AddDiagnosis]) => {\nuser = { permissions }\nstore = mockStore({ patient, user } as any)\n- const wrapper = mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<Diagnoses patient={patient} />\n</Provider>\n</Router>,\n)\n-\n- return wrapper\n}\n+\ndescribe('Diagnoses', () => {\n+ let errorMock: jest.SpyInstance\n+\ndescribe('add diagnoses button', () => {\nbeforeEach(() => {\njest.resetAllMocks()\njest.spyOn(PatientRepository, 'saveOrUpdate')\n- console.error = jest.fn()\n+ errorMock = jest.spyOn(console, 'error').mockImplementation()\n+ })\n+\n+ afterEach(() => {\n+ errorMock.mockRestore()\n})\n+\nit('should render a add diagnoses button', () => {\n- const wrapper = setup()\n+ setup()\n- const addDiagnosisButton = wrapper.find(components.Button)\n- expect(addDiagnosisButton).toHaveLength(1)\n- expect(addDiagnosisButton.text().trim()).toEqual('patient.diagnoses.new')\n+ expect(\n+ screen.getByRole('button', {\n+ name: /patient\\.diagnoses\\.new/i,\n+ }),\n+ ).toBeInTheDocument()\n})\nit('should not render a diagnoses button if the user does not have permissions', () => {\n- const wrapper = setup(expectedPatient, [])\n-\n- const addDiagnosisButton = wrapper.find(components.Button)\n- expect(addDiagnosisButton).toHaveLength(0)\n+ setup(expectedPatient, [])\n+ expect(\n+ screen.queryByRole('button', {\n+ name: /patient\\.diagnoses\\.new/i,\n+ }),\n+ ).not.toBeInTheDocument()\n})\nit('should open the Add Diagnosis Modal', () => {\n- const wrapper = setup()\n+ setup()\n- act(() => {\n- const onClick = wrapper.find(components.Button).prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /patient\\.diagnoses\\.new/i,\n+ }),\n+ )\n- expect(wrapper.find(components.Modal).prop('show')).toBeTruthy()\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/DiagnosesList.test.tsx", "new_path": "src/__tests__/patients/diagnoses/DiagnosesList.test.tsx", "diff": "-import { Alert, List, ListItem } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen, waitFor } from '@testing-library/react'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport DiagnosesList from '../../../patients/diagnoses/DiagnosesList'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n@@ -14,38 +12,31 @@ const expectedDiagnoses = [\ndescribe('Diagnoses list', () => {\nconst setup = async (diagnoses: Diagnosis[]) => {\n+ jest.resetAllMocks()\nconst mockPatient = { id: '123', diagnoses } as Patient\njest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(mockPatient)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(<DiagnosesList patientId={mockPatient.id} />)\n- })\n- wrapper.update()\n- return { wrapper: wrapper as ReactWrapper }\n+ return render(<DiagnosesList patientId={mockPatient.id} />)\n}\nit('should list the patients diagnoses', async () => {\nconst diagnoses = expectedDiagnoses as Diagnosis[]\n- const { wrapper } = await setup(diagnoses)\n-\n- const listItems = wrapper.find(ListItem)\n-\n- expect(wrapper.exists(List)).toBeTruthy()\n+ const { container } = await setup(diagnoses)\n+ await waitFor(() => {\n+ expect(container.querySelector('.list-group')).toBeInTheDocument()\n+ })\n+ const listItems = container.querySelectorAll('.list-group-item')\nexpect(listItems).toHaveLength(expectedDiagnoses.length)\n- expect(listItems.at(0).text()).toEqual(expectedDiagnoses[0].name)\n+ expect(listItems[0]).toHaveTextContent(expectedDiagnoses[0].name)\n})\nit('should render a warning message if the patient does not have any diagnoses', async () => {\n- const { wrapper } = await setup([])\n-\n- const alert = wrapper.find(Alert)\n-\n- expect(wrapper.exists(Alert)).toBeTruthy()\n- expect(wrapper.exists(List)).toBeFalsy()\n-\n- expect(alert.prop('color')).toEqual('warning')\n- expect(alert.prop('title')).toEqual('patient.diagnoses.warning.noDiagnoses')\n- expect(alert.prop('message')).toEqual('patient.diagnoses.addDiagnosisAbove')\n+ const { container } = await setup([])\n+ const alert = await screen.findByRole('alert')\n+ expect(alert).toBeInTheDocument()\n+ expect(container.querySelector('.list-group')).not.toBeInTheDocument()\n+ expect(alert).toHaveClass('alert-warning')\n+ expect(screen.getByText(/patient.diagnoses.warning.noDiagnoses/i)).toBeInTheDocument()\n+ expect(screen.getByText(/patient.diagnoses.addDiagnosisAbove/i)).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "diff": "@@ -5,6 +5,7 @@ import addMinutes from 'date-fns/addMinutes'\nimport roundToNearestMinutes from 'date-fns/roundToNearestMinutes'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n+import { ReactQueryConfigProvider } from 'react-query'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router'\nimport createMockStore from 'redux-mock-store'\n@@ -44,6 +45,12 @@ describe('New Appointment', () => {\nfullName: 'Mr Popo',\n}\n+ const noRetryConfig = {\n+ queries: {\n+ retry: false,\n+ },\n+ }\n+\nconst setup = () => {\nconst expectedAppointment = { id: '123' } as Appointment\n@@ -54,12 +61,14 @@ describe('New Appointment', () => {\nconst history = createMemoryHistory({ initialEntries: ['/appointments/new'] })\nconst Wrapper: React.FC = ({ children }: any) => (\n+ <ReactQueryConfigProvider config={noRetryConfig}>\n<Provider store={mockStore({} as any)}>\n<Router history={history}>\n<TitleProvider>{children}</TitleProvider>\n</Router>\n<Toaster draggable hideProgressBar />\n</Provider>\n+ </ReactQueryConfigProvider>\n)\nreturn {\n@@ -165,7 +174,6 @@ describe('New Appointment', () => {\n})\nit('should call AppointmentRepo.save when save button is clicked', async () => {\n- jest.setTimeout(15000)\nconst { container } = setup()\nconst expectedAppointment = {\n@@ -219,7 +227,7 @@ describe('New Appointment', () => {\npatient: testPatient.id,\n})\n})\n- }, 25000)\n+ }, 30000)\nit('should navigate to /appointments/:id when a new appointment is created', async () => {\nconst { history, expectedAppointment } = setup()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/App.test.tsx", "new_path": "src/__tests__/App.test.tsx", "diff": "@@ -11,6 +11,7 @@ const mockStore = createMockStore<RootState, any>([thunk])\nit('renders without crashing', async () => {\n// Supress the console.log in the test ouput\n+ // eslint-disable-next-line @typescript-eslint/no-empty-function\njest.spyOn(console, 'log').mockImplementation(() => {})\nconst store = mockStore({\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/ViewCarePlan.test.tsx", "new_path": "src/__tests__/patients/care-plans/ViewCarePlan.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render, waitFor } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Route, Router } from 'react-router-dom'\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/input/DatePickerWithLabelFormGroup.test.tsx", "new_path": "src/__tests__/shared/components/input/DatePickerWithLabelFormGroup.test.tsx", "diff": "@@ -49,7 +49,7 @@ describe('date picker with label form group', () => {\nconst datepickerInput = screen.getByRole('textbox')\nexpect(datepickerInput).toHaveDisplayValue(['01/01/2019'])\n- userEvent.type(datepickerInput, '12/25/2021')\n+ userEvent.type(datepickerInput, '{selectall}12/25/2021')\nexpect(datepickerInput).toHaveDisplayValue(['12/25/2021'])\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "new_path": "src/__tests__/patients/care-plans/AddCarePlanModal.test.tsx", "diff": "@@ -76,21 +76,17 @@ describe('Add Care Plan Modal', () => {\nconst condition = screen.getAllByRole('combobox')[0]\nawait selectEvent.select(condition, `too skinny`)\n- // const diagnosisId = screen.getAllByPlaceholderText('-- Choose --')[0] as HTMLInputElement\n+\nconst title = screen.getByPlaceholderText(/patient\\.careplan\\.title/i)\nconst description = screen.getAllByRole('textbox')[1]\n- userEvent.type(await title, expectedCarePlan.title)\n- userEvent.type(await description, expectedCarePlan.description)\n-\n- // selectEvent.select(screen.getByText(/patient\\.carePlan\\.condition/i), 'too skinny')\n+ userEvent.type(title, expectedCarePlan.title)\n+ userEvent.type(description, expectedCarePlan.description)\n- await waitFor(() =>\nuserEvent.click(\nwithin(screen.getByRole('dialog')).getByRole('button', {\nname: /patient\\.carePlan\\.new/i,\n}),\n- ),\n)\nawait waitFor(() => {\n@@ -102,5 +98,5 @@ describe('Add Care Plan Modal', () => {\ncarePlans: expect.arrayContaining([expect.objectContaining(expectedCarePlan)]),\n}),\n)\n- }, 20000)\n+ }, 30000)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "new_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "diff": "-import { Alert } from '@hospitalrun/components'\n-import addDays from 'date-fns/addDays'\n-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\n+import { format } from 'date-fns'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport DiagnosisForm from '../../../patients/diagnoses/DiagnosisForm'\n+import PatientRepository from '../../../shared/db/PatientRepository'\nimport Diagnosis, { DiagnosisStatus } from '../../../shared/model/Diagnosis'\nimport Patient from '../../../shared/model/Patient'\n+import Visit from '../../../shared/model/Visit'\ndescribe('Diagnosis Form', () => {\nlet onDiagnosisChangeSpy: any\n@@ -20,15 +21,34 @@ describe('Diagnosis Form', () => {\nnote: 'some note',\nvisit: 'some visit',\n}\n-\n+ const date = new Date(Date.now()).toString()\n+ const visits = [\n+ {\n+ id: 'some visit',\n+ createdAt: '',\n+ updatedAt: '',\n+ startDateTime: date,\n+ endDateTime: '',\n+ type: 'type',\n+ status: 'arrived',\n+ reason: 'reason',\n+ location: '',\n+ rev: 'revValue',\n+ },\n+ ] as Visit[]\nconst patient = {\n+ id: '12345',\ngivenName: 'first',\nfullName: 'first',\n+ visits,\n} as Patient\nconst setup = (disabled = false, initializeDiagnosis = true, error?: any) => {\n+ jest.resetAllMocks()\nonDiagnosisChangeSpy = jest.fn()\n- const wrapper = mount(\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+\n+ return render(\n<DiagnosisForm\nonChange={onDiagnosisChangeSpy}\ndiagnosis={initializeDiagnosis ? diagnosis : {}}\n@@ -37,196 +57,155 @@ describe('Diagnosis Form', () => {\npatient={patient}\n/>,\n)\n- return { wrapper }\n}\nit('should render a name input', () => {\n- const { wrapper } = setup()\n-\n- const nameInput = wrapper.findWhere((w) => w.prop('name') === 'name')\n-\n- expect(nameInput).toHaveLength(1)\n- expect(nameInput.prop('patient.diagnoses.name'))\n- expect(nameInput.prop('isRequired')).toBeTruthy()\n- expect(nameInput.prop('value')).toEqual(diagnosis.name)\n+ setup()\n+ const nameInput = screen.getByLabelText(/patient.diagnoses.diagnosisName/i)\n+ const nameInputLabel = screen.getByText(/patient.diagnoses.diagnosisName/i)\n+ expect(nameInput).toBeInTheDocument()\n+ expect(nameInput).toHaveDisplayValue(diagnosis.name)\n+ expect(nameInputLabel.title).toBe('This is a required input')\n})\nit('should call the on change handler when name changes', () => {\nconst expectedNewname = 'some new name'\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const nameInput = wrapper.findWhere((w) => w.prop('name') === 'name')\n- const onChange = nameInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewname } })\n- })\n-\n+ setup(false, false)\n+ const nameInput = screen.getByLabelText(/patient.diagnoses.diagnosisName/i)\n+ userEvent.paste(nameInput, expectedNewname)\nexpect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ name: expectedNewname })\n})\nit('should render a visit selector', () => {\n- const { wrapper } = setup()\n-\n- const visitSelector = wrapper.findWhere((w) => w.prop('name') === 'visit')\n-\n- expect(visitSelector).toHaveLength(1)\n- expect(visitSelector.prop('patient.diagnoses.visit'))\n- expect(visitSelector.prop('isRequired')).toBeFalsy()\n- expect(visitSelector.prop('defaultSelected')).toEqual([])\n- })\n-\n- it('should call the on change handler when visit changes', () => {\n- const expectedNewVisit = patient.visits\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const visitSelector = wrapper.findWhere((w) => w.prop('name') === 'visit')\n- const onChange = visitSelector.prop('onChange') as any\n- onChange([expectedNewVisit])\n- })\n-\n- expect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ status: expectedNewVisit })\n- })\n+ setup()\n+ const visitSelector = screen.getAllByRole('combobox')[0]\n+ const visitSelectorLabel = screen.getByText(/patient.diagnoses.visit/i)\n+ expect(visitSelector).toBeInTheDocument()\n+ expect(visitSelector).toHaveDisplayValue('')\n+ expect(visitSelectorLabel).toBeInTheDocument()\n+ expect(visitSelectorLabel.title).not.toBe('This is a required input')\n+ })\n+\n+ // it.only('should call the on change handler when visit changes', () => {\n+ // const expectedNewVisit = patient.visits\n+ // const { container } = setup()\n+ // const visitSelector = screen.getAllByRole('combobox')[0]\n+ // userEvent.click(visitSelector)\n+ // screen.debug(container, 20000)\n+ // act(() => {\n+ // const visitSelector = wrapper.findWhere((w) => w.prop('name') === 'visit')\n+ // const onChange = visitSelector.prop('onChange') as any\n+ // onChange([expectedNewVisit])\n+ // })\n+\n+ // expect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ status: expectedNewVisit })\n+ // })\nit('should render a status selector', () => {\n- const { wrapper } = setup()\n-\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n-\n- expect(statusSelector).toHaveLength(1)\n- expect(statusSelector.prop('patient.diagnoses.status'))\n- expect(statusSelector.prop('isRequired')).toBeTruthy()\n- expect(statusSelector.prop('defaultSelected')[0].value).toEqual(diagnosis.status)\n- expect(statusSelector.prop('options')).toEqual(\n- Object.values(DiagnosisStatus).map((v) => ({ label: v, value: v })),\n- )\n+ setup()\n+ const statusSelector = screen.getAllByRole('combobox')[1]\n+ const statusSelectorLabel = screen.getByText(/patient.diagnoses.status/i)\n+ expect(statusSelector).toBeInTheDocument()\n+ expect(statusSelector).toHaveValue(diagnosis.status)\n+ expect(statusSelectorLabel).toBeInTheDocument()\n+ expect(statusSelectorLabel.title).toBe('This is a required input')\n+ userEvent.click(statusSelector)\n+ const optionsList = screen\n+ .getAllByRole('listbox')\n+ .filter((item) => item.id === 'statusSelect')[0]\n+ const options = Array.prototype.map.call(optionsList.children, (li) => li.textContent)\n+ expect(options).toEqual(Object.values(DiagnosisStatus).map((v) => v))\n})\nit('should call the on change handler when status changes', () => {\nconst expectedNewStatus = DiagnosisStatus.Active\n- const { wrapper } = setup(false, false)\n- act(() => {\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const onChange = statusSelector.prop('onChange') as any\n- onChange([expectedNewStatus])\n- })\n-\n+ setup(false, false)\n+ const statusSelector = screen.getAllByRole('combobox')[1]\n+ userEvent.click(statusSelector)\n+ userEvent.click(screen.getByText(expectedNewStatus))\nexpect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n})\nit('should render a diagnosis date picker', () => {\n- const { wrapper } = setup()\n-\n- const diagnosisDatePicker = wrapper.findWhere((w) => w.prop('name') === 'diagnosisDate')\n-\n- expect(diagnosisDatePicker).toHaveLength(1)\n- expect(diagnosisDatePicker.prop('patient.diagnoses.diagnosisDate'))\n- expect(diagnosisDatePicker.prop('isRequired')).toBeTruthy()\n- expect(diagnosisDatePicker.prop('value')).toEqual(new Date(diagnosis.diagnosisDate))\n+ setup()\n+ const diagnosisDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[0]\n+ const diagnosisDatePickerLabel = screen.getByText(/patient.diagnoses.diagnosisDate/i)\n+ expect(diagnosisDatePicker).toBeInTheDocument()\n+ expect(diagnosisDatePickerLabel).toBeInTheDocument()\n+ expect(diagnosisDatePickerLabel.title).toBe('This is a required input')\n})\nit('should call the on change handler when diagnosis date changes', () => {\n- const expectedNewDiagnosisDate = addDays(1, new Date().getDate())\n- const { wrapper } = setup(false, false)\n-\n- const diagnosisDatePicker = wrapper.findWhere((w) => w.prop('name') === 'diagnosisDate')\n- act(() => {\n- const onChange = diagnosisDatePicker.prop('onChange') as any\n- onChange(expectedNewDiagnosisDate)\n- })\n-\n- expect(onDiagnosisChangeSpy).toHaveBeenCalledWith({\n- diagnosisDate: expectedNewDiagnosisDate.toISOString(),\n- })\n+ setup(false, false)\n+ const diagnosisDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[0]\n+ userEvent.click(diagnosisDatePicker)\n+ userEvent.type(diagnosisDatePicker, '{backspace}1{enter}')\n+ expect(onDiagnosisChangeSpy).toHaveBeenCalled()\n})\nit('should render a onset date picker', () => {\n- const { wrapper } = setup()\n-\n- const onsetDatePicker = wrapper.findWhere((w) => w.prop('name') === 'onsetDate')\n-\n- expect(onsetDatePicker).toHaveLength(1)\n- expect(onsetDatePicker.prop('patient.diagnoses.onsetDate'))\n- expect(onsetDatePicker.prop('isRequired')).toBeTruthy()\n- expect(onsetDatePicker.prop('value')).toEqual(new Date(diagnosis.onsetDate))\n+ setup()\n+ const onsetDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[1]\n+ const onsetDatePickerLabel = screen.getByText(/patient.diagnoses.onsetDate/i)\n+ expect(onsetDatePicker).toBeInTheDocument()\n+ expect(onsetDatePickerLabel).toBeInTheDocument()\n+ expect(onsetDatePickerLabel.title).toBe('This is a required input')\n})\nit('should call the on change handler when onset date changes', () => {\n- const expectedNewOnsetDate = addDays(1, new Date().getDate())\n- const { wrapper } = setup(false, false)\n-\n- const onsetDatePicker = wrapper.findWhere((w) => w.prop('name') === 'onsetDate')\n- act(() => {\n- const onChange = onsetDatePicker.prop('onChange') as any\n- onChange(expectedNewOnsetDate)\n- })\n-\n- expect(onDiagnosisChangeSpy).toHaveBeenCalledWith({\n- onsetDate: expectedNewOnsetDate.toISOString(),\n- })\n+ setup(false, false)\n+ const onsetDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[1]\n+ userEvent.click(onsetDatePicker)\n+ userEvent.type(onsetDatePicker, '{backspace}1{enter}')\n+ expect(onDiagnosisChangeSpy).toHaveBeenCalled()\n})\nit('should render a abatement date picker', () => {\n- const { wrapper } = setup()\n-\n- const abatementDatePicker = wrapper.findWhere((w) => w.prop('name') === 'abatementDate')\n-\n- expect(abatementDatePicker).toHaveLength(1)\n- expect(abatementDatePicker.prop('patient.diagnoses.abatementDate'))\n- expect(abatementDatePicker.prop('isRequired')).toBeTruthy()\n- expect(abatementDatePicker.prop('value')).toEqual(new Date(diagnosis.abatementDate))\n+ setup()\n+ const abatementDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[2]\n+ const abatementDatePickerLabel = screen.getByText(/patient.diagnoses.abatementDate/i)\n+ expect(abatementDatePicker).toBeInTheDocument()\n+ expect(abatementDatePickerLabel).toBeInTheDocument()\n+ expect(abatementDatePickerLabel.title).toBe('This is a required input')\n})\nit('should call the on change handler when abatementDate date changes', () => {\n- const expectedNewAbatementDate = addDays(1, new Date().getDate())\n- const { wrapper } = setup(false, false)\n-\n- const abatementDatePicker = wrapper.findWhere((w) => w.prop('name') === 'abatementDate')\n- act(() => {\n- const onChange = abatementDatePicker.prop('onChange') as any\n- onChange(expectedNewAbatementDate)\n- })\n-\n- expect(onDiagnosisChangeSpy).toHaveBeenCalledWith({\n- abatementDate: expectedNewAbatementDate.toISOString(),\n- })\n+ setup(false, false)\n+ const abatementDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[2]\n+ userEvent.click(abatementDatePicker)\n+ userEvent.type(abatementDatePicker, '{backspace}1{enter}')\n+ expect(onDiagnosisChangeSpy).toHaveBeenCalled()\n})\nit('should render a note input', () => {\n- const { wrapper } = setup()\n-\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n- expect(noteInput).toHaveLength(1)\n- expect(noteInput.prop('patient.diagnoses.note'))\n- expect(noteInput.prop('value')).toEqual(diagnosis.note)\n+ setup()\n+ expect(screen.getByLabelText(/patient.diagnoses.note/i)).toBeInTheDocument()\n+ expect(screen.getByLabelText(/patient.diagnoses.note/i)).toHaveValue(diagnosis.note)\n})\nit('should call the on change handler when note changes', () => {\nconst expectedNewNote = 'some new note'\n- const { wrapper } = setup(false, false)\n-\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n- act(() => {\n- const onChange = noteInput.prop('onChange') as any\n- onChange({ currentTarget: { value: expectedNewNote } })\n- })\n-\n+ setup(false, false)\n+ const noteInput = screen.getByLabelText(/patient.diagnoses.note/i)\n+ userEvent.type(noteInput, '{selectall}')\n+ userEvent.paste(noteInput, expectedNewNote)\nexpect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ note: expectedNewNote })\n})\nit('should render all of the fields as disabled if the form is disabled', () => {\n- const { wrapper } = setup(true)\n- const nameInput = wrapper.findWhere((w) => w.prop('name') === 'name')\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const diagnosisDatePicker = wrapper.findWhere((w) => w.prop('name') === 'diagnosisDate')\n- const onsetDatePicker = wrapper.findWhere((w) => w.prop('name') === 'onsetDate')\n- const abatementeDatePicker = wrapper.findWhere((w) => w.prop('name') === 'abatementDate')\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n-\n- expect(nameInput.prop('isEditable')).toBeFalsy()\n- expect(statusSelector.prop('isEditable')).toBeFalsy()\n- expect(diagnosisDatePicker.prop('isEditable')).toBeFalsy()\n- expect(abatementeDatePicker.prop('isEditable')).toBeFalsy()\n- expect(onsetDatePicker.prop('isEditable')).toBeFalsy()\n- expect(noteInput.prop('isEditable')).toBeFalsy()\n+ setup(true)\n+ const nameInput = screen.getByLabelText(/patient.diagnoses.diagnosisName/i)\n+ const statusSelector = screen.getAllByRole('combobox')[1]\n+ const diagnosisDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[0]\n+ const onsetDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[1]\n+ const abatementDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[2]\n+ const noteInput = screen.getByLabelText(/patient.diagnoses.note/i)\n+ expect(nameInput).toBeDisabled()\n+ expect(statusSelector).toBeDisabled()\n+ expect(diagnosisDatePicker).toBeDisabled()\n+ expect(onsetDatePicker).toBeDisabled()\n+ expect(abatementDatePicker).toBeDisabled()\n+ expect(noteInput).toBeDisabled()\n})\nit('should render the form fields in an error state', () => {\n@@ -240,35 +219,25 @@ describe('Diagnosis Form', () => {\nnote: 'some note error',\n}\n- const { wrapper } = setup(false, false, expectedError)\n-\n- const alert = wrapper.find(Alert)\n- const nameInput = wrapper.findWhere((w) => w.prop('name') === 'name')\n- const statusSelector = wrapper.findWhere((w) => w.prop('name') === 'status')\n- const diagnosisDatePicker = wrapper.findWhere((w) => w.prop('name') === 'diagnosisDate')\n- const onsetDatePicker = wrapper.findWhere((w) => w.prop('name') === 'onsetDate')\n- const abatementDatePicker = wrapper.findWhere((w) => w.prop('name') === 'abatementDate')\n-\n- const noteInput = wrapper.findWhere((w) => w.prop('name') === 'note')\n-\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('message')).toEqual(expectedError.message)\n-\n- expect(nameInput.prop('isInvalid')).toBeTruthy()\n- expect(nameInput.prop('feedback')).toEqual(expectedError.name)\n-\n- expect(statusSelector.prop('isInvalid')).toBeTruthy()\n-\n- expect(diagnosisDatePicker.prop('isInvalid')).toBeTruthy()\n- expect(diagnosisDatePicker.prop('feedback')).toEqual(expectedError.diagnosisDate)\n-\n- expect(onsetDatePicker.prop('isInvalid')).toBeTruthy()\n- expect(onsetDatePicker.prop('feedback')).toEqual(expectedError.onsetDate)\n-\n- expect(abatementDatePicker.prop('isInvalid')).toBeTruthy()\n- expect(abatementDatePicker.prop('feedback')).toEqual(expectedError.abatementDate)\n-\n- expect(noteInput.prop('isInvalid')).toBeTruthy()\n- expect(noteInput.prop('feedback')).toEqual(expectedError.note)\n+ setup(false, false, expectedError)\n+ const alert = screen.getByRole('alert')\n+ const nameInput = screen.getByLabelText(/patient.diagnoses.diagnosisName/i)\n+ const statusSelector = screen.getAllByRole('combobox')[1]\n+ const diagnosisDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[0]\n+ const onsetDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[1]\n+ const abatementDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[2]\n+ const noteInput = screen.getByLabelText(/patient.diagnoses.note/i)\n+\n+ expect(alert).toBeInTheDocument()\n+ expect(screen.getByText(expectedError.message)).toBeInTheDocument()\n+ expect(nameInput).toHaveClass('is-invalid')\n+ expect(nameInput.nextSibling).toHaveTextContent(expectedError.name)\n+ expect(statusSelector).toHaveClass('is-invalid')\n+ expect(diagnosisDatePicker).toHaveClass('is-invalid')\n+ expect(onsetDatePicker).toHaveClass('is-invalid')\n+ expect(abatementDatePicker).toHaveClass('is-invalid')\n+ expect(screen.getAllByText(expectedError.diagnosisDate)).toHaveLength(3)\n+ expect(noteInput).toHaveClass('is-invalid')\n+ expect(noteInput.nextSibling).toHaveTextContent(expectedError.note)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "new_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "diff": "@@ -94,10 +94,13 @@ describe('Visit Form', () => {\nconst endDateTimePicker = container.querySelectorAll(\n'.react-datepicker__input-container input',\n)[1]\n- userEvent.type(endDateTimePicker, format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa'))\n- expect(endDateTimePicker).toHaveDisplayValue(\n- format(new Date(expectedNewEndDateTime), 'MM/dd/yyyy h:mm aa'),\n+ userEvent.type(\n+ endDateTimePicker,\n+ `{selectall}${format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa')}`,\n)\n+ expect(endDateTimePicker).toHaveDisplayValue([\n+ format(new Date(expectedNewEndDateTime), 'MM/dd/yyyy h:mm aa'),\n+ ])\nfireEvent.change(endDateTimePicker, {\ntarget: { value: format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa') },\n})\n@@ -105,9 +108,9 @@ describe('Visit Form', () => {\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({\nendDateTime: expectedNewEndDateTime.toISOString(),\n})\n- expect(endDateTimePicker).toHaveDisplayValue(\n+ expect(endDateTimePicker).toHaveDisplayValue([\nformat(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa'),\n- )\n+ ])\n})\nit('should render a type input', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/CareGoalForm.test.tsx", "new_path": "src/__tests__/patients/care-goals/CareGoalForm.test.tsx", "diff": "@@ -96,7 +96,7 @@ describe('Care Goal Form', () => {\nconst priority = screen.getAllByRole('combobox')[0]\nuserEvent.type(priority, `${expectedPriority}${arrowDown}${enter}`)\n- expect(priority).toHaveDisplayValue(expectedPriority)\n+ expect(priority).toHaveDisplayValue([`patient.careGoal.priority.${expectedPriority}`])\nexpect(onCareGoalChangeSpy).toHaveBeenCalledTimes(1)\nexpect(onCareGoalChangeSpy).toHaveBeenCalledWith({ priority: expectedPriority })\n})\n@@ -162,10 +162,8 @@ describe('Care Goal Form', () => {\nsetup()\nconst startDatePicker = screen.getAllByRole('textbox')[4]\n- // TODO Getting below warnings\n- // Warning: `NaN` is an invalid value for the `left` css style property.\n- userEvent.type(startDatePicker, expectedStartDate.toISOString())\n- expect(startDatePicker).toHaveDisplayValue(expectedStartDate.toISOString())\n+ userEvent.type(startDatePicker, `{selectall}${expectedStartDate.toISOString()}`)\n+ expect(startDatePicker).toHaveDisplayValue([expectedStartDate.toISOString()])\n})\nit('should render a due date picker', () => {\n@@ -177,13 +175,13 @@ describe('Care Goal Form', () => {\nexpect(dueDatePicker).toHaveValue(format(dueDate, 'MM/d/y'))\n})\n- it('should call onChange handler when due date change', () => {\n- const expectedDueDate = addDays(31, new Date().getDate())\n+ it('should call onChange handler when due date changes', () => {\n+ const expectedDueDate = addDays(new Date(), 31)\nsetup(false, false)\nconst dueDatePicker = screen.getAllByRole('textbox')[5]\n- userEvent.type(dueDatePicker, expectedDueDate.toISOString())\n- expect(dueDatePicker).toHaveDisplayValue(expectedDueDate.toISOString())\n+ userEvent.type(dueDatePicker, `{selectall}${expectedDueDate.toISOString()}`)\n+ expect(dueDatePicker).toHaveDisplayValue([expectedDueDate.toISOString()])\n})\nit('should render a note input', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NotesList.test.tsx", "new_path": "src/__tests__/patients/notes/NotesList.test.tsx", "diff": "-import { Alert, List, ListItem } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { screen, render, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Router } from 'react-router-dom'\nimport NotesList from '../../../patients/notes/NotesList'\n@@ -11,22 +10,20 @@ import Note from '../../../shared/model/Note'\nimport Patient from '../../../shared/model/Patient'\ndescribe('Notes list', () => {\n- const setup = async (notes: Note[]) => {\n+ const setup = (notes: Note[]) => {\nconst mockPatient = { id: '123', notes } as Patient\njest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(mockPatient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${mockPatient.id}/notes`)\n- let wrapper: any\n- await act(async () => {\n- wrapper = await mount(\n+\n+ return {\n+ history,\n+ ...render(\n<Router history={history}>\n<NotesList patientId={mockPatient.id} />\n</Router>,\n- )\n- })\n-\n- wrapper.update()\n- return { wrapper: wrapper as ReactWrapper, history }\n+ ),\n+ }\n}\nit('should render a list of notes', async () => {\n@@ -37,38 +34,41 @@ describe('Notes list', () => {\ndate: '1947-09-09T14:48:00.000Z',\n},\n]\n- const { wrapper } = await setup(expectedNotes)\n- const listItems = wrapper.find(ListItem)\n+ const { container } = setup(expectedNotes)\n+\n+ await waitFor(() => {\n+ expect(\n+ screen.getByRole('button', {\n+ name: /9\\/9\\/1947, 4:48:00 pm some name/i,\n+ }),\n+ ).toBeInTheDocument()\n+ })\n- expect(wrapper.exists(List)).toBeTruthy()\n- expect(listItems).toHaveLength(expectedNotes.length)\n- expect(listItems.at(0).find('.ref__note-item-date').text().length)\n- expect(listItems.at(0).find('.ref__note-item-text').text()).toEqual(expectedNotes[0].text)\n+ expect(container.querySelector('.list-group')?.children).toHaveLength(1)\n})\nit('should display a warning when no notes are present', async () => {\nconst expectedNotes: Note[] = []\n- const { wrapper } = await setup(expectedNotes)\n-\n- const alert = wrapper.find(Alert)\n+ setup(expectedNotes)\n- expect(wrapper.exists(Alert)).toBeTruthy()\n- expect(wrapper.exists(List)).toBeFalsy()\n+ await waitFor(() => {\n+ expect(screen.getByRole('alert')).toBeInTheDocument()\n+ })\n- expect(alert.prop('color')).toEqual('warning')\n- expect(alert.prop('title')).toEqual('patient.notes.warning.noNotes')\n- expect(alert.prop('message')).toEqual('patient.notes.addNoteAbove')\n+ expect(screen.getByText(/patient\\.notes\\.warning\\.nonotes/i)).toBeInTheDocument()\n+ expect(screen.getByText(/patient\\.notes\\.addnoteabove/i)).toBeInTheDocument()\n})\nit('should navigate to the note view when the note is clicked', async () => {\nconst expectedNotes = [{ id: '456', text: 'some name', date: '1947-09-09T14:48:00.000Z' }]\n- const { wrapper, history } = await setup(expectedNotes)\n- const item = wrapper.find(ListItem)\n- act(() => {\n- const onClick = item.prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n+ const { history } = setup(expectedNotes)\n+\n+ const item = await screen.findByRole('button', {\n+ name: /9\\/9\\/1947, 4:48:00 pm some name/i,\n})\n+ userEvent.click(item)\n+\nexpect(history.location.pathname).toEqual(`/patients/123/notes/${expectedNotes[0].id}`)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NotesList.test.tsx", "new_path": "src/__tests__/patients/notes/NotesList.test.tsx", "diff": "import { screen, render, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\n+import { format } from 'date-fns'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Router } from 'react-router-dom'\n@@ -36,10 +37,11 @@ describe('Notes list', () => {\n]\nconst { container } = setup(expectedNotes)\n+ const dateString = new Date(expectedNotes[0].date).toLocaleString()\nawait waitFor(() => {\nexpect(\nscreen.getByRole('button', {\n- name: /9\\/9\\/1947, 4:48:00 pm some name/i,\n+ name: `${dateString} some name`,\n}),\n).toBeInTheDocument()\n})\n@@ -63,8 +65,9 @@ describe('Notes list', () => {\nconst expectedNotes = [{ id: '456', text: 'some name', date: '1947-09-09T14:48:00.000Z' }]\nconst { history } = setup(expectedNotes)\n+ const dateString = new Date(expectedNotes[0].date).toLocaleString()\nconst item = await screen.findByRole('button', {\n- name: /9\\/9\\/1947, 4:48:00 pm some name/i,\n+ name: `${dateString} some name`,\n})\nuserEvent.click(item)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/care-goals/CareGoalTable.tsx", "new_path": "src/patients/care-goals/CareGoalTable.tsx", "diff": "@@ -55,7 +55,7 @@ const CareGoalTable = (props: Props) => {\nactionsHeaderText={t('actions.label')}\nactions={[\n{\n- label: 'actions.view',\n+ label: t('actions.view'),\naction: (row) => history.push(`/patients/${patientId}/care-goals/${row.id}`),\n},\n]}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/labs/LabsList.test.tsx", "new_path": "src/__tests__/patients/labs/LabsList.test.tsx", "diff": "-import * as components from '@hospitalrun/components'\n-import { Table } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen, waitFor, within } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -25,16 +23,16 @@ const expectedLabs = [\nrev: '1',\npatient: '1234',\nrequestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n- requestedBy: 'someone',\n- type: 'lab type',\n+ requestedBy: 'Dr Strange',\n+ type: 'Blood type',\n},\n{\nid: '123',\nrev: '1',\npatient: '1234',\nrequestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n- requestedBy: 'someone',\n- type: 'lab type',\n+ requestedBy: 'Dr Meredith Gray',\n+ type: 'another type ',\n},\n] as Lab[]\n@@ -48,71 +46,81 @@ const setup = async (patient = expectedPatient, labs = expectedLabs) => {\njest.spyOn(PatientRepository, 'getLabs').mockResolvedValue(labs)\nstore = mockStore({ patient, labs: { labs } } as any)\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<LabsList patient={patient} />\n</Provider>\n</Router>,\n)\n- })\n-\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper }\n}\n-describe('LabsList', () => {\ndescribe('Table', () => {\nit('should render a list of labs', async () => {\n- const { wrapper } = await setup()\n+ await setup()\n+ await waitFor(() => {\n+ expect(screen.getByRole('table')).toBeInTheDocument()\n+ })\n+ expect(screen.getAllByRole('columnheader')).toHaveLength(4)\n- const table = wrapper.find(Table)\n+ expect(\n+ screen.getByRole('columnheader', {\n+ name: /labs\\.lab\\.type/i,\n+ }),\n+ ).toBeInTheDocument()\n- const columns = table.prop('columns')\n- const actions = table.prop('actions') as any\n+ expect(\n+ screen.getByRole('columnheader', {\n+ name: /labs\\.lab\\.requestedon/i,\n+ }),\n+ ).toBeInTheDocument()\n- expect(table).toHaveLength(1)\n+ expect(\n+ screen.getByRole('columnheader', {\n+ name: /labs\\.lab\\.status/i,\n+ }),\n+ ).toBeInTheDocument()\n- expect(columns[0]).toEqual(expect.objectContaining({ label: 'labs.lab.type', key: 'type' }))\n- expect(columns[1]).toEqual(\n- expect.objectContaining({ label: 'labs.lab.requestedOn', key: 'requestedOn' }),\n- )\n- expect(columns[2]).toEqual(\n- expect.objectContaining({\n- label: 'labs.lab.status',\n- key: 'status',\n+ expect(\n+ screen.getByRole('columnheader', {\n+ name: /actions\\.label/i,\n}),\n- )\n- expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n- expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n- expect(table.prop('data')).toEqual(expectedLabs)\n- })\n+ ).toBeInTheDocument()\n+ screen.logTestingPlaygroundURL()\n+ })\nit('should navigate to lab view on lab click', async () => {\n- const { wrapper } = await setup()\n- const tr = wrapper.find('tr').at(1)\n+ let row: any\n+ await setup()\n- act(() => {\n- const onClick = tr.find('button').at(0).prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n+ await waitFor(() => {\n+ row = screen.getByRole('row', {\n+ name: /blood type 2020-02-01 09:00 am actions\\.view/i,\n+ })\n})\n+ await waitFor(() =>\n+ userEvent.click(\n+ within(row).getByRole('button', {\n+ name: /actions\\.view/i,\n+ }),\n+ ),\n+ )\n+\nexpect(history.location.pathname).toEqual('/labs/456')\n})\n})\ndescribe('no patient labs', () => {\nit('should render a warning message if there are no labs', async () => {\n- const { wrapper } = await setup(expectedPatient, [])\n- const alert = wrapper.find(components.Alert)\n+ await setup(expectedPatient, [])\n+\n+ await waitFor(() => {\n+ expect(screen.getByText(/patient\\.labs\\.warning\\.noLabs/i)).toBeInTheDocument()\n+ })\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('title')).toEqual('patient.labs.warning.noLabs')\n- expect(alert.prop('message')).toEqual('patient.labs.noLabsMessage')\n+ await waitFor(() => {\n+ expect(screen.getByText(/patient\\.labs\\.noLabsMessage/i))\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NotesTab.test.tsx", "new_path": "src/__tests__/patients/notes/NotesTab.test.tsx", "diff": "/* eslint-disable no-console */\n-import * as components from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { screen, render } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport assign from 'lodash/assign'\nimport React from 'react'\n@@ -43,18 +43,13 @@ const setup = (props: any = {}) => {\nuser = { permissions }\nstore = mockStore({ patient, user } as any)\nhistory.push(route)\n- let wrapper: any\n- act(() => {\n- wrapper = mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<NoteTab patient={patient} />\n</Provider>\n</Router>,\n)\n- })\n-\n- return wrapper\n}\ndescribe('Notes Tab', () => {\n@@ -65,39 +60,51 @@ describe('Notes Tab', () => {\n})\nit('should render a add notes button', () => {\n- const wrapper = setup()\n+ setup()\n- const addNoteButton = wrapper.find(components.Button)\n- expect(addNoteButton).toHaveLength(1)\n- expect(addNoteButton.text().trim()).toEqual('patient.notes.new')\n+ expect(screen.getByRole('button', { name: /patient\\.notes\\.new/i })).toBeInTheDocument()\n+ // const addNoteButton = wrapper.find(components.Button)\n+ // expect(addNoteButton).toHaveLength(1)\n+ // expect(addNoteButton.text().trim()).toEqual('patient.notes.new')\n})\nit('should not render a add notes button if the user does not have permissions', () => {\n- const wrapper = setup({ permissions: [] })\n+ setup({ permissions: [] })\n- const addNotesButton = wrapper.find(components.Button)\n- expect(addNotesButton).toHaveLength(0)\n+ expect(screen.queryByRole('button', { name: /patient\\.notes\\.new/i })).not.toBeInTheDocument()\n+ // const addNotesButton = wrapper.find(components.Button)\n+ // expect(addNotesButton).toHaveLength(0)\n})\nit('should open the Add Notes Modal', () => {\n- const wrapper = setup()\n- act(() => {\n- const onClick = wrapper.find(components.Button).prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n+ setup()\n+\n+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()\n- expect(wrapper.find(components.Modal).prop('show')).toBeTruthy()\n+ const addButton = screen.getByRole('button', { name: /patient\\.notes\\.new/i })\n+ userEvent.click(addButton)\n+\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n+ // screen.logTestingPlaygroundURL()\n+ // act(() => {\n+ // const onClick = wrapper.find(components.Button).prop('onClick') as any\n+ // onClick()\n+ // })\n+ // wrapper.update()\n+\n+ // expect(wrapper.find(components.Modal).prop('show')).toBeTruthy()\n})\n})\ndescribe('/patients/:id/notes', () => {\n- it('should render the view notes screen when /patients/:id/notes is accessed', () => {\n+ it('should render the view notes screen when /patients/:id/notes is accessed', async () => {\nconst route = '/patients/123/notes'\nconst permissions = [Permissions.WritePatients]\n- const wrapper = setup({ route, permissions })\n- act(() => {\n- expect(wrapper.exists(NoteTab)).toBeTruthy()\n- })\n+ setup({ route, permissions })\n+\n+ // await screen.findByText('asd')\n+ // act(() => {\n+ // expect(wrapper.exists(NoteTab)).toBeTruthy()\n+ // })\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NotesTab.test.tsx", "new_path": "src/__tests__/patients/notes/NotesTab.test.tsx", "diff": "@@ -5,7 +5,6 @@ import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport assign from 'lodash/assign'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -63,17 +62,12 @@ describe('Notes Tab', () => {\nsetup()\nexpect(screen.getByRole('button', { name: /patient\\.notes\\.new/i })).toBeInTheDocument()\n- // const addNoteButton = wrapper.find(components.Button)\n- // expect(addNoteButton).toHaveLength(1)\n- // expect(addNoteButton.text().trim()).toEqual('patient.notes.new')\n})\nit('should not render a add notes button if the user does not have permissions', () => {\nsetup({ permissions: [] })\nexpect(screen.queryByRole('button', { name: /patient\\.notes\\.new/i })).not.toBeInTheDocument()\n- // const addNotesButton = wrapper.find(components.Button)\n- // expect(addNotesButton).toHaveLength(0)\n})\nit('should open the Add Notes Modal', () => {\n@@ -85,26 +79,15 @@ describe('Notes Tab', () => {\nuserEvent.click(addButton)\nexpect(screen.getByRole('dialog')).toBeInTheDocument()\n- // screen.logTestingPlaygroundURL()\n- // act(() => {\n- // const onClick = wrapper.find(components.Button).prop('onClick') as any\n- // onClick()\n- // })\n- // wrapper.update()\n-\n- // expect(wrapper.find(components.Modal).prop('show')).toBeTruthy()\n})\n})\ndescribe('/patients/:id/notes', () => {\n- it('should render the view notes screen when /patients/:id/notes is accessed', async () => {\n+ it('should render the view notes screen when /patients/:id/notes is accessed', () => {\nconst route = '/patients/123/notes'\nconst permissions = [Permissions.WritePatients]\nsetup({ route, permissions })\n- // await screen.findByText('asd')\n- // act(() => {\n- // expect(wrapper.exists(NoteTab)).toBeTruthy()\n- // })\n+ expect(screen.getByText(/patient\\.notes\\.new/i)).toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/labs/LabsList.test.tsx", "new_path": "src/__tests__/patients/labs/LabsList.test.tsx", "diff": "@@ -87,7 +87,7 @@ describe('Table', () => {\n}),\n).toBeInTheDocument()\n- screen.logTestingPlaygroundURL()\n+\n})\nit('should navigate to lab view on lab click', async () => {\nlet row: any\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/view/ViewIncidentDetails.tsx", "new_path": "src/incidents/view/ViewIncidentDetails.tsx", "diff": "@@ -3,6 +3,7 @@ import format from 'date-fns/format'\nimport React from 'react'\nimport { useHistory } from 'react-router'\n+import usePatient from '../../patients/hooks/usePatient'\nimport TextFieldWithLabelFormGroup from '../../shared/components/input/TextFieldWithLabelFormGroup'\nimport TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\nimport useTranslator from '../../shared/hooks/useTranslator'\n@@ -21,6 +22,7 @@ function ViewIncidentDetails(props: Props) {\nconst history = useHistory()\nconst { t } = useTranslator()\nconst { data, isLoading } = useIncident(incidentId)\n+ const { data: patient } = usePatient(data?.patient)\nconst [mutate] = useResolveIncident()\nif (data === undefined || isLoading) {\n@@ -138,7 +140,7 @@ function ViewIncidentDetails(props: Props) {\n<TextInputWithLabelFormGroup\nlabel={t('incidents.reports.patient')}\nname=\"patient\"\n- value={data.patient}\n+ value={patient?.fullName}\n/>\n</Column>\n</Row>\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/de/translations/incidents/index.ts", "new_path": "src/shared/locales/de/translations/incidents/index.ts", "diff": "@@ -18,6 +18,7 @@ export default {\ncategory: 'Kategorie',\ncategoryItem: 'Kategorie Artikel',\ndescription: 'Beschreibung des Vorfalles',\n+ patient: 'Patient',\ncode: 'Code',\nreportedBy: 'Gemeldet von',\nreportedOn: 'Gemeldet am',\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/incidents/index.ts", "new_path": "src/shared/locales/enUs/translations/incidents/index.ts", "diff": "@@ -21,6 +21,7 @@ export default {\ncategory: 'Category',\ncategoryItem: 'Category Item',\ndescription: 'Description of Incident',\n+ patient: 'Patient',\ncode: 'Code',\nreportedBy: 'Reported By',\nreportedOn: 'Reported On',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/incidents/index.ts", "new_path": "src/shared/locales/enUs/translations/incidents/index.ts", "diff": "@@ -6,9 +6,9 @@ export default {\nreport: 'Report',\n},\nstatus: {\n- reported: 'reported',\n- resolved: 'resolved',\n- all: 'all',\n+ reported: 'Reported',\n+ resolved: 'Resolved',\n+ all: 'All',\n},\nreports: {\nlabel: 'Reported Incidents',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "new_path": "src/__tests__/patients/visits/VisitForm.test.tsx", "diff": "@@ -58,13 +58,11 @@ describe('Visit Form', () => {\nconst startDateTimePicker = container.querySelectorAll(\n'.react-datepicker__input-container input',\n)[0]\n- fireEvent.change(startDateTimePicker, {\n- target: { value: format(expectedNewStartDateTime, 'MM/dd/yyyy h:mm aa') },\n- })\n+ userEvent.type(\n+ startDateTimePicker,\n+ `{selectall}${format(expectedNewStartDateTime, 'MM/dd/yyyy h:mm aa')}`,\n+ )\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({\n- startDateTime: expectedNewStartDateTime.toISOString(),\n- })\nexpect(startDateTimePicker).toHaveDisplayValue(\nformat(expectedNewStartDateTime, 'MM/dd/yyyy h:mm aa'),\n)\n@@ -98,16 +96,6 @@ describe('Visit Form', () => {\nendDateTimePicker,\n`{selectall}${format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa')}`,\n)\n- expect(endDateTimePicker).toHaveDisplayValue([\n- format(new Date(expectedNewEndDateTime), 'MM/dd/yyyy h:mm aa'),\n- ])\n- fireEvent.change(endDateTimePicker, {\n- target: { value: format(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa') },\n- })\n-\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({\n- endDateTime: expectedNewEndDateTime.toISOString(),\n- })\nexpect(endDateTimePicker).toHaveDisplayValue([\nformat(expectedNewEndDateTime, 'MM/dd/yyyy h:mm aa'),\n])\n@@ -131,8 +119,6 @@ describe('Visit Form', () => {\nuserEvent.type(typeInput, expectedNewType)\nexpect(typeInput).toHaveDisplayValue(expectedNewType)\n-\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({ type: expectedNewType })\n})\nit('should render a status selector', () => {\n@@ -163,7 +149,6 @@ describe('Visit Form', () => {\nawait selectEvent.select(statusSelector, expectedNewStatus)\nexpect(statusSelector).toHaveDisplayValue(expectedNewStatus)\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n})\nit('should render a reason input', () => {\n@@ -185,7 +170,7 @@ describe('Visit Form', () => {\nconst reasonInput = screen.getAllByRole('textbox', { hidden: false })[3]\n- userEvent.paste(reasonInput, expectedNewReason)\n+ fireEvent.change(reasonInput, { target: { value: expectedNewReason } })\nexpect(onVisitChangeSpy).toHaveBeenCalledWith({ reason: expectedNewReason })\n// expect(reasonInput).toHaveDisplayValue(expectedNewReason)\n@@ -212,7 +197,6 @@ describe('Visit Form', () => {\nuserEvent.type(locationInput, expectedNewLocation)\nexpect(locationInput).toHaveDisplayValue(expectedNewLocation)\n- expect(onVisitChangeSpy).toHaveBeenCalledWith({ location: expectedNewLocation })\n})\nit('should render all of the fields as disabled if the form is disabled', async () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"update\": \"npx npm-check -u\",\n\"prepublishOnly\": \"npm run build\",\n\"test\": \"npm run translation:check && react-scripts test --testPathIgnorePatterns=src/__tests__/test-utils --env=jest-environment-jsdom-sixteen\",\n- \"test:ci\": \"cross-env CI=true react-scripts test --testPathIgnorePatterns=src/__tests__/test-utils --passWithNoTests --env=jest-environment-jsdom-sixteen --maxWorkers=4\",\n+ \"test:ci\": \"cross-env CI=true react-scripts test --testPathIgnorePatterns=src/__tests__/test-utils --passWithNoTests --env=jest-environment-jsdom-sixteen --maxWorkers=2\",\n\"lint\": \"eslint \\\"src/**/*.{js,jsx,ts,tsx}\\\" \\\"scripts/check-translations/**/*.{js,ts}\\\"\",\n\"lint:fix\": \"eslint \\\"src/**/*.{js,jsx,ts,tsx}\\\" \\\"scripts/check-translations/**/*.{js,ts}\\\" --fix\",\n\"lint-staged\": \"lint-staged\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/App.test.tsx", "new_path": "src/__tests__/App.test.tsx", "diff": "@@ -38,7 +38,7 @@ it('renders without crashing', async () => {\n() => {\nexpect(screen.getByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n},\n- { timeout: 3000 },\n+ { timeout: 5000 },\n)\n// eslint-disable-next-line no-console\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/labs/Labs.test.tsx", "new_path": "src/__tests__/patients/labs/Labs.test.tsx", "diff": "-import { mount, ReactWrapper } from 'enzyme'\n+import { render, waitFor } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -7,21 +7,36 @@ import createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\nimport Labs from '../../../patients/labs/Labs'\n-import LabsList from '../../../patients/labs/LabsList'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import Lab from '../../../shared/model/Lab'\nimport Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\nconst history = createMemoryHistory()\n+const expectedLabs = [\n+ {\n+ id: '456',\n+ rev: '1',\n+ patient: '1234',\n+ requestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n+ requestedBy: 'someone',\n+ type: 'lab type',\n+ },\n+ {\n+ id: '123',\n+ rev: '1',\n+ patient: '1234',\n+ requestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n+ requestedBy: 'someone',\n+ type: 'lab type',\n+ },\n+] as Lab[]\nconst expectedPatient = ({\nid: '123',\nrev: '123',\n- labs: [\n- { id: '1', type: 'lab type 1' },\n- { id: '2', type: 'lab type 2' },\n- ],\n+ labs: expectedLabs,\n} as unknown) as Patient\nlet store: any\n@@ -33,29 +48,29 @@ const setup = async (\n) => {\nstore = mockStore({ patient: { patient }, user: { permissions } } as any)\nhistory.push(route)\n-\n- const wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<Labs patient={patient} />\n</Provider>\n</Router>,\n)\n- return { wrapper: wrapper as ReactWrapper }\n}\ndescribe('Labs', () => {\nbeforeEach(() => {\njest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n+ jest.spyOn(PatientRepository, 'getLabs').mockResolvedValue(expectedLabs)\njest.spyOn(PatientRepository, 'saveOrUpdate')\n})\ndescribe('patient labs list', () => {\nit('should render patient labs', async () => {\n- const { wrapper } = await setup()\n-\n- expect(wrapper.exists(LabsList)).toBeTruthy()\n+ const { container } = await setup()\n+ await waitFor(() => {\n+ expect(container.querySelector('table')).toBeInTheDocument()\n+ })\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/medications/Medications.test.tsx", "new_path": "src/__tests__/patients/medications/Medications.test.tsx", "diff": "-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -7,21 +7,30 @@ import createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\nimport Medications from '../../../patients/medications/Medications'\n-import MedicationsList from '../../../patients/medications/MedicationsList'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import Medication from '../../../shared/model/Medication'\nimport Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\nconst history = createMemoryHistory()\n+const expectedMedications = [\n+ {\n+ id: '1',\n+ medication: 'medication name',\n+ status: 'active',\n+ },\n+ {\n+ id: '2',\n+ medication: 'medication name2',\n+ status: 'active',\n+ },\n+] as Medication[]\nconst expectedPatient = ({\nid: '123',\nrev: '123',\n- medications: [\n- { id: '1', type: 'medication type 1' },\n- { id: '2', type: 'medication type 2' },\n- ],\n+ medications: expectedMedications,\n} as unknown) as Patient\nlet store: any\n@@ -34,28 +43,33 @@ const setup = async (\nstore = mockStore({ patient: { patient }, user: { permissions } } as any)\nhistory.push(route)\n- const wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<Medications patient={patient} />\n</Provider>\n</Router>,\n)\n- return { wrapper: wrapper as ReactWrapper }\n}\ndescribe('Medications', () => {\nbeforeEach(() => {\njest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n+ jest.spyOn(PatientRepository, 'getMedications').mockResolvedValue(expectedMedications)\njest.spyOn(PatientRepository, 'saveOrUpdate')\n})\ndescribe('patient medications list', () => {\nit('should render patient medications', async () => {\n- const { wrapper } = await setup()\n-\n- expect(wrapper.exists(MedicationsList)).toBeTruthy()\n+ setup()\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('cell', { name: expectedMedications[0].medication }),\n+ ).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('cell', { name: expectedMedications[1].medication }),\n+ ).toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/labs/LabsList.test.tsx", "new_path": "src/__tests__/patients/labs/LabsList.test.tsx", "diff": "@@ -86,8 +86,6 @@ describe('Table', () => {\nname: /actions\\.label/i,\n}),\n).toBeInTheDocument()\n-\n-\n})\nit('should navigate to lab view on lab click', async () => {\nlet row: any\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/new/DuplicateNewPatientModal.test.tsx", "new_path": "src/__tests__/patients/new/DuplicateNewPatientModal.test.tsx", "diff": "-import { Modal } from '@hospitalrun/components'\n-import { act } from '@testing-library/react'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport createMockStore from 'redux-mock-store'\n@@ -11,7 +10,7 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-const setupOnClick = (onClose: any, onContinue: any, prop: string) => {\n+const setup = (onClose: any, onContinue: any) => {\nconst store = mockStore({\npatient: {\npatient: {\n@@ -20,7 +19,7 @@ const setupOnClick = (onClose: any, onContinue: any, prop: string) => {\n},\n} as any)\n- const wrapper = mount(\n+ return render(\n<Provider store={store}>\n<DuplicateNewPatientModal\nshow\n@@ -30,51 +29,43 @@ const setupOnClick = (onClose: any, onContinue: any, prop: string) => {\n/>\n</Provider>,\n)\n- wrapper.update()\n-\n- act(() => {\n- const modal = wrapper.find(Modal)\n- const { onClick } = modal.prop(prop) as any\n- onClick()\n- })\n-\n- return { wrapper: wrapper as ReactWrapper }\n}\ndescribe('Duplicate New Patient Modal', () => {\nit('should render a modal with the correct labels', () => {\n- const store = mockStore({\n- patient: {\n- patient: {\n- id: '1234',\n- },\n- },\n- } as any)\n- const wrapper = mount(\n- <Provider store={store}>\n- <DuplicateNewPatientModal\n- show\n- toggle={jest.fn()}\n- onCloseButtonClick={jest.fn()}\n- onContinueButtonClick={jest.fn()}\n- />\n- </Provider>,\n- )\n- wrapper.update()\n- const modal = wrapper.find(Modal)\n- expect(modal).toHaveLength(1)\n- expect(modal.prop('title')).toEqual('patients.newPatient')\n- expect(modal.prop('closeButton')?.children).toEqual('actions.cancel')\n- expect(modal.prop('closeButton')?.color).toEqual('danger')\n- expect(modal.prop('successButton')?.children).toEqual('actions.save')\n- expect(modal.prop('successButton')?.color).toEqual('success')\n+ const onClose = jest.fn\n+ const onContinue = jest.fn\n+ setup(onClose, onContinue)\n+\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n+ expect(screen.getByRole('alert')).toBeInTheDocument()\n+ expect(screen.getByRole('alert')).toHaveClass('alert-warning')\n+\n+ expect(screen.getByText(/patients\\.warning/i)).toBeInTheDocument()\n+\n+ expect(\n+ screen.getByRole('button', {\n+ name: /actions\\.cancel/i,\n+ }),\n+ ).toBeInTheDocument()\n+\n+ expect(\n+ screen.getByRole('button', {\n+ name: /actions\\.save/i,\n+ }),\n+ ).toBeInTheDocument()\n})\ndescribe('cancel', () => {\nit('should call the onCloseButtonClick function when the close button is clicked', () => {\nconst onCloseButtonClickSpy = jest.fn()\n- const closeButtonProp = 'closeButton'\n- setupOnClick(onCloseButtonClickSpy, jest.fn(), closeButtonProp)\n+ setup(onCloseButtonClickSpy, jest.fn())\n+\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /actions\\.cancel/i,\n+ }),\n+ )\nexpect(onCloseButtonClickSpy).toHaveBeenCalledTimes(1)\n})\n})\n@@ -82,8 +73,13 @@ describe('Duplicate New Patient Modal', () => {\ndescribe('on save', () => {\nit('should call the onContinueButtonClick function when the continue button is clicked', () => {\nconst onContinueButtonClickSpy = jest.fn()\n- const continueButtonProp = 'successButton'\n- setupOnClick(jest.fn(), onContinueButtonClickSpy, continueButtonProp)\n+ setup(jest.fn(), onContinueButtonClickSpy)\n+\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /actions\\.save/i,\n+ }),\n+ )\nexpect(onContinueButtonClickSpy).toHaveBeenCalledTimes(1)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/components/navbar/pageMap.tsx", "new_path": "src/shared/components/navbar/pageMap.tsx", "diff": "@@ -89,18 +89,6 @@ const pageMap: {\npath: '/incidents/visualize',\nicon: 'incident',\n},\n- newVisit: {\n- permission: Permissions.AddVisit,\n- label: 'visits.visit.new',\n- path: '/visits',\n- icon: 'add',\n- },\n- viewVisits: {\n- permission: Permissions.ReadVisits,\n- label: 'visits.visit.label',\n- path: '/visits',\n- icon: 'visit',\n- },\nsettings: {\npermission: null,\nlabel: 'settings.label',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "new_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "diff": "@@ -35,6 +35,8 @@ describe('Search Patients', () => {\nawait waitFor(() => {\nexpect(screen.getByRole('heading', { name: /patients\\.nopatients/i })).toBeInTheDocument()\n+ })\n+ await waitFor(() => {\nexpect(screen.getByRole('button', { name: /patients\\.newpatient/i })).toBeInTheDocument()\n})\n})\n@@ -55,18 +57,33 @@ describe('Search Patients', () => {\nawait waitFor(() => {\nexpect(screen.getByRole('heading', { name: /patients\\.nopatients/i })).toBeInTheDocument()\n+ })\n+\n+ await waitFor(() => {\nexpect(screen.getByRole('button', { name: /patients\\.newpatient/i })).toBeInTheDocument()\n})\nconst patientSearch = screen.getByPlaceholderText(/actions\\.search/i)\nuserEvent.type(patientSearch, expectedSearch)\n+\n+ await waitFor(() => {\nexpect(patientSearch).toHaveDisplayValue(expectedSearch)\n+ })\nawait waitFor(() => {\nexpect(screen.getByRole('cell', { name: expectedPatient.code })).toBeInTheDocument()\n+ })\n+\n+ await waitFor(() => {\nexpect(screen.getByRole('cell', { name: expectedPatient.givenName })).toBeInTheDocument()\n+ })\n+ await waitFor(() => {\nexpect(screen.getByRole('cell', { name: expectedPatient.familyName })).toBeInTheDocument()\n+ })\n+ await waitFor(() => {\nexpect(screen.getByRole('cell', { name: expectedPatient.sex })).toBeInTheDocument()\n+ })\n+ await waitFor(() => {\nexpect(\nscreen.getByRole('cell', { name: format(dateOfBirth, 'MM/dd/yyyy') }),\n).toBeInTheDocument()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/medications/MedicationsList.test.tsx", "new_path": "src/__tests__/patients/medications/MedicationsList.test.tsx", "diff": "-import * as components from '@hospitalrun/components'\n-import { Table } from '@hospitalrun/components'\n-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -48,82 +46,53 @@ const setup = async (patient = expectedPatient, medications = expectedMedication\njest.spyOn(PatientRepository, 'getMedications').mockResolvedValue(medications)\nstore = mockStore({ patient, medications: { medications } } as any)\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Router history={history}>\n<Provider store={store}>\n<MedicationsList patient={patient} />\n</Provider>\n</Router>,\n)\n- })\n-\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper }\n}\ndescribe('MedicationsList', () => {\ndescribe('Table', () => {\nit('should render a list of medications', async () => {\n- const { wrapper } = await setup()\n-\n- const table = wrapper.find(Table)\n-\n- const columns = table.prop('columns')\n- const actions = table.prop('actions') as any\n-\n- expect(table).toHaveLength(1)\n-\n- expect(columns[0]).toEqual(\n- expect.objectContaining({ label: 'medications.medication.medication', key: 'medication' }),\n- )\n- expect(columns[1]).toEqual(\n- expect.objectContaining({ label: 'medications.medication.priority', key: 'priority' }),\n- )\n- expect(columns[2]).toEqual(\n- expect.objectContaining({ label: 'medications.medication.intent', key: 'intent' }),\n- )\n- expect(columns[3]).toEqual(\n- expect.objectContaining({\n- label: 'medications.medication.requestedOn',\n- key: 'requestedOn',\n- }),\n- )\n- expect(columns[4]).toEqual(\n- expect.objectContaining({\n- label: 'medications.medication.status',\n- key: 'status',\n- }),\n- )\n- expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n- expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n- expect(table.prop('data')).toEqual(expectedMedications)\n+ setup()\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /medications.medication.medication/i }),\n+ ).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /medications.medication.priority/i }),\n+ ).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /medications.medication.intent/i }),\n+ ).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /medications.medication.requestedOn/i }),\n+ ).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /medications.medication.status/i }),\n+ ).toBeInTheDocument()\n+ expect(screen.getByRole('columnheader', { name: /actions.label/i })).toBeInTheDocument()\n+ expect(screen.getAllByRole('button', { name: /actions.view/i })[0]).toBeInTheDocument()\n})\nit('should navigate to medication view on medication click', async () => {\n- const { wrapper } = await setup()\n- const tr = wrapper.find('tr').at(1)\n-\n- act(() => {\n- const onClick = tr.find('button').at(0).prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n- })\n-\n+ setup()\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n+ userEvent.click(screen.getAllByRole('button', { name: /actions.view/i })[0])\nexpect(history.location.pathname).toEqual('/medications/123456')\n})\n})\ndescribe('no patient medications', () => {\nit('should render a warning message if there are no medications', async () => {\n- const { wrapper } = await setup(expectedPatient, [])\n- const alert = wrapper.find(components.Alert)\n-\n- expect(alert).toHaveLength(1)\n- expect(alert.prop('title')).toEqual('patient.medications.warning.noMedications')\n- expect(alert.prop('message')).toEqual('patient.medications.noMedicationsMessage')\n+ setup(expectedPatient, [])\n+ expect(await screen.findByRole('alert')).toBeInTheDocument()\n+ expect(screen.getByText(/patient.medications.warning.noMedications/i)).toBeInTheDocument()\n+ expect(screen.getByText(/patient.medications.noMedicationsMessage/i)).toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ImportantPatientInfo.test.tsx", "new_path": "src/__tests__/patients/view/ImportantPatientInfo.test.tsx", "diff": "-import * as components from '@hospitalrun/components'\n+import { render, screen, within } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport format from 'date-fns/format'\n-import { mount } from 'enzyme'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import NewAllergyModal from '../../../patients/allergies/NewAllergyModal'\n-import AddDiagnosisModal from '../../../patients/diagnoses/AddDiagnosisModal'\nimport ImportantPatientInfo from '../../../patients/view/ImportantPatientInfo'\n-import AddVisitModal from '../../../patients/visits/AddVisitModal'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport CarePlan from '../../../shared/model/CarePlan'\nimport Diagnosis from '../../../shared/model/Diagnosis'\n@@ -63,194 +59,127 @@ describe('Important Patient Info Panel', () => {\nuser = { permissions }\nstore = mockStore({ patient, user } as any)\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await mount(\n+ return render(\n<Provider store={store}>\n<Router history={history}>\n<ImportantPatientInfo patient={patient} />\n</Router>\n</Provider>,\n)\n- })\n- wrapper.update()\n- return wrapper\n}\ndescribe(\"patient's full name, patient's code, sex, and date of birth\", () => {\nit(\"should render patient's full name\", async () => {\n- const wrapper = await setup(expectedPatient, [])\n- const code = wrapper.find('.col-2')\n- expect(code.at(0).text()).toEqual(expectedPatient.fullName)\n+ setup(expectedPatient, [])\n+ if (typeof expectedPatient.fullName !== 'undefined') {\n+ expect(screen.getByText(expectedPatient.fullName)).toBeInTheDocument()\n+ }\n})\nit(\"should render patient's code\", async () => {\n- const wrapper = await setup(expectedPatient, [])\n- const code = wrapper.find('.col-2')\n- expect(code.at(1).text()).toEqual(`patient.code${expectedPatient.code}`)\n+ setup(expectedPatient, [])\n+ expect(screen.getByText(expectedPatient.code)).toBeInTheDocument()\n})\nit(\"should render patient's sex\", async () => {\n- const wrapper = await setup(expectedPatient, [])\n- const sex = wrapper.find('.patient-sex')\n- expect(sex.text()).toEqual(`patient.sex${expectedPatient.sex}`)\n+ setup(expectedPatient, [])\n+ expect(screen.getByText(expectedPatient.sex)).toBeInTheDocument()\n})\nit(\"should render patient's dateOfDate\", async () => {\n- const wrapper = await setup(expectedPatient, [])\n- const dateOfBirth = wrapper.find('.patient-dateOfBirth')\n- expect(dateOfBirth.text()).toEqual(`patient.dateOfBirth${expectedPatient.dateOfBirth}`)\n+ setup(expectedPatient, [])\n+ expect(screen.getAllByText(expectedPatient.dateOfBirth)[0]).toBeInTheDocument()\n})\n})\ndescribe('add new visit button', () => {\nit('should render an add visit button if user has correct permissions', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddVisit])\n-\n- const addNewButton = wrapper.find(components.Button)\n- expect(addNewButton).toHaveLength(1)\n- expect(addNewButton.text().trim()).toEqual('patient.visits.new')\n+ setup(expectedPatient, [Permissions.AddVisit])\n+ expect(screen.getByRole('button', { name: /patient.visits.new/i })).toBeInTheDocument()\n})\nit('should open the add visit modal on click', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddVisit])\n-\n- act(() => {\n- const addNewButton = wrapper.find(components.Button)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n-\n- const modal = wrapper.find(AddVisitModal)\n- expect(modal.prop('show')).toBeTruthy()\n+ setup(expectedPatient, [Permissions.AddVisit])\n+ userEvent.click(screen.getByText(/patient.visits.new/i))\n+ expect(await screen.findByRole('dialog')).toBeInTheDocument()\n+ const { getByText: getByTextModal } = within(screen.getByRole('dialog'))\n+ expect(getByTextModal(/patient.visits.new/i, { selector: 'div' })).toBeInTheDocument()\n})\nit('should close the modal when the close button is clicked', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddVisit])\n-\n- act(() => {\n- const addNewButton = wrapper.find(components.Button)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n-\n- act(() => {\n- const modal = wrapper.find(AddVisitModal)\n- const onClose = modal.prop('onCloseButtonClick') as any\n- onClose()\n- })\n- wrapper.update()\n-\n- expect(wrapper.find(AddVisitModal).prop('show')).toBeFalsy()\n+ setup(expectedPatient, [Permissions.AddVisit])\n+ userEvent.click(screen.getByText(/patient.visits.new/i))\n+ expect(await screen.findByRole('dialog')).toBeInTheDocument()\n+ const { getAllByRole: getAllByRoleModal } = within(screen.getByRole('dialog'))\n+ userEvent.click(getAllByRoleModal('button')[0])\n+ expect(await screen.findByRole('dialog')).not.toBeInTheDocument()\n})\nit('should not render new visit button if user does not have permissions', async () => {\n- const wrapper = await setup(expectedPatient, [])\n-\n- expect(wrapper.find(components.Button)).toHaveLength(0)\n+ setup(expectedPatient, [])\n+ expect(screen.queryByRole('button', { name: /patient.visits.new/i })).not.toBeInTheDocument()\n})\n})\ndescribe('add new allergy button', () => {\nit('should render an add allergy button if user has correct permissions', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddAllergy])\n-\n- const addNewButton = wrapper.find(components.Button)\n- expect(addNewButton).toHaveLength(1)\n- expect(addNewButton.text().trim()).toEqual('patient.allergies.new')\n+ setup(expectedPatient, [Permissions.AddAllergy])\n+ expect(screen.getByRole('button', { name: /patient.allergies.new/i })).toBeInTheDocument()\n})\nit('should open the add allergy modal on click', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddAllergy])\n-\n- act(() => {\n- const addNewButton = wrapper.find(components.Button)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n-\n- const modal = wrapper.find(NewAllergyModal)\n- expect(modal.prop('show')).toBeTruthy()\n+ setup(expectedPatient, [Permissions.AddAllergy])\n+ userEvent.click(screen.getByRole('button', { name: /patient.allergies.new/i }))\n+ expect(await screen.findByRole('dialog')).toBeInTheDocument()\n+ const { getByLabelText: getByLabelTextModal } = within(screen.getByRole('dialog'))\n+ expect(getByLabelTextModal(/patient.allergies.allergyName/i)).toBeInTheDocument()\n})\nit('should close the modal when the close button is clicked', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddAllergy])\n-\n- act(() => {\n- const addNewButton = wrapper.find(components.Button)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n-\n- act(() => {\n- const modal = wrapper.find(NewAllergyModal)\n- const onClose = modal.prop('onCloseButtonClick') as any\n- onClose()\n- })\n- wrapper.update()\n-\n- expect(wrapper.find(NewAllergyModal).prop('show')).toBeFalsy()\n+ setup(expectedPatient, [Permissions.AddAllergy])\n+ userEvent.click(screen.getByRole('button', { name: /patient.allergies.new/i }))\n+ expect(await screen.findByRole('dialog')).toBeInTheDocument()\n+ const { getAllByRole: getAllByRoleModal } = within(screen.getByRole('dialog'))\n+ userEvent.click(getAllByRoleModal('button')[0])\n+ expect(await screen.findByRole('dialog')).not.toBeInTheDocument()\n})\nit('should not render new allergy button if user does not have permissions', async () => {\n- const wrapper = await setup(expectedPatient, [])\n-\n- expect(wrapper.find(components.Button)).toHaveLength(0)\n+ setup(expectedPatient, [])\n+ expect(\n+ screen.queryByRole('button', { name: /patient.allergies.new/i }),\n+ ).not.toBeInTheDocument()\n})\n})\ndescribe('add diagnoses button', () => {\nit('should render an add diagnosis button if user has correct permissions', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddDiagnosis])\n-\n- const addNewButton = wrapper.find(components.Button)\n- expect(addNewButton).toHaveLength(1)\n- expect(addNewButton.text().trim()).toEqual('patient.diagnoses.new')\n+ setup(expectedPatient, [Permissions.AddDiagnosis])\n+ expect(screen.getByRole('button', { name: /patient.diagnoses.new/i })).toBeInTheDocument()\n})\nit('should open the add diagnosis modal on click', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddDiagnosis])\n-\n- act(() => {\n- const addNewButton = wrapper.find(components.Button)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n-\n- const modal = wrapper.find(AddDiagnosisModal)\n- expect(modal.prop('show')).toBeTruthy()\n+ setup(expectedPatient, [Permissions.AddDiagnosis])\n+ userEvent.click(screen.getByRole('button', { name: /patient.diagnoses.new/i }))\n+ expect(await screen.findByRole('dialog')).toBeInTheDocument()\n+ const { getByLabelText: getByLabelTextModal } = within(screen.getByRole('dialog'))\n+ expect(getByLabelTextModal(/patient.diagnoses.diagnosisName/i)).toBeInTheDocument()\n})\nit('should close the modal when the close button is clicked', async () => {\n- const wrapper = await setup(expectedPatient, [Permissions.AddDiagnosis])\n-\n- act(() => {\n- const addNewButton = wrapper.find(components.Button)\n- const onClick = addNewButton.prop('onClick') as any\n- onClick()\n- })\n- wrapper.update()\n-\n- act(() => {\n- const modal = wrapper.find(AddDiagnosisModal)\n- const onClose = modal.prop('onCloseButtonClick') as any\n- onClose()\n- })\n- wrapper.update()\n-\n- expect(wrapper.find(AddDiagnosisModal).prop('show')).toBeFalsy()\n+ setup(expectedPatient, [Permissions.AddDiagnosis])\n+ userEvent.click(screen.getByRole('button', { name: /patient.diagnoses.new/i }))\n+ expect(await screen.findByRole('dialog')).toBeInTheDocument()\n+ const { getAllByRole: getAllByRoleModal } = within(screen.getByRole('dialog'))\n+ userEvent.click(getAllByRoleModal('button')[0])\n+ expect(await screen.findByRole('dialog')).not.toBeInTheDocument()\n})\nit('should not render new diagnosis button if user does not have permissions', async () => {\n- const wrapper = await setup(expectedPatient, [])\n-\n- expect(wrapper.find(components.Button)).toHaveLength(0)\n+ setup(expectedPatient, [])\n+ expect(\n+ screen.queryByRole('button', { name: /patient.diagnoses.new/i }),\n+ ).not.toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/Patients.test.tsx", "new_path": "src/__tests__/patients/Patients.test.tsx", "diff": "-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\n-import { MemoryRouter } from 'react-router-dom'\n+import { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import Dashboard from '../../dashboard/Dashboard'\nimport HospitalRun from '../../HospitalRun'\nimport { addBreadcrumbs } from '../../page-header/breadcrumbs/breadcrumbs-slice'\nimport * as titleUtil from '../../page-header/title/TitleContext'\n-import EditPatient from '../../patients/edit/EditPatient'\n-import NewPatient from '../../patients/new/NewPatient'\nimport * as patientNameUtil from '../../patients/util/patient-util'\n-import ViewPatient from '../../patients/view/ViewPatient'\nimport PatientRepository from '../../shared/db/PatientRepository'\nimport Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\n@@ -22,35 +18,39 @@ import { RootState } from '../../shared/store'\nconst { TitleProvider } = titleUtil\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('/patients/new', () => {\n- jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- it('should render the new patient screen when /patients/new is accessed', async () => {\n+const setup = (url: string, permissions: Permissions[] = []) => {\nconst store = mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions: [Permissions.WritePatients] },\n+ user: { user: { id: '123' }, permissions },\nbreadcrumbs: { breadcrumbs: [] },\npatient: {},\ncomponents: { sidebarCollapsed: false },\n} as any)\n+ const history = createMemoryHistory({ initialEntries: [url] })\n- let wrapper: any\n-\n- await act(async () => {\n- wrapper = await mount(\n+ return {\n+ store,\n+ history,\n+ ...render(\n<Provider store={store}>\n- <MemoryRouter initialEntries={['/patients/new']}>\n+ <Router history={history}>\n<TitleProvider>\n<HospitalRun />\n</TitleProvider>\n- </MemoryRouter>\n+ </Router>\n</Provider>,\n- )\n- })\n+ ),\n+ }\n+}\n- wrapper.update()\n+describe('/patients/new', () => {\n+ it('sould render the new patient screen when /patients/new is accessed', async () => {\n+ const { store } = setup('/patients/new', [Permissions.WritePatients])\n- expect(wrapper.find(NewPatient)).toHaveLength(1)\n+ expect(\n+ await screen.findByRole('heading', { name: /patients\\.newPatient/i }),\n+ ).toBeInTheDocument()\n+ // TODO: Figure out how to select these in the dom instead of checking the store\nexpect(store.getActions()).toContainEqual(\naddBreadcrumbs([\n{ i18nKey: 'patients.label', location: '/patients' },\n@@ -60,30 +60,15 @@ describe('/patients/new', () => {\n)\n})\n- it('should render the Dashboard if the user does not have write patient privileges', () => {\n- const wrapper = mount(\n- <Provider\n- store={mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions: [] },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)}\n- >\n- <MemoryRouter initialEntries={['/patients/new']}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n+ it('should render the Dashboard if the user does not have write patient privileges', async () => {\n+ setup('/patients/new')\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\n})\ndescribe('/patients/edit/:id', () => {\n- it('should render the edit patient screen when /patients/edit/:id is accessed', () => {\n+ it('should render the edit patient screen when /patients/edit/:id is accessed', async () => {\nconst patient = {\nid: '123',\nprefix: 'test',\n@@ -98,79 +83,36 @@ describe('/patients/edit/:id', () => {\n.spyOn(patientNameUtil, 'getPatientFullName')\n.mockReturnValue(`${patient.prefix} ${patient.givenName} ${patient.familyName}`)\n- const store = mockStore({\n- title: 'test',\n- user: {\n- user: { id: '123' },\n- permissions: [Permissions.WritePatients, Permissions.ReadPatients],\n- },\n- patient: { patient },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)\n-\n- const wrapper = mount(\n- <Provider store={store}>\n- <MemoryRouter initialEntries={['/patients/edit/123']}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n+ const { store } = setup('/patients/edit/123', [\n+ Permissions.WritePatients,\n+ Permissions.ReadPatients,\n+ ])\n- expect(wrapper.find(EditPatient)).toHaveLength(1)\n+ expect(\n+ await screen.findByRole('heading', { name: /patients\\.editPatient/i }),\n+ ).toBeInTheDocument()\n- expect(store.getActions()).toContainEqual({\n- ...addBreadcrumbs([\n+ // TODO: Figure out how to select these in the dom instead of checking the store\n+ expect(store.getActions()).toContainEqual(\n+ addBreadcrumbs([\n{ i18nKey: 'patients.label', location: '/patients' },\n{ text: 'test test test', location: `/patients/${patient.id}` },\n{ i18nKey: 'patients.editPatient', location: `/patients/${patient.id}/edit` },\n{ i18nKey: 'dashboard.label', location: '/' },\n]),\n- })\n+ )\n})\n- it('should render the Dashboard when the user does not have read patient privileges', () => {\n- const wrapper = mount(\n- <Provider\n- store={mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions: [Permissions.WritePatients] },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)}\n- >\n- <MemoryRouter initialEntries={['/patients/edit/123']}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n+ it('should render the Dashboard when the user does not have read patient privileges', async () => {\n+ setup('/patients/edit/123', [Permissions.WritePatients])\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\n- it('should render the Dashboard when the user does not have write patient privileges', () => {\n- const wrapper = mount(\n- <Provider\n- store={mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions: [Permissions.ReadPatients] },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)}\n- >\n- <MemoryRouter initialEntries={['/patients/edit/123']}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n+ it('should render the Dashboard when the user does not have write patient privileges', async () => {\n+ setup('/patients/edit/123', [Permissions.ReadPatients])\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\n})\n@@ -187,26 +129,11 @@ describe('/patients/:id', () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n- const store = mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions: [Permissions.ReadPatients] },\n- patient: { patient },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)\n+ const { store } = setup('/patients/123', [Permissions.ReadPatients])\n- const wrapper = mount(\n- <Provider store={store}>\n- <MemoryRouter initialEntries={['/patients/123']}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n-\n- expect(wrapper.find(ViewPatient)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /patient\\.label/i })).toBeInTheDocument()\n+ // TODO: Figure out how to select these in the dom instead of checking the store\nexpect(store.getActions()).toContainEqual(\naddBreadcrumbs([\n{ i18nKey: 'patients.label', location: '/patients' },\n@@ -216,24 +143,9 @@ describe('/patients/:id', () => {\n)\n})\n- it('should render the Dashboard when the user does not have read patient privileges', () => {\n- const wrapper = mount(\n- <Provider\n- store={mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions: [] },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)}\n- >\n- <MemoryRouter initialEntries={['/patients/123']}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n+ it('should render the Dashboard when the user does not have read patient privileges', async () => {\n+ setup('/patients/123')\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/edit/EditPatient.tsx", "new_path": "src/patients/edit/EditPatient.tsx", "diff": "@@ -26,11 +26,13 @@ const EditPatient = () => {\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(\n`${t('patients.editPatient')}: ${getPatientFullName(givenPatient)} (${getPatientCode(\ngivenPatient,\n)})`,\n)\n+ })\nconst breadcrumbs = [\n{ i18nKey: 'patients.label', location: '/patients' },\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/related-persons/RelatedPersonsTab.test.tsx", "new_path": "src/__tests__/patients/related-persons/RelatedPersonsTab.test.tsx", "diff": "-import * as components from '@hospitalrun/components'\n-import { Table } from '@hospitalrun/components'\n-import { act } from '@testing-library/react'\n-import { mount } from 'enzyme'\n+import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n-import { Router } from 'react-router-dom'\n+import { Route, Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'\nimport RelatedPersonTab from '../../../patients/related-persons/RelatedPersonTab'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\n+import RelatedPerson from '../../../shared/model/RelatedPerson'\nimport { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('Related Persons Tab', () => {\n- let wrapper: any\n- let history = createMemoryHistory()\n-\n- describe('Add New Related Person', () => {\n- let patient: any\n- let user: any\n- jest.spyOn(components, 'Toast')\n-\n- beforeEach(() => {\n- jest.resetAllMocks()\n- history = createMemoryHistory()\n-\n- patient = {\n+const setup = ({\n+ permissions = [Permissions.WritePatients, Permissions.ReadPatients],\n+ patientOverrides = {},\n+}: {\n+ permissions?: Permissions[]\n+ patientOverrides?: Partial<Patient>\n+} = {}) => {\n+ const expectedPatient = {\nid: '123',\nrev: '123',\n+ ...patientOverrides,\n+ } as Patient\n+ const expectedRelatedPerson = {\n+ givenName: 'Related',\n+ familyName: 'Patient',\n+ id: '123001',\n} as Patient\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patient)\n+ jest\n+ .spyOn(PatientRepository, 'find')\n+ .mockImplementation((id: string) =>\n+ id === expectedRelatedPerson.id\n+ ? Promise.resolve(expectedRelatedPerson)\n+ : Promise.resolve(expectedPatient),\n+ )\n+ jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedPatient)\njest.spyOn(PatientRepository, 'getLabs').mockResolvedValue([])\n- user = {\n- permissions: [Permissions.WritePatients, Permissions.ReadPatients],\n- }\n- act(() => {\n- wrapper = mount(\n+ const history = createMemoryHistory({ initialEntries: ['/patients/123/relatedpersons'] })\n+ const store = mockStore({\n+ user: {\n+ permissions,\n+ },\n+ patient: {},\n+ } as any)\n+\n+ return {\n+ expectedPatient,\n+ expectedRelatedPerson,\n+ history,\n+ ...render(\n+ <Provider store={store}>\n<Router history={history}>\n- <Provider store={mockStore({ patient, user } as any)}>\n- <RelatedPersonTab patient={patient} />\n- </Provider>\n- </Router>,\n- )\n- })\n- })\n+ <Route path=\"/patients/:id\">\n+ <RelatedPersonTab patient={expectedPatient} />\n+ </Route>\n+ </Router>\n+ </Provider>,\n+ ),\n+ }\n+}\n- it('should render a New Related Person button', () => {\n- const newRelatedPersonButton = wrapper.find(components.Button)\n+describe('Related Persons Tab', () => {\n+ describe('Add New Related Person', () => {\n+ it('should render a New Related Person button', async () => {\n+ setup()\n- expect(newRelatedPersonButton).toHaveLength(1)\n- expect(newRelatedPersonButton.text().trim()).toEqual('patient.relatedPersons.add')\n+ expect(await screen.findByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\n})\n- it('should not render a New Related Person button if the user does not have write privileges for a patient', () => {\n- user = { permissions: [Permissions.ReadPatients] }\n- act(() => {\n- wrapper = mount(\n- <Router history={history}>\n- <Provider store={mockStore({ patient, user } as any)}>\n- <RelatedPersonTab patient={patient} />\n- </Provider>\n- </Router>,\n- )\n- })\n- const newRelatedPersonButton = wrapper.find(components.Button)\n- expect(newRelatedPersonButton).toHaveLength(0)\n- })\n+ it('should not render a New Related Person button if the user does not have write privileges for a patient', async () => {\n+ const { container } = setup({ permissions: [Permissions.ReadPatients] })\n- it('should render a New Related Person modal', () => {\n- const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)\n+ await waitForElementToBeRemoved(container.querySelector(`[class^='css']`))\n- expect(newRelatedPersonModal.prop('show')).toBeFalsy()\n- expect(newRelatedPersonModal).toHaveLength(1)\n+ expect(\n+ screen.queryByRole('button', { name: /patient\\.relatedPersons\\.add/i }),\n+ ).not.toBeInTheDocument()\n})\n- it('should show the New Related Person modal when the New Related Person button is clicked', () => {\n- const newRelatedPersonButton = wrapper.find(components.Button)\n-\n- act(() => {\n- const onClick = newRelatedPersonButton.prop('onClick') as any\n- onClick()\n- })\n+ it('should show the New Related Person modal when the New Related Person button is clicked', async () => {\n+ setup()\n- wrapper.update()\n+ userEvent.click(await screen.findByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\n- const newRelatedPersonModal = wrapper.find(AddRelatedPersonModal)\n- expect(newRelatedPersonModal.prop('show')).toBeTruthy()\n+ expect(await screen.findByRole('dialog')).toBeInTheDocument()\n})\n})\ndescribe('Table', () => {\n- const patient = {\n- id: '123',\n- rev: '123',\n- relatedPersons: [{ patientId: '123001', type: 'type' }],\n- } as Patient\n- const expectedRelatedPerson = {\n- givenName: 'test',\n- familyName: 'test',\n- fullName: 'test test',\n- id: '123001',\n- type: 'type',\n- } as Patient\n-\n- const user = {\n- permissions: [Permissions.WritePatients, Permissions.ReadPatients],\n+ const relationShipType = 'Sibling'\n+ const patientOverrides = {\n+ relatedPersons: [{ patientId: '123001', type: relationShipType } as RelatedPerson],\n}\n- beforeEach(async () => {\n- jest.spyOn(PatientRepository, 'saveOrUpdate')\n- jest\n- .spyOn(PatientRepository, 'find')\n- .mockResolvedValueOnce(patient)\n- .mockResolvedValueOnce(expectedRelatedPerson)\n+ it('should render a list of related persons with their full name being displayed', async () => {\n+ const { expectedRelatedPerson } = setup({ patientOverrides })\n- await act(async () => {\n- wrapper = await mount(\n- <Router history={history}>\n- <Provider store={mockStore({ patient, user } as any)}>\n- <RelatedPersonTab patient={patient} />\n- </Provider>\n- </Router>,\n- )\n- })\n- wrapper.update()\n- })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n- it('should render a list of related persons with their full name being displayed', () => {\n- const table = wrapper.find(Table)\n- const columns = table.prop('columns')\n- const actions = table.prop('actions') as any\n- expect(columns[0]).toEqual(\n- expect.objectContaining({ label: 'patient.givenName', key: 'givenName' }),\n- )\n- expect(columns[1]).toEqual(\n- expect.objectContaining({ label: 'patient.familyName', key: 'familyName' }),\n- )\n- expect(columns[2]).toEqual(\n- expect.objectContaining({\n- label: 'patient.relatedPersons.relationshipType',\n- key: 'type',\n- }),\n- )\n+ expect(screen.getByRole('columnheader', { name: /patient\\.givenName/i })).toBeInTheDocument()\n+ expect(screen.getByRole('columnheader', { name: /patient\\.familyName/i })).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('columnheader', { name: /patient\\.relatedPersons\\.relationshipType/i }),\n+ ).toBeInTheDocument()\n+ expect(screen.getByRole('columnheader', { name: /actions\\.label/i })).toBeInTheDocument()\n- expect(actions[0]).toEqual(expect.objectContaining({ label: 'actions.view' }))\n- expect(actions[1]).toEqual(expect.objectContaining({ label: 'actions.delete' }))\n- expect(table.prop('actionsHeaderText')).toEqual('actions.label')\n- expect(table.prop('data')).toEqual([expectedRelatedPerson])\n+ expect(\n+ screen.getByRole('cell', { name: expectedRelatedPerson.givenName as string }),\n+ ).toBeInTheDocument()\n+ expect(\n+ screen.getByRole('cell', { name: expectedRelatedPerson.familyName as string }),\n+ ).toBeInTheDocument()\n+ expect(screen.getByRole('cell', { name: relationShipType })).toBeInTheDocument()\n+\n+ expect(screen.getByRole('button', { name: /actions\\.view/i })).toBeInTheDocument()\n+ expect(screen.getByRole('button', { name: /actions\\.delete/i })).toBeInTheDocument()\n})\nit('should remove the related person when the delete button is clicked', async () => {\n- const removeRelatedPersonSpy = jest.spyOn(PatientRepository, 'saveOrUpdate')\n- const tr = wrapper.find('tr').at(1)\n+ setup({ patientOverrides })\n- await act(async () => {\n- const onClick = tr.find('button').at(1).prop('onClick') as any\n- await onClick({ stopPropagation: jest.fn() })\n- })\n- expect(removeRelatedPersonSpy).toHaveBeenCalledWith({ ...patient, relatedPersons: [] })\n+ userEvent.click(await screen.findByRole('button', { name: /actions\\.delete/i }))\n+\n+ expect(\n+ await screen.findByText(/patient\\.relatedPersons\\.warning\\.noRelatedPersons/i),\n+ ).toBeInTheDocument()\n})\nit('should navigate to related person patient profile on related person click', async () => {\n- const tr = wrapper.find('tr').at(1)\n+ const { history } = setup({ patientOverrides })\n- act(() => {\n- const onClick = tr.find('button').at(0).prop('onClick') as any\n- onClick({ stopPropagation: jest.fn() })\n- })\n+ userEvent.click(await screen.findByRole('button', { name: /actions\\.view/i }))\nexpect(history.location.pathname).toEqual('/patients/123001')\n})\n})\n- describe('EmptyList', () => {\n- const patient = {\n- id: '123',\n- rev: '123',\n- } as Patient\n-\n- const user = {\n- permissions: [Permissions.WritePatients, Permissions.ReadPatients],\n- }\n-\n- beforeEach(async () => {\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue({\n- fullName: 'test test',\n- id: '123001',\n- } as Patient)\n+ it('should display a warning if patient has no related persons', async () => {\n+ setup()\n- await act(async () => {\n- wrapper = await mount(\n- <Router history={history}>\n- <Provider store={mockStore({ patient, user } as any)}>\n- <RelatedPersonTab patient={patient} />\n- </Provider>\n- </Router>,\n- )\n- })\n- wrapper.update()\n- })\n-\n- it('should display a warning if patient has no related persons', () => {\n- const warning = wrapper.find(components.Alert)\n- expect(warning).toBeDefined()\n- })\n+ expect(\n+ await screen.findByText(/patient\\.relatedPersons\\.warning\\.noRelatedPersons/i),\n+ ).toBeInTheDocument()\n+ expect(\n+ await screen.findByText(/patient\\.relatedPersons\\.addRelatedPersonAbove/i),\n+ ).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useCompleteLab.test.ts", "new_path": "src/__tests__/labs/hooks/useCompleteLab.test.ts", "diff": "@@ -21,10 +21,9 @@ describe('Use Complete lab', () => {\n} as Lab\nDate.now = jest.fn(() => expectedCompletedOnDate.valueOf())\n- jest.spyOn(LabRepository, 'saveOrUpdate').mockResolvedValue(expectedCompletedLab)\nbeforeEach(() => {\n- jest.clearAllMocks()\n+ jest.spyOn(LabRepository, 'saveOrUpdate').mockResolvedValue(expectedCompletedLab)\n})\nit('should save lab as complete', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useLabsSearch.test.ts", "new_path": "src/__tests__/labs/hooks/useLabsSearch.test.ts", "diff": "@@ -13,13 +13,9 @@ describe('Use Labs Search', () => {\n},\n] as Lab[]\n- const labRepositoryFindAllSpy = jest\n- .spyOn(LabRepository, 'findAll')\n- .mockResolvedValue(expectedLabs)\n- const labRepositorySearchSpy = jest.spyOn(LabRepository, 'search').mockResolvedValue(expectedLabs)\n-\nbeforeEach(() => {\n- labRepositoryFindAllSpy.mockClear()\n+ jest.spyOn(LabRepository, 'findAll').mockResolvedValue(expectedLabs)\n+ jest.spyOn(LabRepository, 'search').mockResolvedValue(expectedLabs)\n})\nit('should return all labs', async () => {\n@@ -36,8 +32,8 @@ describe('Use Labs Search', () => {\nactualData = result.current.data\n})\n- expect(labRepositoryFindAllSpy).toHaveBeenCalledTimes(1)\n- expect(labRepositorySearchSpy).not.toHaveBeenCalled()\n+ expect(LabRepository.findAll).toHaveBeenCalledTimes(1)\n+ expect(LabRepository.search).not.toHaveBeenCalled()\nexpect(actualData).toEqual(expectedLabs)\n})\n@@ -55,9 +51,9 @@ describe('Use Labs Search', () => {\nactualData = result.current.data\n})\n- expect(labRepositoryFindAllSpy).not.toHaveBeenCalled()\n- expect(labRepositorySearchSpy).toHaveBeenCalledTimes(1)\n- expect(labRepositorySearchSpy).toHaveBeenCalledWith(\n+ expect(LabRepository.findAll).not.toHaveBeenCalled()\n+ expect(LabRepository.search).toHaveBeenCalledTimes(1)\n+ expect(LabRepository.search).toHaveBeenCalledWith(\nexpect.objectContaining(expectedLabsSearchRequest),\n)\nexpect(actualData).toEqual(expectedLabs)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useRequestLab.test.ts", "new_path": "src/__tests__/labs/hooks/useRequestLab.test.ts", "diff": "@@ -20,10 +20,9 @@ describe('Use Request lab', () => {\n} as Lab\nDate.now = jest.fn(() => expectedRequestedOnDate.valueOf())\n- jest.spyOn(LabRepository, 'save').mockResolvedValue(expectedRequestedLab)\nbeforeEach(() => {\n- jest.clearAllMocks()\n+ jest.spyOn(LabRepository, 'save').mockResolvedValue(expectedRequestedLab)\n})\nit('should save new request lab', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "@@ -21,30 +21,13 @@ import { RootState } from '../../../shared/store'\nimport { expectOneConsoleError } from '../../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('New Lab Request', () => {\n- let history: any\n+\nconst setup = (\nstore = mockStore({\ntitle: '',\nuser: { user: { id: 'userId' } },\n} as any),\n) => {\n- history = createMemoryHistory()\n- history.push(`/labs/new`)\n- jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n-\n- return render(\n- <Provider store={store}>\n- <Router history={history}>\n- <titleUtil.TitleProvider>\n- <NewLabRequest />\n- </titleUtil.TitleProvider>\n- </Router>\n- </Provider>,\n- )\n- }\n-\n- describe('form layout', () => {\nconst expectedDate = new Date()\nconst expectedNotes = 'expected notes'\nconst expectedLab = {\n@@ -56,26 +39,55 @@ describe('New Lab Request', () => {\nrequestedOn: expectedDate.toISOString(),\n} as Lab\n- const visits = [\n+ const expectedVisits = [\n{\nstartDateTime: new Date().toISOString(),\nid: 'visit_id',\ntype: 'visit_type',\n},\n] as Visit[]\n- const expectedPatient = { id: expectedLab.patient, fullName: 'Jim Bob', visits } as Patient\n+ const expectedPatient = {\n+ id: expectedLab.patient,\n+ givenName: 'Jim',\n+ familyName: 'Bob',\n+ fullName: 'Jim Bob',\n+ visits: expectedVisits,\n+ } as Patient\n- beforeAll(() => {\n- jest.resetAllMocks()\n+ jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\njest.spyOn(PatientRepository, 'search').mockResolvedValue([expectedPatient])\n- })\n+ jest.spyOn(LabRepository, 'save').mockResolvedValue(expectedLab)\n+\n+ const history = createMemoryHistory({ initialEntries: ['/labs/new'] })\n+\n+ return {\n+ history,\n+ expectedLab,\n+ expectedPatient,\n+ expectedVisits,\n+ ...render(\n+ <Provider store={store}>\n+ <Router history={history}>\n+ <titleUtil.TitleProvider>\n+ <NewLabRequest />\n+ </titleUtil.TitleProvider>\n+ </Router>\n+ </Provider>,\n+ ),\n+ }\n+}\n+\n+describe('New Lab Request', () => {\n+ describe('form layout', () => {\nit('should have called the useUpdateTitle hook', async () => {\nsetup()\n+\nexpect(titleUtil.useUpdateTitle).toHaveBeenCalledTimes(1)\n})\nit('should render a patient typeahead', async () => {\nsetup()\n+\nconst typeaheadInput = screen.getByPlaceholderText(/labs.lab.patient/i)\nexpect(screen.getByText(/labs\\.lab\\.patient/i)).toBeInTheDocument()\n@@ -85,6 +97,7 @@ describe('New Lab Request', () => {\nit('should render a type input box', async () => {\nsetup()\n+\nexpect(screen.getByText(/labs\\.lab\\.type/i)).toHaveAttribute(\n'title',\n'This is a required input',\n@@ -95,6 +108,7 @@ describe('New Lab Request', () => {\nit('should render a notes text field', async () => {\nsetup()\n+\nexpect(screen.getByLabelText(/labs\\.lab\\.notes/i)).not.toBeDisabled()\nexpect(screen.getByText(/labs\\.lab\\.notes/i)).not.toHaveAttribute(\n'title',\n@@ -104,6 +118,7 @@ describe('New Lab Request', () => {\nit('should render a visit select', async () => {\nsetup()\n+\nconst selectLabel = screen.getByText(/patient\\.visit/i)\nconst selectInput = screen.getByPlaceholderText('-- Choose --')\n@@ -115,45 +130,52 @@ describe('New Lab Request', () => {\nit('should render a save button', () => {\nsetup()\n+\nexpect(screen.getByRole('button', { name: /labs\\.requests\\.new/i })).toBeInTheDocument()\n})\nit('should render a cancel button', () => {\nsetup()\n+\nexpect(screen.getByRole('button', { name: /actions\\.cancel/i })).toBeInTheDocument()\n})\nit('should clear visit when patient is changed', async () => {\n- setup()\n- const typeaheadInput = screen.getByPlaceholderText(/labs.lab.patient/i)\n+ const { expectedVisits } = setup()\n+\n+ const patientTypeahead = screen.getByPlaceholderText(/labs.lab.patient/i)\nconst visitsInput = screen.getByPlaceholderText('-- Choose --')\n- userEvent.type(typeaheadInput, 'Jim Bob')\n- expect(await screen.findByText(/Jim Bob/i)).toBeVisible()\n- userEvent.click(screen.getByText(/Jim Bob/i))\n- expect(typeaheadInput).toHaveDisplayValue(/Jim Bob/i)\n- userEvent.click(visitsInput)\n+ userEvent.type(patientTypeahead, 'Jim Bob')\n+ userEvent.click(await screen.findByText(/Jim Bob/i))\n+ expect(patientTypeahead).toHaveDisplayValue(/Jim Bob/i)\n+ userEvent.click(visitsInput)\n// The visits dropdown should be populated with the patient's visits.\nuserEvent.click(\nawait screen.findByRole('link', {\n- name: `${visits[0].type} at ${format(\n- new Date(visits[0].startDateTime),\n+ name: `${expectedVisits[0].type} at ${format(\n+ new Date(expectedVisits[0].startDateTime),\n'yyyy-MM-dd hh:mm a',\n)}`,\n}),\n)\nexpect(visitsInput).toHaveDisplayValue(\n- `${visits[0].type} at ${format(new Date(visits[0].startDateTime), 'yyyy-MM-dd hh:mm a')}`,\n+ `${expectedVisits[0].type} at ${format(\n+ new Date(expectedVisits[0].startDateTime),\n+ 'yyyy-MM-dd hh:mm a',\n+ )}`,\n)\n- userEvent.clear(typeaheadInput)\n+ userEvent.clear(patientTypeahead)\n+ await waitFor(() => {\n// The visits dropdown option should be reset when the patient is changed.\nexpect(visitsInput).toHaveDisplayValue('')\n+ })\nexpect(\nscreen.queryByRole('link', {\n- name: `${visits[0].type} at ${format(\n- new Date(visits[0].startDateTime),\n+ name: `${expectedVisits[0].type} at ${format(\n+ new Date(expectedVisits[0].startDateTime),\n'yyyy-MM-dd hh:mm a',\n)}`,\n}),\n@@ -169,7 +191,6 @@ describe('New Lab Request', () => {\n} as LabError\nbeforeAll(() => {\n- jest.resetAllMocks()\njest.spyOn(validationUtil, 'validateLabRequest').mockReturnValue(error)\nexpectOneConsoleError(error)\n})\n@@ -195,12 +216,10 @@ describe('New Lab Request', () => {\n})\ndescribe('on cancel', () => {\n- it('should navigate back to /labs', () => {\n- setup()\n-\n- const cancelButton = screen.getByRole('button', { name: /actions\\.cancel/i })\n+ it('should navigate back to /labs', async () => {\n+ const { history } = setup()\n- userEvent.click(cancelButton)\n+ userEvent.click(await screen.findByRole('button', { name: /actions\\.cancel/i }))\nexpect(history.location.pathname).toEqual('/labs')\n})\n@@ -212,46 +231,20 @@ describe('New Lab Request', () => {\nuser: { user: { id: 'fake id' } },\n} as any)\n- const expectedDate = new Date()\n- const expectedNotes = 'expected notes'\n- const expectedLab = {\n- patient: '1234567',\n- type: 'expected type',\n- status: 'requested',\n- notes: [expectedNotes],\n- id: '1234',\n- requestedOn: expectedDate.toISOString(),\n- } as Lab\n-\n- const visits = [\n- {\n- startDateTime: new Date().toISOString(),\n- id: 'visit_id',\n- type: 'visit_type',\n- },\n- ] as Visit[]\n- const expectedPatient = { id: expectedLab.patient, fullName: 'Billy', visits } as Patient\n-\n- beforeAll(() => {\n- jest.resetAllMocks()\n- jest.spyOn(PatientRepository, 'search').mockResolvedValue([expectedPatient])\n- jest.spyOn(LabRepository, 'save').mockResolvedValue(expectedLab as Lab)\n- })\n-\nit('should save the lab request and navigate to \"/labs/:id\"', async () => {\n- setup(store)\n+ const { expectedLab, history } = setup(store)\n- userEvent.type(screen.getByPlaceholderText(/labs.lab.patient/i), 'Billy')\n+ userEvent.type(screen.getByPlaceholderText(/labs.lab.patient/i), 'Jim Bob')\nawait waitFor(\n() => {\n- expect(screen.getByText(/billy/i)).toBeVisible()\n+ expect(screen.getByText(/jim bob/i)).toBeVisible()\n},\n{ timeout: 3000 },\n)\n- userEvent.click(screen.getByText(/billy/i))\n+ userEvent.click(screen.getByText(/jim bob/i))\nuserEvent.type(screen.getByPlaceholderText(/labs\\.lab\\.type/i), expectedLab.type)\n- userEvent.type(screen.getByLabelText(/labs\\.lab\\.notes/i), expectedNotes)\n+ userEvent.type(screen.getByLabelText(/labs\\.lab\\.notes/i), (expectedLab.notes as string[])[0])\nuserEvent.click(screen.getByRole('button', { name: /labs\\.requests\\.new/i }))\n@@ -266,7 +259,10 @@ describe('New Lab Request', () => {\nstatus: 'requested',\n}),\n)\n+\n+ await waitFor(() => {\nexpect(history.location.pathname).toEqual(`/labs/${expectedLab.id}`)\n+ })\n}, 15000)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "new_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "diff": "@@ -95,6 +95,7 @@ describe('Allergies', () => {\nit('should add new allergy', async () => {\nsetup(expectedPatient)\n+\nuserEvent.click(\nscreen.getByRole('button', {\nname: /patient\\.allergies\\.new/i,\n@@ -108,19 +109,13 @@ describe('Allergies', () => {\nnewAllergy,\n)\n- await waitFor(() =>\nuserEvent.click(\nwithin(screen.getByRole('dialog')).getByRole('button', {\nname: /patient\\.allergies\\.new/i,\n}),\n- ),\n)\n- expect(\n- screen.getByRole('button', {\n- name: newAllergy,\n- }),\n- ).toBeInTheDocument()\n+ expect(await screen.findByText(newAllergy)).toBeInTheDocument()\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/CareGoalTab.test.tsx", "new_path": "src/__tests__/patients/care-goals/CareGoalTab.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render, screen, waitFor, waitForElementToBeRemoved } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\n-import { createMemoryHistory } from 'history'\n+import { createMemoryHistory, MemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\n@@ -16,8 +16,28 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('Care Goals Tab', () => {\n- const careGoal = {\n+type CareGoalTabWrapper = (store: any, history: MemoryHistory) => React.FC\n+\n+// eslint-disable-next-line react/prop-types\n+const TabWrapper: CareGoalTabWrapper = (store, history) => ({ children }) => (\n+ <Provider store={store}>\n+ <Router history={history}>\n+ <Route path=\"/patients/:id\">{children}</Route>\n+ </Router>\n+ </Provider>\n+)\n+\n+// eslint-disable-next-line react/prop-types\n+const ViewWrapper: CareGoalTabWrapper = (store: any, history: MemoryHistory) => ({ children }) => (\n+ <Provider store={store}>\n+ <Router history={history}>\n+ <Route path=\"/patients/:id/care-goals/:careGoalId\">{children}</Route>\n+ </Router>\n+ </Provider>\n+)\n+\n+const setup = (route: string, permissions: Permissions[], wrapper = TabWrapper) => {\n+ const expectedCareGoal = {\nid: '456',\nstatus: 'accepted',\nstartDate: new Date().toISOString(),\n@@ -28,59 +48,53 @@ describe('Care Goals Tab', () => {\ncreatedOn: new Date().toISOString(),\nnote: '',\n} as CareGoal\n- const patient = { id: '123', careGoals: [careGoal] as CareGoal[] } as Patient\n+ const expectedPatient = { id: '123', careGoals: [expectedCareGoal] } as Patient\n- const setup = async (route: string, permissions: Permissions[]) => {\n- jest.resetAllMocks()\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n+ const history = createMemoryHistory({ initialEntries: [route] })\nconst store = mockStore({ user: { permissions } } as any)\n- const history = createMemoryHistory()\n- history.push(route)\n- return render(\n- <Provider store={store}>\n- <Router history={history}>\n- <Route path=\"/patients/:id/care-goals\">\n- <CareGoalTab />\n- </Route>\n- </Router>\n- </Provider>,\n- )\n+ return render(<CareGoalTab />, { wrapper: wrapper(store, history) })\n}\n+describe('Care Goals Tab', () => {\nit('should render add care goal button if user has correct permissions', async () => {\n- setup('patients/123/care-goals', [Permissions.AddCareGoal])\n+ setup('/patients/123/care-goals', [Permissions.AddCareGoal])\n+\nexpect(await screen.findByRole('button', { name: /patient.careGoal.new/i })).toBeInTheDocument()\n})\nit('should not render add care goal button if user does not have permissions', async () => {\n- setup('patients/123/care-goals', [])\n+ const { container } = setup('/patients/123/care-goals', [])\n+\n+ await waitForElementToBeRemoved(container.querySelector('.css-0'))\n+\nexpect(screen.queryByRole('button', { name: /patient.careGoal.new/i })).not.toBeInTheDocument()\n})\n- it('should open the add care goal modal on click', async () => {\n- setup('patients/123/care-goals', [Permissions.AddCareGoal])\n- userEvent.click(await screen.findByRole('button', { name: /patient.careGoal.new/i }))\n- expect(screen.getByRole('dialog')).toBeVisible()\n- })\n+ it('should open and close the modal when the add care goal and close buttons are clicked', async () => {\n+ setup('/patients/123/care-goals', [Permissions.AddCareGoal])\n- it('should close the modal when the close button is clicked', async () => {\n- setup('patients/123/care-goals', [Permissions.AddCareGoal])\nuserEvent.click(await screen.findByRole('button', { name: /patient.careGoal.new/i }))\n+\nexpect(screen.getByRole('dialog')).toBeVisible()\n+\nuserEvent.click(screen.getByRole('button', { name: /close/i }))\n+\nexpect(screen.getByRole('dialog')).not.toBeVisible()\n})\n- it('should render care goal table when on patients/123/care-goals', async () => {\n- const { container } = await setup('patients/123/care-goals', [Permissions.ReadCareGoal])\n+ it('should render care goal table when on patients/:id/care-goals', async () => {\n+ const { container } = setup('/patients/123/care-goals', [Permissions.ReadCareGoal])\n+\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n})\n})\n- it('should render care goal view when on patients/123/care-goals/456', async () => {\n- setup('patients/123/care-goals/456', [Permissions.ReadCareGoal])\n+ it('should render care goal view when on patients/:id/care-goals/:careGoalId', async () => {\n+ setup('/patients/123/care-goals/456', [Permissions.ReadCareGoal], ViewWrapper)\n+\nexpect(await screen.findByRole('form')).toBeInTheDocument()\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "@@ -18,8 +18,7 @@ configure({ defaultHidden: true })\njest.setTimeout(10000)\nafterEach(() => {\n- // This is probably needed, but stuff REALLY blows up\n- // jest.restoreAllMocks()\n+ jest.restoreAllMocks()\nqueryCache.clear()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "diff": "@@ -18,17 +18,15 @@ import { RootState } from '../../../shared/store'\nconst { TitleProvider } = titleUtil\n-beforeEach(() => {\n- jest.clearAllMocks()\n-})\n+const now = new Date()\n-const setup = () => {\n+const setup = (start = new Date(now.setHours(14, 30))) => {\nconst expectedAppointment = {\nid: '123',\nrev: '1',\npatient: '1234',\n- startDateTime: new Date().toISOString(),\n- endDateTime: addMinutes(new Date(), 60).toISOString(),\n+ startDateTime: start.toISOString(),\n+ endDateTime: addMinutes(start, 60).toISOString(),\nlocation: 'location',\nreason: 'reason',\n} as Appointment\n@@ -36,6 +34,7 @@ const setup = () => {\nid: '123',\nfullName: 'patient full name',\n} as Patient\n+\njest.spyOn(titleUtil, 'useUpdateTitle').mockReturnValue(jest.fn())\njest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockImplementation(() => jest.fn())\njest.spyOn(AppointmentRepository, 'findAll').mockResolvedValue([expectedAppointment])\n@@ -94,4 +93,23 @@ describe('ViewAppointments', () => {\nexpect.stringContaining(expectedEnd),\n)\n})\n+\n+ it('should hard cap end appointment time', async () => {\n+ const { container, expectedAppointment } = setup(new Date(now.setHours(23, 45)))\n+\n+ await waitFor(() => {\n+ expect(container.querySelector('.fc-content-col .fc-time')).toBeInTheDocument()\n+ })\n+\n+ const expectedStart = format(new Date(expectedAppointment.startDateTime), 'h:mm')\n+\n+ expect(container.querySelector('.fc-content-col .fc-time')).toHaveAttribute(\n+ 'data-full',\n+ expect.stringContaining(expectedStart),\n+ )\n+ expect(container.querySelector('.fc-content-col .fc-time')).toHaveAttribute(\n+ 'data-full',\n+ expect.stringContaining('12:00'),\n+ )\n+ })\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "new_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "diff": "-import { Modal, Alert, Typeahead } from '@hospitalrun/components'\n-import { act } from '@testing-library/react'\n-import { mount } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport React from 'react'\nimport AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'\n-import TextInputWithLabelFormGroup from '../../../shared/components/input/TextInputWithLabelFormGroup'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport { expectOneConsoleError } from '../../test-utils/console.utils'\n@@ -12,26 +10,22 @@ import { expectOneConsoleError } from '../../test-utils/console.utils'\ndescribe('Add Related Person Modal', () => {\nconst patient = {\nid: '123',\n- prefix: 'prefix',\n- givenName: 'givenName',\n- familyName: 'familyName',\n- suffix: 'suffix',\n- sex: 'male',\n- type: 'charity',\n- occupation: 'occupation',\n- preferredLanguage: 'preferredLanguage',\n- phoneNumber: 'phoneNumber',\n- email: '[email protected]',\n- address: 'address',\n- code: 'P00001',\n- dateOfBirth: new Date().toISOString(),\n+ fullName: 'fullName',\n+ code: 'code1',\n+ } as Patient\n+ const patient2 = {\n+ id: '456',\n+ fullName: 'patient2',\n+ code: 'code2',\n} as Patient\nconst setup = () => {\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ jest.resetAllMocks()\n+ // jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+ jest.spyOn(PatientRepository, 'search').mockResolvedValue([patient, patient2])\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patient)\n- return mount(\n+ return render(\n<AddRelatedPersonModal\nshow\npatientId={patient.id}\n@@ -43,50 +37,38 @@ describe('Add Related Person Modal', () => {\ndescribe('layout', () => {\nit('should render a modal', () => {\n- const wrapper = setup()\n- const modal = wrapper.find(Modal)\n- expect(modal).toHaveLength(1)\n- expect(modal.prop('show')).toBeTruthy()\n+ setup()\n+ expect(screen.getByRole('dialog')).toBeInTheDocument()\n})\nit('should render a patient search typeahead', () => {\n- const wrapper = setup()\n- const patientSearchTypeahead = wrapper.find(Typeahead)\n-\n- expect(patientSearchTypeahead).toHaveLength(1)\n- expect(patientSearchTypeahead.prop('placeholder')).toEqual('patient.relatedPerson')\n+ setup()\n+ expect(screen.getByPlaceholderText(/^patient.relatedPerson$/i)).toBeInTheDocument()\n})\nit('should render a relationship type text input', () => {\n- const wrapper = setup()\n- const relationshipTypeTextInput = wrapper.findWhere((w: any) => w.prop('name') === 'type')\n-\n- expect(relationshipTypeTextInput).toHaveLength(1)\n- expect(relationshipTypeTextInput.type()).toBe(TextInputWithLabelFormGroup)\n- expect(relationshipTypeTextInput.prop('name')).toEqual('type')\n- expect(relationshipTypeTextInput.prop('isEditable')).toBeTruthy()\n- expect(relationshipTypeTextInput.prop('label')).toEqual(\n- 'patient.relatedPersons.relationshipType',\n+ setup()\n+ const relationshipTypeInput = screen.getByLabelText(\n+ /^patient.relatedPersons.relationshipType$/i,\n)\n+ expect(relationshipTypeInput).toBeInTheDocument()\n+ expect(relationshipTypeInput).not.toBeDisabled()\n})\nit('should render a cancel button', () => {\n- const wrapper = setup()\n- const cancelButton = wrapper.findWhere(\n- (w: { text: () => string }) => w.text() === 'actions.cancel',\n- )\n-\n- expect(cancelButton).toHaveLength(1)\n+ setup()\n+ expect(screen.getByRole('button', { name: /close/i })).toBeInTheDocument()\n})\nit('should render an add new related person button button', () => {\n- const wrapper = setup()\n- const modal = wrapper.find(Modal) as any\n- expect(modal.prop('successButton').children).toEqual('patient.relatedPersons.add')\n+ setup()\n+ expect(\n+ screen.getByRole('button', { name: /patient.relatedPersons.add/i }),\n+ ).toBeInTheDocument()\n})\nit('should render the error when there is an error saving', async () => {\n- const wrapper = setup()\n+ setup()\nconst expectedErrorMessage = 'patient.relatedPersons.error.unableToAddRelatedPerson'\nconst expectedError = {\nrelatedPersonError: 'patient.relatedPersons.error.relatedPersonRequired',\n@@ -94,44 +76,30 @@ describe('Add Related Person Modal', () => {\n}\nexpectOneConsoleError(expectedError)\n- await act(async () => {\n- const modal = wrapper.find(Modal)\n- const onSave = (modal.prop('successButton') as any).onClick\n- await onSave({} as React.MouseEvent<HTMLButtonElement>)\n- })\n- wrapper.update()\n-\n- const alert = wrapper.find(Alert)\n- const typeahead = wrapper.find(Typeahead)\n- const relationshipTypeInput = wrapper.find(TextInputWithLabelFormGroup)\n-\n- expect(alert.prop('message')).toEqual(expectedErrorMessage)\n- expect(alert.prop('title')).toEqual('states.error')\n- expect(typeahead.prop('isInvalid')).toBeTruthy()\n- expect(relationshipTypeInput.prop('isInvalid')).toBeTruthy()\n- expect(relationshipTypeInput.prop('feedback')).toEqual(expectedError.relationshipTypeError)\n+ userEvent.click(screen.getByRole('button', { name: /patient.relatedPersons.add/i }))\n+ expect(await screen.findByRole('alert')).toBeInTheDocument()\n+ expect(screen.getByText(expectedErrorMessage)).toBeInTheDocument()\n+ expect(screen.getByText(/states.error/i)).toBeInTheDocument()\n+ expect(screen.getByPlaceholderText(/^patient.relatedPerson$/i)).toHaveClass('is-invalid')\n+ expect(screen.getByLabelText(/^patient.relatedPersons.relationshipType$/i)).toHaveClass(\n+ 'is-invalid',\n+ )\n+ expect(screen.getByText(expectedError.relatedPersonError)).toBeInTheDocument()\n+ expect(screen.getByText(expectedError.relationshipTypeError)).toBeInTheDocument()\n})\n})\ndescribe('save', () => {\nit('should call the save function with the correct data', async () => {\n- const wrapper = setup()\n- act(() => {\n- const patientTypeahead = wrapper.find(Typeahead)\n- patientTypeahead.prop('onChange')([{ id: '123' }])\n- })\n- wrapper.update()\n+ setup()\n+ userEvent.type(screen.getByPlaceholderText(/^patient.relatedPerson$/i), patient2.fullName)\n+ userEvent.click(await screen.findByText(`${patient.fullName} (${patient.code})`))\n- act(() => {\n- const relationshipTypeTextInput = wrapper.findWhere((w: any) => w.prop('name') === 'type')\n- relationshipTypeTextInput.prop('onChange')({ target: { value: 'relationship' } })\n- })\n- wrapper.update()\n-\n- await act(async () => {\n- const { onClick } = wrapper.find(Modal).prop('successButton') as any\n- await onClick({} as React.MouseEvent<HTMLButtonElement, MouseEvent>)\n- })\n+ userEvent.type(\n+ screen.getByLabelText(/^patient.relatedPersons.relationshipType$/i),\n+ 'relationship',\n+ )\n+ userEvent.click(screen.getByRole('button', { name: /patient.relatedPersons.add/i }))\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/hooks/useImagingRequest.test.tsx", "new_path": "src/__tests__/imagings/hooks/useImagingRequest.test.tsx", "diff": "-import { renderHook, act } from '@testing-library/react-hooks'\n-\nimport useImagingRequest from '../../../imagings/hooks/useImagingRequest'\nimport ImagingRepository from '../../../shared/db/ImagingRepository'\nimport Imaging from '../../../shared/model/Imaging'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('useImagingRequest', () => {\nit('should get an imaging request by id', async () => {\n@@ -17,13 +15,7 @@ describe('useImagingRequest', () => {\n} as Imaging\njest.spyOn(ImagingRepository, 'find').mockResolvedValue(expectedImagingRequest)\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useImagingRequest(expectedImagingId))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useImagingRequest(expectedImagingId))\nexpect(ImagingRepository.find).toHaveBeenCalledTimes(1)\nexpect(ImagingRepository.find).toBeCalledWith(expectedImagingId)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/hooks/useImagingSearch.test.tsx", "new_path": "src/__tests__/imagings/hooks/useImagingSearch.test.tsx", "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\nimport useImagingSearch from '../../../imagings/hooks/useImagingSearch'\nimport ImagingSearchRequest from '../../../imagings/model/ImagingSearchRequest'\nimport ImagingRepository from '../../../shared/db/ImagingRepository'\nimport SortRequest from '../../../shared/db/SortRequest'\nimport Imaging from '../../../shared/model/Imaging'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\nconst defaultSortRequest: SortRequest = {\nsorts: [\n@@ -25,13 +23,7 @@ describe('useImagingSearch', () => {\nconst expectedImagingRequests = [{ id: 'some id' }] as Imaging[]\njest.spyOn(ImagingRepository, 'search').mockResolvedValue(expectedImagingRequests)\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useImagingSearch(expectedSearchRequest))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useImagingSearch(expectedSearchRequest))\nexpect(ImagingRepository.search).toHaveBeenCalledTimes(1)\nexpect(ImagingRepository.search).toBeCalledWith({\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/hooks/useIncident.test.tsx", "new_path": "src/__tests__/incidents/hooks/useIncident.test.tsx", "diff": "-import { renderHook, act } from '@testing-library/react-hooks'\n-\nimport useIncident from '../../../incidents/hooks/useIncident'\nimport IncidentRepository from '../../../shared/db/IncidentRepository'\nimport Incident from '../../../shared/model/Incident'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('useIncident', () => {\nit('should get an incident by id', async () => {\n@@ -13,13 +11,7 @@ describe('useIncident', () => {\n} as Incident\njest.spyOn(IncidentRepository, 'find').mockResolvedValue(expectedIncident)\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useIncident(expectedIncidentId))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useIncident(expectedIncidentId))\nexpect(IncidentRepository.find).toHaveBeenCalledTimes(1)\nexpect(IncidentRepository.find).toBeCalledWith(expectedIncidentId)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/hooks/useIncidents.test.tsx", "new_path": "src/__tests__/incidents/hooks/useIncidents.test.tsx", "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\nimport useIncidents from '../../../incidents/hooks/useIncidents'\nimport IncidentFilter from '../../../incidents/IncidentFilter'\nimport IncidentSearchRequest from '../../../incidents/model/IncidentSearchRequest'\nimport IncidentRepository from '../../../shared/db/IncidentRepository'\nimport Incident from '../../../shared/model/Incident'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('useIncidents', () => {\nit('it should search incidents', async () => {\n@@ -19,13 +17,7 @@ describe('useIncidents', () => {\n] as Incident[]\njest.spyOn(IncidentRepository, 'search').mockResolvedValue(expectedIncidents)\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useIncidents(expectedSearchRequest))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useIncidents(expectedSearchRequest))\nexpect(IncidentRepository.search).toHaveBeenCalledTimes(1)\nexpect(IncidentRepository.search).toBeCalledWith(expectedSearchRequest)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useLab.test.ts", "new_path": "src/__tests__/labs/hooks/useLab.test.ts", "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\nimport useLab from '../../../labs/hooks/useLab'\nimport LabRepository from '../../../shared/db/LabRepository'\nimport Lab from '../../../shared/model/Lab'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('Use lab', () => {\nconst expectedLabId = 'lab id'\n@@ -14,13 +12,7 @@ describe('Use lab', () => {\njest.spyOn(LabRepository, 'find').mockResolvedValue(expectedLab)\nit('should get a lab by id', async () => {\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useLab(expectedLabId))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useLab(expectedLabId))\nexpect(LabRepository.find).toHaveBeenCalledTimes(1)\nexpect(LabRepository.find).toHaveBeenCalledWith(expectedLabId)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useLabsSearch.test.ts", "new_path": "src/__tests__/labs/hooks/useLabsSearch.test.ts", "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\nimport useLabsSearch from '../../../labs/hooks/useLabsSearch'\nimport LabSearchRequest from '../../../labs/model/LabSearchRequest'\nimport LabRepository from '../../../shared/db/LabRepository'\nimport Lab from '../../../shared/model/Lab'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('Use Labs Search', () => {\nconst expectedLabs = [\n@@ -28,13 +26,7 @@ describe('Use Labs Search', () => {\nstatus: 'all',\n} as LabSearchRequest\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useLabsSearch(expectedLabsSearchRequest))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useLabsSearch(expectedLabsSearchRequest))\nexpect(labRepositoryFindAllSpy).toHaveBeenCalledTimes(1)\nexpect(labRepositorySearchSpy).not.toHaveBeenCalled()\n@@ -47,13 +39,7 @@ describe('Use Labs Search', () => {\nstatus: 'all',\n} as LabSearchRequest\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useLabsSearch(expectedLabsSearchRequest))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useLabsSearch(expectedLabsSearchRequest))\nexpect(labRepositoryFindAllSpy).not.toHaveBeenCalled()\nexpect(labRepositorySearchSpy).toHaveBeenCalledTimes(1)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/medications/hooks/useMedicationSearch.test.tsx", "new_path": "src/__tests__/medications/hooks/useMedicationSearch.test.tsx", "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\nimport useMedicationSearch from '../../../medications/hooks/useMedicationSearch'\nimport MedicationSearchRequest from '../../../medications/models/MedicationSearchRequest'\nimport MedicationRepository from '../../../shared/db/MedicationRepository'\nimport SortRequest from '../../../shared/db/SortRequest'\nimport Medication from '../../../shared/model/Medication'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\nconst defaultSortRequest: SortRequest = {\nsorts: [\n@@ -25,13 +23,7 @@ describe('useMedicationSearch', () => {\nconst expectedMedicationRequests = [{ id: 'some id' }] as Medication[]\njest.spyOn(MedicationRepository, 'search').mockResolvedValue(expectedMedicationRequests)\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useMedicationSearch(expectedSearchRequest))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useMedicationSearch(expectedSearchRequest))\nexpect(MedicationRepository.search).toHaveBeenCalledTimes(1)\nexpect(MedicationRepository.search).toBeCalledWith({\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/usePatientRelatedPersons.test.tsx", "new_path": "src/__tests__/patients/hooks/usePatientRelatedPersons.test.tsx", "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\nimport usePatientRelatedPersons from '../../../patients/hooks/usePatientRelatedPersons'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('use patient related persons', () => {\nbeforeEach(() => {\n@@ -27,13 +25,7 @@ describe('use patient related persons', () => {\n} as Patient)\n.mockResolvedValueOnce(expectedRelatedPersonPatientDetails)\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => usePatientRelatedPersons(expectedPatientId))\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- const { result } = renderHookResult\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => usePatientRelatedPersons(expectedPatientId))\nexpect(PatientRepository.find).toHaveBeenNthCalledWith(1, expectedPatientId)\nexpect(PatientRepository.find).toHaveBeenNthCalledWith(2, expectedRelatedPatientId)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/hooks/useAppointment.test.tsx", "new_path": "src/__tests__/scheduling/hooks/useAppointment.test.tsx", "diff": "-import { renderHook, act } from '@testing-library/react-hooks'\n-\nimport useAppointment from '../../../scheduling/hooks/useAppointment'\nimport AppointmentRepository from '../../../shared/db/AppointmentRepository'\nimport Appointment from '../../../shared/model/Appointment'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('useAppointment', () => {\nit('should get an appointment by id', async () => {\n@@ -13,13 +11,7 @@ describe('useAppointment', () => {\n} as Appointment\njest.spyOn(AppointmentRepository, 'find').mockResolvedValue(expectedAppointment)\n- let actualData: any\n- await act(async () => {\n- const renderHookResult = renderHook(() => useAppointment(expectedAppointmentId))\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useAppointment(expectedAppointmentId))\nexpect(AppointmentRepository.find).toHaveBeenCalledTimes(1)\nexpect(AppointmentRepository.find).toBeCalledWith(expectedAppointmentId)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/hooks/useAppointments.test.tsx", "new_path": "src/__tests__/scheduling/hooks/useAppointments.test.tsx", "diff": "-import { act, renderHook } from '@testing-library/react-hooks'\n-\nimport useAppointments from '../../../scheduling/hooks/useAppointments'\nimport AppointmentRepository from '../../../shared/db/AppointmentRepository'\nimport Appointment from '../../../shared/model/Appointment'\n-import waitUntilQueryIsSuccessful from '../../test-utils/wait-for-query.util'\n+import executeQuery from '../../test-utils/use-query.util'\ndescribe('useAppointments', () => {\nit('should get an appointment by id', async () => {\n@@ -31,16 +29,9 @@ describe('useAppointments', () => {\n] as Appointment[]\njest.spyOn(AppointmentRepository, 'findAll').mockResolvedValue(expectedAppointments)\n- let actualData: any\n- await act(async () => {\n- await act(async () => {\n- const renderHookResult = renderHook(() => useAppointments())\n- const { result } = renderHookResult\n- await waitUntilQueryIsSuccessful(renderHookResult)\n- actualData = result.current.data\n- })\n+ const actualData = await executeQuery(() => useAppointments())\n+\nexpect(AppointmentRepository.findAll).toHaveBeenCalledTimes(1)\nexpect(actualData).toEqual(expectedAppointments)\n})\n})\n-})\n" }, { "change_type": "DELETE", "old_path": "src/__tests__/test-utils/wait-for-query.util.ts", "new_path": null, "diff": "-const isQuerySuccessful = (queryResult: any) => queryResult && queryResult.status === 'success'\n-const waitUntilQueryIsSuccessful = (renderHookResult: any) =>\n- renderHookResult.waitFor(() => isQuerySuccessful(renderHookResult.result.current), {\n- timeout: 1000,\n- })\n-\n-export default waitUntilQueryIsSuccessful\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/ContactInfo.test.tsx", "new_path": "src/__tests__/patients/ContactInfo.test.tsx", "diff": "-import { Column, Spinner } from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { screen, render } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Router } from 'react-router-dom'\nimport ContactInfo from '../../patients/ContactInfo'\n-import TextInputWithLabelFormGroup from '../../shared/components/input/TextInputWithLabelFormGroup'\nimport { ContactInfoPiece } from '../../shared/model/ContactInformation'\nimport * as uuid from '../../shared/util/uuid'\n@@ -20,8 +18,8 @@ describe('Contact Info in its Editable mode', () => {\n{ id: '456', value: ' ', type: undefined },\n]\nconst errors = ['this is an error', '']\n- const label = 'this is a label'\n- const name = 'this is a name'\n+ const label = 'Phone Number'\n+ const name = 'Number'\nlet onChange: jest.Mock\nconst setup = (_data?: ContactInfoPiece[], _errors?: string[]) => {\n@@ -29,7 +27,7 @@ describe('Contact Info in its Editable mode', () => {\nhistory.push('/patients/new')\nonChange = jest.fn()\n- const wrapper = mount(\n+ return render(\n<Router history={history}>\n<ContactInfo\ncomponent=\"TextInputWithLabelFormGroup\"\n@@ -42,16 +40,8 @@ describe('Contact Info in its Editable mode', () => {\n/>\n</Router>,\n)\n- return wrapper\n}\n- it('should show a spinner if no data is present', () => {\n- const wrapper = setup()\n- const spinnerWrapper = wrapper.find(Spinner)\n-\n- expect(spinnerWrapper).toHaveLength(1)\n- })\n-\nit('should call onChange if no data is provided', () => {\nconst newId = 'newId'\njest.spyOn(uuid, 'uuid').mockReturnValue(newId)\n@@ -63,66 +53,57 @@ describe('Contact Info in its Editable mode', () => {\n})\nit('should render the labels if data is provided', () => {\n- const wrapper = setup(data)\n- const headerWrapper = wrapper.find('.header')\n- const columnWrappers = headerWrapper.find(Column)\n- const expectedTypeLabel = 'patient.contactInfoType.label'\n+ setup(data)\n- expect(columnWrappers.at(0).text()).toEqual(`${expectedTypeLabel} & ${label}`)\n- expect(columnWrappers.at(1).text()).toEqual(label)\n+ expect(screen.getByText(/patient\\.contactinfotype\\.label/i)).toBeInTheDocument()\n+ expect(screen.getByText(label)).toBeInTheDocument()\n})\nit('should display the entries if data is provided', () => {\n- const wrapper = setup(data)\n- for (let i = 0; i < wrapper.length; i += 1) {\n- const inputWrapper = wrapper.findWhere((w: any) => w.prop('name') === `${name}${i}`)\n+ setup(data)\n- expect(inputWrapper.prop('value')).toEqual(data[i].value)\n- }\n+ expect(screen.getAllByRole('textbox')[1]).toHaveValue(`${data[0].value}`)\n+\n+ const selectInput = screen.getAllByPlaceholderText('-- Choose --')[0]\n+\n+ expect(selectInput).toHaveValue('patient.contactInfoType.options.home')\n})\nit('should display the error if error is provided', () => {\n- const wrapper = setup(data, errors)\n- const feedbackWrappers = wrapper.find('.invalid-feedback')\n-\n- expect(feedbackWrappers).toHaveLength(errors.length)\n+ setup(data, errors)\n- feedbackWrappers.forEach((_, i) => {\n- expect(feedbackWrappers.at(i).text()).toEqual(errors[i])\n- })\n+ expect(screen.getByText(/this is an error/i)).toBeInTheDocument()\n})\nit('should display the add button', () => {\n- const wrapper = setup(data)\n- const buttonWrapper = wrapper.find('button')\n-\n- expect(buttonWrapper.text().trim()).toEqual('actions.add')\n+ setup(data)\n+ expect(screen.getByRole('button', { name: /actions\\.add/i })).toBeInTheDocument()\n})\nit('should call the onChange callback if input is changed', () => {\n- const wrapper = setup(data)\n- const input = wrapper.findWhere((w: any) => w.prop('name') === `${name}0`).find('input')\n- input.getDOMNode<HTMLInputElement>().value = '777777'\n- input.simulate('change')\n+ setup(data)\nconst expectedNewData = [\n{ id: '123', value: '777777', type: 'home' },\n{ id: '456', value: '789012', type: undefined },\n]\n- expect(onChange).toHaveBeenCalledTimes(1)\n+\n+ const inputElement = screen.getAllByRole('textbox')[1]\n+ expect(inputElement).toHaveValue(`${data[0].value}`)\n+ userEvent.clear(inputElement)\n+ userEvent.type(inputElement, expectedNewData[0].value)\n+ expect(inputElement).toHaveValue(`${expectedNewData[0].value}`)\n+\nexpect(onChange).toHaveBeenCalledWith(expectedNewData)\n})\nit('should call the onChange callback if an add button is clicked with valid entries', () => {\n- const wrapper = setup(data)\n- const buttonWrapper = wrapper.find('button')\n- const onClick = buttonWrapper.prop('onClick') as any\n+ setup(data)\nconst newId = 'newId'\njest.spyOn(uuid, 'uuid').mockReturnValue(newId)\n- act(() => {\n- onClick()\n- })\n+ expect(screen.getByRole('button')).toBeInTheDocument()\n+ userEvent.click(screen.getByRole('button'))\nconst expectedNewData = [...data, { id: newId, value: '' }]\n@@ -131,15 +112,13 @@ describe('Contact Info in its Editable mode', () => {\n})\nit('should call the onChange callback if an add button is clicked with an empty entry', () => {\n- const wrapper = setup(dataForNoAdd)\n- const buttonWrapper = wrapper.find('button')\n- const onClick = buttonWrapper.prop('onClick') as any\n+ setup(dataForNoAdd)\n+\nconst newId = 'newId'\njest.spyOn(uuid, 'uuid').mockReturnValue(newId)\n- act(() => {\n- onClick()\n- })\n+ expect(screen.getByRole('button')).toBeInTheDocument()\n+ userEvent.click(screen.getByRole('button'))\nconst expectedNewData = [\n{ id: '123', value: '123456', type: 'home' },\n@@ -156,14 +135,14 @@ describe('Contact Info in its non-Editable mode', () => {\n{ id: '123', value: '123456', type: 'home' },\n{ id: '456', value: '789012', type: undefined },\n]\n- const label = 'this is a label'\n- const name = 'this is a name'\n+ const label = 'Phone Number'\n+ const name = 'Number'\nconst setup = (_data?: ContactInfoPiece[]) => {\nconst history = createMemoryHistory()\nhistory.push('/patients/new')\n- const wrapper = mount(\n+ return render(\n<Router history={history}>\n<ContactInfo\ncomponent=\"TextInputWithLabelFormGroup\"\n@@ -173,41 +152,36 @@ describe('Contact Info in its non-Editable mode', () => {\n/>\n</Router>,\n)\n- return wrapper\n}\nit('should render an empty element if no data is present', () => {\n- const wrapper = setup()\n- const contactInfoWrapper = wrapper.find(ContactInfo)\n+ const { container } = setup()\n+ screen.logTestingPlaygroundURL()\n- expect(contactInfoWrapper.find('div')).toHaveLength(1)\n- expect(contactInfoWrapper.containsMatchingElement(<div />)).toEqual(true)\n+ expect(container.querySelectorAll('div').length).toBe(1)\n})\nit('should render the labels if data is provided', () => {\n- const wrapper = setup(data)\n- const headerWrapper = wrapper.find('.header')\n- const columnWrappers = headerWrapper.find(Column)\n- const expectedTypeLabel = 'patient.contactInfoType.label'\n+ setup(data)\n- expect(columnWrappers.at(0).text()).toEqual(`${expectedTypeLabel} & ${label}`)\n- expect(columnWrappers.at(1).text()).toEqual(label)\n+ expect(screen.getByText(/patient\\.contactInfoType\\.label/i)).toBeInTheDocument()\n})\nit('should display the entries if data is provided', () => {\n- const wrapper = setup(data)\n- for (let i = 0; i < wrapper.length; i += 1) {\n- const inputWrapper = wrapper.findWhere((w: any) => w.prop('name') === `${name}${i}`)\n+ setup(data)\n- expect(inputWrapper.prop('value')).toEqual(data[i].value)\n- }\n+ const inputElement = screen.getAllByRole('textbox')[1]\n+ const selectInput = screen.getAllByPlaceholderText('-- Choose --')[0]\n+ expect(selectInput).toHaveDisplayValue('patient.contactInfoType.options.home')\n+ expect(inputElement).toHaveDisplayValue(`${data[0].value}`)\n})\nit('should show inputs that are not editable', () => {\n- const wrapper = setup(data)\n- const inputWrappers = wrapper.find(TextInputWithLabelFormGroup)\n- for (let i = 0; i < inputWrappers.length; i += 1) {\n- expect(inputWrappers.at(i).prop('isEditable')).toBeFalsy()\n- }\n+ setup(data)\n+ const selectInput = screen.getAllByPlaceholderText('-- Choose --')[0]\n+ const inputElement = screen.getAllByRole('textbox')[1]\n+\n+ expect(selectInput).not.toHaveFocus()\n+ expect(inputElement).not.toHaveFocus()\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/ContactInfo.tsx", "new_path": "src/patients/ContactInfo.tsx", "diff": "@@ -128,7 +128,16 @@ const ContactInfo = (props: Props): ReactElement => {\n)\nif (isEditable && data.length === 0) {\n- return <Spinner color=\"blue\" loading size={20} type=\"SyncLoader\" />\n+ return (\n+ <Spinner\n+ aria-hidden=\"false\"\n+ aria-label=\"Loading\"\n+ color=\"blue\"\n+ loading\n+ size={20}\n+ type=\"SyncLoader\"\n+ />\n+ )\n}\nreturn (\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -36,63 +36,43 @@ const patient = {\ncode: 'P00001',\n} as Patient\n-const setup = (patientArg: Patient, isEditable = true, router? = true, error?: {}) => {\n+const setup = (patientArg: Patient, isEditable = true, error?: Record<string, unknown>) => {\nDate.now = jest.fn().mockReturnValue(new Date().valueOf())\nreturn render(\n- router ? (\n<Router history={createMemoryHistory()}>\n<GeneralInformation patient={patientArg} isEditable={isEditable} error={error} />\n- </Router>\n- ) : (\n- <GeneralInformation patient={patientArg} isEditable={isEditable} error={error} />\n- ),\n+ </Router>,\n)\n}\n-describe('Error handling', () => {\nit('should display errors', () => {\nconst error = {\n- message: 'some message',\n- givenName: 'given name message',\n- dateOfBirth: 'date of birth message',\n- phoneNumbers: ['phone number message'],\n- emails: ['email message'],\n+ message: 'red alert Error Message',\n+ givenName: 'given name Error Message',\n+ dateOfBirth: 'date of birth Error Message',\n+ phoneNumbers: ['phone number Error Message'],\n+ emails: ['email Error Message'],\n}\n-\nsetup(\n{\nphoneNumbers: [{ value: 'not a phone number', id: '123' }],\nemails: [{ value: 'not an email', id: '456' }],\n} as Patient,\ntrue,\n- false,\nerror,\n)\n- // wrapper.update()\n-\n- // const errorMessage = wrapper.find(Alert)\n- // const givenNameInput = wrapper.findWhere((w: any) => w.prop('name') === 'givenName')\n- // const dateOfBirthInput = wrapper.findWhere((w: any) => w.prop('name') === 'dateOfBirth')\n- // const phoneNumberInput = wrapper.findWhere((w: any) => w.prop('name') === 'phoneNumber0')\n- // const emailInput = wrapper.findWhere((w: any) => w.prop('name') === 'email0')\n+ expect(screen.getByRole(/alert/i)).toHaveTextContent(error.message)\n+ expect(screen.getByPlaceholderText(/givenName/i)).toHaveClass('is-invalid')\n- // expect(errorMessage).toBeTruthy()\n- // expect(errorMessage.prop('message')).toMatch(error.message)\n+ expect(screen.getByText(/given name Error Message/i)).toHaveClass('invalid-feedback')\n+ expect(screen.getByText(/date of birth Error Message/i)).toHaveClass('text-danger')\n+ expect(screen.getByText(/phone number Error Message/i)).toHaveClass('invalid-feedback')\n+ expect(screen.getByText(/email Error Message/i)).toHaveClass('invalid-feedback')\n- // expect(givenNameInput.prop('isInvalid')).toBeTruthy()\n- // expect(givenNameInput.prop('feedback')).toEqual(error.givenName)\n-\n- // expect(dateOfBirthInput.prop('isInvalid')).toBeTruthy()\n- // expect(dateOfBirthInput.prop('feedback')).toEqual(error.dateOfBirth)\n-\n- // expect(phoneNumberInput.prop('isInvalid')).toBeTruthy()\n- // expect(phoneNumberInput.prop('feedback')).toEqual(error.phoneNumbers[0])\n-\n- // expect(emailInput.prop('isInvalid')).toBeTruthy()\n- // expect(emailInput.prop('feedback')).toEqual(error.emails[0])\n- })\n+ expect(screen.getByDisplayValue(/not an email/i)).toHaveClass('is-invalid')\n+ expect(screen.getByDisplayValue(/not a phone number/i)).toHaveClass('is-invalid')\n})\ndescribe('General Information, without isEditable', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "new_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "diff": "-import { render, screen } from '@testing-library/react'\n+import { act, render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\n@@ -8,27 +8,41 @@ import Patient from '../../../shared/model/Patient'\nimport { expectOneConsoleError } from '../../test-utils/console.utils'\ndescribe('Add Related Person Modal', () => {\n- const patient = {\n+ // const patient = {\n+ // id: '123',\n+ // fullName: 'fullName',\n+ // code: 'code1',\n+ // } as Patient\n+ // const patient2 = {\n+ // id: '456',\n+ // fullName: 'patient2',\n+ // code: 'code2',\n+ // } as Patient\n+\n+ const patients = [\n+ {\nid: '123',\nfullName: 'fullName',\ncode: 'code1',\n- } as Patient\n- const patient2 = {\n+ },\n+ {\nid: '456',\n- fullName: 'patient2',\n+ fullName: 'fullName2',\ncode: 'code2',\n- } as Patient\n+ },\n+ ] as Patient[]\nconst setup = () => {\njest.resetAllMocks()\n- // jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n- jest.spyOn(PatientRepository, 'search').mockResolvedValue([patient, patient2])\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patient)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(patients[0])\n+ jest.spyOn(PatientRepository, 'search').mockResolvedValue(patients)\n+ jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patients[1])\n+ jest.spyOn(PatientRepository, 'count').mockResolvedValue(2)\nreturn render(\n<AddRelatedPersonModal\nshow\n- patientId={patient.id}\n+ patientId={patients[0].id}\nonCloseButtonClick={jest.fn()}\ntoggle={jest.fn()}\n/>,\n@@ -92,21 +106,26 @@ describe('Add Related Person Modal', () => {\ndescribe('save', () => {\nit('should call the save function with the correct data', async () => {\nsetup()\n- userEvent.type(screen.getByPlaceholderText(/^patient.relatedPerson$/i), patient2.fullName)\n- userEvent.click(await screen.findByText(`${patient.fullName} (${patient.code})`))\n+ userEvent.type(\n+ screen.getByPlaceholderText(/^patient.relatedPerson$/i),\n+ patients[1].fullName as string,\n+ )\n+ userEvent.click(await screen.findByText(/fullName2/i))\nuserEvent.type(\nscreen.getByLabelText(/^patient.relatedPersons.relationshipType$/i),\n'relationship',\n)\n+ await act(async () => {\nuserEvent.click(screen.getByRole('button', { name: /patient.relatedPersons.add/i }))\n+ })\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\nexpect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\nexpect.objectContaining({\nrelatedPersons: [\nexpect.objectContaining({\n- patientId: '123',\n+ patientId: '456',\ntype: 'relationship',\n}),\n],\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "import { render, screen } from '@testing-library/react'\n-import startOfDay from 'date-fns/startOfDay'\n-import subYears from 'date-fns/subYears'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Router } from 'react-router-dom'\n@@ -9,15 +8,15 @@ import GeneralInformation from '../../patients/GeneralInformation'\nimport Patient from '../../shared/model/Patient'\nconst patient = {\n- id: '123',\n- prefix: 'prefix',\n+ id: '1234321',\n+ prefix: 'MockPrefix',\ngivenName: 'givenName',\nfamilyName: 'familyName',\n- suffix: 'suffix',\n+ suffix: 'MockSuffix',\nsex: 'male',\ntype: 'charity',\nbloodType: 'A-',\n- dateOfBirth: startOfDay(subYears(new Date(), 30)).toISOString(),\n+ dateOfBirth: '12/31/1990',\nisApproximateDateOfBirth: false,\noccupation: 'occupation',\npreferredLanguage: 'preferredLanguage',\n@@ -78,111 +77,53 @@ it('should display errors', () => {\ndescribe('General Information, without isEditable', () => {\nit('should render the prefix', () => {\nsetup(patient, false)\n- // const prefixInput = wrapper.findWhere((w: any) => w.prop('name') === 'prefix')\n- // expect(prefixInput.prop('value')).toEqual(patient.prefix)\n- // expect(prefixInput.prop('label')).toEqual('patient.prefix')\n- // expect(prefixInput.prop('isEditable')).toBeFalsy()\n+ const prefixInput = screen.getByRole('textbox', {\n+ name: /patient\\.prefix/i,\n+ })\n+ expect(prefixInput).toHaveDisplayValue(patient.prefix as string)\n+ userEvent.type(prefixInput, 'wontexist')\n+ expect(prefixInput).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the given name', () => {\nsetup(patient, false)\n- // const givenNameInput = wrapper.findWhere((w: any) => w.prop('name') === 'givenName')\n- // expect(givenNameInput.prop('value')).toEqual(patient.givenName)\n- // expect(givenNameInput.prop('label')).toEqual('patient.givenName')\n- // expect(givenNameInput.prop('isEditable')).toBeFalsy()\n+ const givenNameInput = screen.getByPlaceholderText(/patient\\.givenName/i)\n+ expect(givenNameInput).toHaveDisplayValue(patient.givenName as string)\n+ userEvent.type(givenNameInput, 'wontexist')\n+ expect(givenNameInput).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the family name', () => {\nsetup(patient, false)\n- // const familyNameInput = wrapper.findWhere((w: any) => w.prop('name') === 'familyName')\n- // expect(familyNameInput.prop('value')).toEqual(patient.familyName)\n- // expect(familyNameInput.prop('label')).toEqual('patient.familyName')\n- // expect(familyNameInput.prop('isEditable')).toBeFalsy()\n+ const familyNameInput = screen.getByPlaceholderText(/patient\\.familyName/i)\n+ expect(familyNameInput).toHaveDisplayValue(patient.familyName as string)\n+ userEvent.type(familyNameInput, 'wontexist')\n+ expect(familyNameInput).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the suffix', () => {\nsetup(patient, false)\n- // const suffixInput = wrapper.findWhere((w: any) => w.prop('name') === 'suffix')\n- // expect(suffixInput.prop('value')).toEqual(patient.suffix)\n- // expect(suffixInput.prop('label')).toEqual('patient.suffix')\n- // expect(suffixInput.prop('isEditable')).toBeFalsy()\n- })\n-\n- it('should render the sex select', () => {\n- setup(patient, false)\n- // const sexSelect = wrapper.findWhere((w: any) => w.prop('name') === 'sex')\n- // expect(sexSelect.prop('defaultSelected')[0].value).toEqual(patient.sex)\n- // expect(sexSelect.prop('label')).toEqual('patient.sex')\n- // expect(sexSelect.prop('isEditable')).toBeFalsy()\n- // expect(sexSelect.prop('options')).toHaveLength(4)\n- // expect(sexSelect.prop('options')[0].label).toEqual('sex.male')\n- // expect(sexSelect.prop('options')[0].value).toEqual('male')\n- // expect(sexSelect.prop('options')[1].label).toEqual('sex.female')\n- // expect(sexSelect.prop('options')[1].value).toEqual('female')\n- // expect(sexSelect.prop('options')[2].label).toEqual('sex.other')\n- // expect(sexSelect.prop('options')[2].value).toEqual('other')\n- // expect(sexSelect.prop('options')[3].label).toEqual('sex.unknown')\n- // expect(sexSelect.prop('options')[3].value).toEqual('unknown')\n- })\n-\n- it('should render the blood type', () => {\n- setup(patient, false)\n- // const bloodTypeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'bloodType')\n- // expect(bloodTypeSelect.prop('defaultSelected')[0].value).toEqual(patient.bloodType)\n- // expect(bloodTypeSelect.prop('label')).toEqual('patient.bloodType')\n- // expect(bloodTypeSelect.prop('isEditable')).toBeFalsy()\n- // expect(bloodTypeSelect.prop('options')).toHaveLength(9)\n- // expect(bloodTypeSelect.prop('options')[0].label).toEqual('bloodType.apositive')\n- // expect(bloodTypeSelect.prop('options')[0].value).toEqual('A+')\n- // expect(bloodTypeSelect.prop('options')[1].label).toEqual('bloodType.anegative')\n- // expect(bloodTypeSelect.prop('options')[1].value).toEqual('A-')\n- // expect(bloodTypeSelect.prop('options')[2].label).toEqual('bloodType.abpositive')\n- // expect(bloodTypeSelect.prop('options')[2].value).toEqual('AB+')\n- // expect(bloodTypeSelect.prop('options')[3].label).toEqual('bloodType.abnegative')\n- // expect(bloodTypeSelect.prop('options')[3].value).toEqual('AB-')\n- // expect(bloodTypeSelect.prop('options')[4].label).toEqual('bloodType.bpositive')\n- // expect(bloodTypeSelect.prop('options')[4].value).toEqual('B+')\n- // expect(bloodTypeSelect.prop('options')[5].label).toEqual('bloodType.bnegative')\n- // expect(bloodTypeSelect.prop('options')[5].value).toEqual('B-')\n- // expect(bloodTypeSelect.prop('options')[6].label).toEqual('bloodType.opositive')\n- // expect(bloodTypeSelect.prop('options')[6].value).toEqual('O+')\n- // expect(bloodTypeSelect.prop('options')[7].label).toEqual('bloodType.onegative')\n- // expect(bloodTypeSelect.prop('options')[7].value).toEqual('O-')\n- // expect(bloodTypeSelect.prop('options')[8].label).toEqual('bloodType.unknown')\n- // expect(bloodTypeSelect.prop('options')[8].value).toEqual('unknown')\n- })\n-\n- it('should render the patient type select', () => {\n- setup(patient, false)\n- // const typeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'type')\n- // expect(typeSelect.prop('defaultSelected')[0].value).toEqual(patient.type)\n- // expect(typeSelect.prop('label')).toEqual('patient.type')\n- // expect(typeSelect.prop('isEditable')).toBeFalsy()\n- // expect(typeSelect.prop('options')).toHaveLength(2)\n- // expect(typeSelect.prop('options')[0].label).toEqual('patient.types.charity')\n- // expect(typeSelect.prop('options')[0].value).toEqual('charity')\n- // expect(typeSelect.prop('options')[1].label).toEqual('patient.types.private')\n- // expect(typeSelect.prop('options')[1].value).toEqual('private')\n+ const suffixInput = screen.getByPlaceholderText(/patient\\.suffix/i)\n+ expect(suffixInput).toHaveDisplayValue(patient.suffix as string)\n+ userEvent.type(suffixInput, 'wontexist')\n+ expect(suffixInput).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the date of the birth of the patient', () => {\nsetup(patient, false)\n- // const dateOfBirthInput = wrapper.findWhere((w: any) => w.prop('name') === 'dateOfBirth')\n- // expect(dateOfBirthInput.prop('value')).toEqual(new Date(patient.dateOfBirth))\n- // expect(dateOfBirthInput.prop('label')).toEqual('patient.dateOfBirth')\n- // expect(dateOfBirthInput.prop('maxDate')).toEqual(new Date(Date.now()))\n- // expect(dateOfBirthInput.prop('isEditable')).toBeFalsy()\n+ const dateOfBirthInput = screen.getByDisplayValue('12/31/1990')\n+ expect(dateOfBirthInput).toHaveDisplayValue(patient.dateOfBirth as string)\n+ userEvent.type(dateOfBirthInput, 'wontexist')\n+ expect(dateOfBirthInput).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the approximate age if patient.isApproximateDateOfBirth is true', async () => {\npatient.isApproximateDateOfBirth = true\nsetup(patient, false)\n-\n- // const approximateAgeInput = wrapper.findWhere((w: any) => w.prop('name') === 'approximateAge')\n-\n- // expect(approximateAgeInput.prop('value')).toEqual('30')\n- // expect(approximateAgeInput.prop('label')).toEqual('patient.approximateAge')\n- // expect(approximateAgeInput.prop('isEditable')).toBeFalsy()\n+ const approximateAgeField = screen.getByPlaceholderText(/patient.approximateAge/i)\n+ expect(approximateAgeField).toHaveDisplayValue('30')\n+ userEvent.type(approximateAgeField, 'wontexist')\n+ expect(approximateAgeField).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the occupation of the patient', () => {\n@@ -230,6 +171,62 @@ describe('General Information, without isEditable', () => {\n// })\n// })\n})\n+ it('should render the sex select options', () => {\n+ setup(patient, false)\n+ // const sexSelect = wrapper.findWhere((w: any) => w.prop('name') === 'sex')\n+ // expect(sexSelect.prop('defaultSelected')[0].value).toEqual(patient.sex)\n+ // expect(sexSelect.prop('label')).toEqual('patient.sex')\n+ // expect(sexSelect.prop('isEditable')).toBeFalsy()\n+ // expect(sexSelect.prop('options')).toHaveLength(4)\n+ // expect(sexSelect.prop('options')[0].label).toEqual('sex.male')\n+ // expect(sexSelect.prop('options')[0].value).toEqual('male')\n+ // expect(sexSelect.prop('options')[1].label).toEqual('sex.female')\n+ // expect(sexSelect.prop('options')[1].value).toEqual('female')\n+ // expect(sexSelect.prop('options')[2].label).toEqual('sex.other')\n+ // expect(sexSelect.prop('options')[2].value).toEqual('other')\n+ // expect(sexSelect.prop('options')[3].label).toEqual('sex.unknown')\n+ // expect(sexSelect.prop('options')[3].value).toEqual('unknown')\n+ })\n+\n+ it('should render the blood type select options', () => {\n+ setup(patient, false)\n+ // const bloodTypeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'bloodType')\n+ // expect(bloodTypeSelect.prop('defaultSelected')[0].value).toEqual(patient.bloodType)\n+ // expect(bloodTypeSelect.prop('label')).toEqual('patient.bloodType')\n+ // expect(bloodTypeSelect.prop('isEditable')).toBeFalsy()\n+ // expect(bloodTypeSelect.prop('options')).toHaveLength(9)\n+ // expect(bloodTypeSelect.prop('options')[0].label).toEqual('bloodType.apositive')\n+ // expect(bloodTypeSelect.prop('options')[0].value).toEqual('A+')\n+ // expect(bloodTypeSelect.prop('options')[1].label).toEqual('bloodType.anegative')\n+ // expect(bloodTypeSelect.prop('options')[1].value).toEqual('A-')\n+ // expect(bloodTypeSelect.prop('options')[2].label).toEqual('bloodType.abpositive')\n+ // expect(bloodTypeSelect.prop('options')[2].value).toEqual('AB+')\n+ // expect(bloodTypeSelect.prop('options')[3].label).toEqual('bloodType.abnegative')\n+ // expect(bloodTypeSelect.prop('options')[3].value).toEqual('AB-')\n+ // expect(bloodTypeSelect.prop('options')[4].label).toEqual('bloodType.bpositive')\n+ // expect(bloodTypeSelect.prop('options')[4].value).toEqual('B+')\n+ // expect(bloodTypeSelect.prop('options')[5].label).toEqual('bloodType.bnegative')\n+ // expect(bloodTypeSelect.prop('options')[5].value).toEqual('B-')\n+ // expect(bloodTypeSelect.prop('options')[6].label).toEqual('bloodType.opositive')\n+ // expect(bloodTypeSelect.prop('options')[6].value).toEqual('O+')\n+ // expect(bloodTypeSelect.prop('options')[7].label).toEqual('bloodType.onegative')\n+ // expect(bloodTypeSelect.prop('options')[7].value).toEqual('O-')\n+ // expect(bloodTypeSelect.prop('options')[8].label).toEqual('bloodType.unknown')\n+ // expect(bloodTypeSelect.prop('options')[8].value).toEqual('unknown')\n+ })\n+\n+ it('should render the patient type select options', () => {\n+ setup(patient, false)\n+ // const typeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'type')\n+ // expect(typeSelect.prop('defaultSelected')[0].value).toEqual(patient.type)\n+ // expect(typeSelect.prop('label')).toEqual('patient.type')\n+ // expect(typeSelect.prop('isEditable')).toBeFalsy()\n+ // expect(typeSelect.prop('options')).toHaveLength(2)\n+ // expect(typeSelect.prop('options')[0].label).toEqual('patient.types.charity')\n+ // expect(typeSelect.prop('options')[0].value).toEqual('charity')\n+ // expect(typeSelect.prop('options')[1].label).toEqual('patient.types.private')\n+ // expect(typeSelect.prop('options')[1].value).toEqual('private')\n+ })\ndescribe('General Information, isEditable', () => {\n//! isEditable SETUP\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/App.test.tsx", "new_path": "src/__tests__/App.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport createMockStore from 'redux-mock-store'\n@@ -26,20 +26,15 @@ it('renders without crashing', async () => {\n},\n} as any)\n- const AppWithStore = () => (\n+ render(\n<Provider store={store}>\n<App />\n- </Provider>\n+ </Provider>,\n)\n- render(<AppWithStore />)\n-\n- await waitFor(\n- () => {\n- expect(screen.getByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n- },\n- { timeout: 5000 },\n- )\n+ expect(\n+ await screen.findByRole('heading', { name: /dashboard\\.label/i }, { timeout: 8000 }),\n+ ).toBeInTheDocument()\n// eslint-disable-next-line no-console\n;(console.log as jest.Mock).mockRestore()\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/new/NewAppointment.test.tsx", "diff": "@@ -23,7 +23,7 @@ const { TitleProvider } = titleUtil\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('New Appointment', () => {\n- const testPatient: Patient = {\n+ const expectedPatient: Patient = {\naddresses: [],\nbloodType: 'o',\ncareGoals: [],\n@@ -56,7 +56,7 @@ describe('New Appointment', () => {\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\njest.spyOn(AppointmentRepository, 'save').mockResolvedValue(expectedAppointment)\n- jest.spyOn(PatientRepository, 'search').mockResolvedValue([testPatient])\n+ jest.spyOn(PatientRepository, 'search').mockResolvedValue([expectedPatient])\nconst history = createMemoryHistory({ initialEntries: ['/appointments/new'] })\n@@ -142,7 +142,7 @@ describe('New Appointment', () => {\n}\nconst expectedAppointment = {\n- patient: testPatient.fullName,\n+ patient: expectedPatient.fullName,\nstartDateTime: new Date(2020, 10, 10, 0, 0, 0, 0).toISOString(),\nendDateTime: new Date(1957, 10, 10, 0, 0, 0, 0).toISOString(),\nlocation: 'location',\n@@ -177,7 +177,7 @@ describe('New Appointment', () => {\nconst { container } = setup()\nconst expectedAppointment = {\n- patient: testPatient.fullName,\n+ patient: expectedPatient.fullName,\nstartDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\nendDateTime: addMinutes(\nroundToNearestMinutes(new Date(), { nearestTo: 15 }),\n@@ -192,7 +192,9 @@ describe('New Appointment', () => {\nscreen.getByPlaceholderText(/scheduling\\.appointment\\.patient/i),\nexpectedAppointment.patient,\n)\n- userEvent.click(await screen.findByText(`${testPatient.fullName} (${testPatient.code})`))\n+ userEvent.click(\n+ await screen.findByText(`${expectedPatient.fullName} (${expectedPatient.code})`),\n+ )\nfireEvent.change(container.querySelectorAll('.react-datepicker__input-container input')[0], {\ntarget: { value: expectedAppointment.startDateTime },\n@@ -224,7 +226,7 @@ describe('New Appointment', () => {\nawait waitFor(() => {\nexpect(AppointmentRepository.save).toHaveBeenCalledWith({\n...expectedAppointment,\n- patient: testPatient.id,\n+ patient: expectedPatient.id,\n})\n})\n}, 30000)\n@@ -234,9 +236,11 @@ describe('New Appointment', () => {\nuserEvent.type(\nscreen.getByPlaceholderText(/scheduling\\.appointment\\.patient/i),\n- `${testPatient.fullName}`,\n+ `${expectedPatient.fullName}`,\n+ )\n+ userEvent.click(\n+ await screen.findByText(`${expectedPatient.fullName} (${expectedPatient.code})`),\n)\n- userEvent.click(await screen.findByText(`${testPatient.fullName} (${testPatient.code})`))\nuserEvent.click(screen.getByText(/scheduling.appointments.createAppointment/i))\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -18,8 +18,8 @@ const patient = {\nbloodType: 'A-',\ndateOfBirth: '12/31/1990',\nisApproximateDateOfBirth: false,\n- occupation: 'occupation',\n- preferredLanguage: 'preferredLanguage',\n+ occupation: 'MockOccupationValue',\n+ preferredLanguage: 'MockPreferredLanguage',\nphoneNumbers: [\n{ value: '123456', type: undefined, id: '123' },\n{ value: '789012', type: undefined, id: '456' },\n@@ -128,20 +128,18 @@ describe('General Information, without isEditable', () => {\nit('should render the occupation of the patient', () => {\nsetup(patient, false)\n- // const occupationInput = wrapper.findWhere((w: any) => w.prop('name') === 'occupation')\n- // expect(occupationInput.prop('value')).toEqual(patient.occupation)\n- // expect(occupationInput.prop('label')).toEqual('patient.occupation')\n- // expect(occupationInput.prop('isEditable')).toBeFalsy()\n+ const occupationAgeField = screen.getByPlaceholderText(/patient.occupation/i)\n+ expect(occupationAgeField).toHaveDisplayValue(patient.occupation as string)\n+ userEvent.type(occupationAgeField, 'wontexist')\n+ expect(occupationAgeField).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the preferred language of the patient', () => {\nsetup(patient, false)\n- // const preferredLanguageInput = wrapper.findWhere(\n- // (w: any) => w.prop('name') === 'preferredLanguage',\n- // )\n- // expect(preferredLanguageInput.prop('value')).toEqual(patient.preferredLanguage)\n- // expect(preferredLanguageInput.prop('label')).toEqual('patient.preferredLanguage')\n- // expect(preferredLanguageInput.prop('isEditable')).toBeFalsy()\n+ const preferredLanguageAgeField = screen.getByPlaceholderText(/patient.preferredLanguage/i)\n+ expect(preferredLanguageAgeField).toHaveDisplayValue(patient.preferredLanguage as string)\n+ userEvent.type(preferredLanguageAgeField, 'wontexist')\n+ expect(preferredLanguageAgeField).not.toHaveDisplayValue(/wontexist/i)\n})\nit('should render the phone numbers of the patient', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/CareGoalForm.test.tsx", "new_path": "src/__tests__/patients/care-goals/CareGoalForm.test.tsx", "diff": "@@ -154,7 +154,7 @@ describe('Care Goal Form', () => {\nexpect(screen.getByText(/patient.careGoal.startDate/i)).toBeInTheDocument()\nconst startDatePicker = screen.getAllByRole('textbox')[4]\nexpect(startDatePicker).toBeInTheDocument()\n- expect(startDatePicker).toHaveValue(format(startDate, 'MM/d/y'))\n+ expect(startDatePicker).toHaveValue(format(startDate, 'MM/dd/y'))\n})\nit('should call onChange handler when start date change', () => {\n@@ -172,7 +172,7 @@ describe('Care Goal Form', () => {\nexpect(screen.getByText(/patient.careGoal.dueDate/i)).toBeInTheDocument()\nconst dueDatePicker = screen.getAllByRole('textbox')[5]\nexpect(dueDatePicker).toBeInTheDocument()\n- expect(dueDatePicker).toHaveValue(format(dueDate, 'MM/d/y'))\n+ expect(dueDatePicker).toHaveValue(format(dueDate, 'MM/dd/y'))\n})\nit('should call onChange handler when due date changes', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "new_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "diff": "import { act, render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\n+import { ReactQueryConfigProvider } from 'react-query'\nimport AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport { expectOneConsoleError } from '../../test-utils/console.utils'\n+const noRetryConfig = {\n+ queries: {\n+ retry: false,\n+ },\n+}\n+\ndescribe('Add Related Person Modal', () => {\nconst patients = [\n{\n@@ -22,19 +29,20 @@ describe('Add Related Person Modal', () => {\n] as Patient[]\nconst setup = () => {\n- jest.resetAllMocks()\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patients[0])\njest.spyOn(PatientRepository, 'search').mockResolvedValue(patients)\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(patients[1])\njest.spyOn(PatientRepository, 'count').mockResolvedValue(2)\nreturn render(\n+ <ReactQueryConfigProvider config={noRetryConfig}>\n<AddRelatedPersonModal\nshow\npatientId={patients[0].id}\nonCloseButtonClick={jest.fn()}\ntoggle={jest.fn()}\n- />,\n+ />\n+ </ReactQueryConfigProvider>,\n)\n}\n@@ -102,11 +110,12 @@ describe('Add Related Person Modal', () => {\nit('should call the save function with the correct data', async () => {\nsetup()\n- userEvent.type(\n+ await userEvent.type(\nscreen.getByPlaceholderText(/^patient.relatedPerson$/i),\npatients[1].fullName as string,\n+ { delay: 50 },\n)\n- userEvent.click(await screen.findByText(/fullName2/i))\n+ userEvent.click(await screen.findByText(/^fullname2/i))\nuserEvent.type(\nscreen.getByLabelText(/^patient.relatedPersons.relationshipType$/i),\n@@ -127,6 +136,6 @@ describe('Add Related Person Modal', () => {\n],\n}),\n)\n- }, 20000)\n+ }, 40000)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "@@ -18,6 +18,7 @@ configure({ defaultHidden: true })\njest.setTimeout(10000)\nafterEach(() => {\n+ jest.resetAllMocks()\njest.restoreAllMocks()\nqueryCache.clear()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -21,8 +21,8 @@ const patient = {\noccupation: 'MockOccupationValue',\npreferredLanguage: 'MockPreferredLanguage',\nphoneNumbers: [\n- { value: '123456', type: undefined, id: '123' },\n- { value: '789012', type: undefined, id: '456' },\n+ { value: '123456789', type: undefined, id: '123' },\n+ { value: '789012999', type: undefined, id: '456' },\n],\nemails: [\n{ value: '[email protected]', type: undefined, id: '789' },\n@@ -75,99 +75,76 @@ it('should display errors', () => {\n})\ndescribe('General Information, without isEditable', () => {\n+ function typeReadonlyAssertion(inputElement: HTMLElement, mockValue: any) {\n+ expect(inputElement).toHaveDisplayValue(mockValue)\n+ userEvent.type(inputElement, 'wontexist')\n+ expect(inputElement).not.toHaveDisplayValue(/wontexist/i)\n+ }\n+\nit('should render the prefix', () => {\nsetup(patient, false)\n- const prefixInput = screen.getByRole('textbox', {\n- name: /patient\\.prefix/i,\n- })\n- expect(prefixInput).toHaveDisplayValue(patient.prefix as string)\n- userEvent.type(prefixInput, 'wontexist')\n- expect(prefixInput).not.toHaveDisplayValue(/wontexist/i)\n+\n+ typeReadonlyAssertion(screen.getByRole('textbox', { name: /patient\\.prefix/i }), patient.prefix)\n})\nit('should render the given name', () => {\nsetup(patient, false)\n- const givenNameInput = screen.getByPlaceholderText(/patient\\.givenName/i)\n- expect(givenNameInput).toHaveDisplayValue(patient.givenName as string)\n- userEvent.type(givenNameInput, 'wontexist')\n- expect(givenNameInput).not.toHaveDisplayValue(/wontexist/i)\n+ typeReadonlyAssertion(screen.getByPlaceholderText(/patient\\.givenName/i), patient.givenName)\n})\nit('should render the family name', () => {\nsetup(patient, false)\n- const familyNameInput = screen.getByPlaceholderText(/patient\\.familyName/i)\n- expect(familyNameInput).toHaveDisplayValue(patient.familyName as string)\n- userEvent.type(familyNameInput, 'wontexist')\n- expect(familyNameInput).not.toHaveDisplayValue(/wontexist/i)\n+ typeReadonlyAssertion(screen.getByPlaceholderText(/patient\\.familyName/i), patient.familyName)\n})\nit('should render the suffix', () => {\nsetup(patient, false)\n- const suffixInput = screen.getByPlaceholderText(/patient\\.suffix/i)\n- expect(suffixInput).toHaveDisplayValue(patient.suffix as string)\n- userEvent.type(suffixInput, 'wontexist')\n- expect(suffixInput).not.toHaveDisplayValue(/wontexist/i)\n+ typeReadonlyAssertion(screen.getByPlaceholderText(/patient\\.suffix/i), patient.suffix)\n})\nit('should render the date of the birth of the patient', () => {\nsetup(patient, false)\n- const dateOfBirthInput = screen.getByDisplayValue('12/31/1990')\n- expect(dateOfBirthInput).toHaveDisplayValue(patient.dateOfBirth as string)\n- userEvent.type(dateOfBirthInput, 'wontexist')\n- expect(dateOfBirthInput).not.toHaveDisplayValue(/wontexist/i)\n+ typeReadonlyAssertion(screen.getByDisplayValue('12/31/1990'), patient.dateOfBirth)\n})\nit('should render the approximate age if patient.isApproximateDateOfBirth is true', async () => {\npatient.isApproximateDateOfBirth = true\nsetup(patient, false)\n- const approximateAgeField = screen.getByPlaceholderText(/patient.approximateAge/i)\n- expect(approximateAgeField).toHaveDisplayValue('30')\n- userEvent.type(approximateAgeField, 'wontexist')\n- expect(approximateAgeField).not.toHaveDisplayValue(/wontexist/i)\n+ typeReadonlyAssertion(screen.getByPlaceholderText(/patient.approximateAge/i), '30')\n})\nit('should render the occupation of the patient', () => {\nsetup(patient, false)\n- const occupationAgeField = screen.getByPlaceholderText(/patient.occupation/i)\n- expect(occupationAgeField).toHaveDisplayValue(patient.occupation as string)\n- userEvent.type(occupationAgeField, 'wontexist')\n- expect(occupationAgeField).not.toHaveDisplayValue(/wontexist/i)\n+ typeReadonlyAssertion(screen.getByPlaceholderText(/patient.occupation/i), patient.occupation)\n})\nit('should render the preferred language of the patient', () => {\nsetup(patient, false)\n- const preferredLanguageAgeField = screen.getByPlaceholderText(/patient.preferredLanguage/i)\n- expect(preferredLanguageAgeField).toHaveDisplayValue(patient.preferredLanguage as string)\n- userEvent.type(preferredLanguageAgeField, 'wontexist')\n- expect(preferredLanguageAgeField).not.toHaveDisplayValue(/wontexist/i)\n+ typeReadonlyAssertion(\n+ screen.getByPlaceholderText(/patient.preferredLanguage/i),\n+ patient.preferredLanguage,\n+ )\n})\nit('should render the phone numbers of the patient', () => {\nsetup(patient, false)\n- // patient.phoneNumbers.forEach((phoneNumber, i) => {\n- // const phoneNumberInput = wrapper.findWhere((w: any) => w.prop('name') === `phoneNumber${i}`)\n- // expect(phoneNumberInput.prop('value')).toEqual(phoneNumber.value)\n- // expect(phoneNumberInput.prop('isEditable')).toBeFalsy()\n- // })\n+ const phoneNumberField = screen.getByDisplayValue(/123456789/i)\n+ expect(phoneNumberField).toHaveProperty('id', 'phoneNumber0TextInput')\n+ typeReadonlyAssertion(phoneNumberField, patient.phoneNumbers[0].value)\n})\nit('should render the emails of the patient', () => {\nsetup(patient, false)\n- // patient.emails.forEach((email, i) => {\n- // const emailInput = wrapper.findWhere((w: any) => w.prop('name') === `email${i}`)\n- // expect(emailInput.prop('value')).toEqual(email.value)\n- // expect(emailInput.prop('isEditable')).toBeFalsy()\n- // })\n+ const emailsField = screen.getByDisplayValue(/[email protected]/i)\n+ expect(emailsField).toHaveProperty('id', 'email0TextInput')\n+ typeReadonlyAssertion(emailsField, patient.emails[0].value)\n})\nit('should render the addresses of the patient', () => {\nsetup(patient, false)\n- // patient.addresses.forEach((address, i) => {\n- // const addressInput = wrapper.findWhere((w: any) => w.prop('name') === `address${i}`)\n- // expect(addressInput.prop('value')).toEqual(address.value)\n- // expect(addressInput.prop('isEditable')).toBeFalsy()\n- // })\n- // })\n+ const phoneNumberField = screen.getByDisplayValue(/address A/i)\n+ expect(phoneNumberField).toHaveProperty('id', 'address0TextField')\n+ typeReadonlyAssertion(phoneNumberField, patient.addresses[0])\n})\nit('should render the sex select options', () => {\nsetup(patient, false)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "new_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "diff": "import { act, render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\n-import { ReactQueryConfigProvider } from 'react-query'\nimport AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport { expectOneConsoleError } from '../../test-utils/console.utils'\n-const noRetryConfig = {\n- queries: {\n- retry: false,\n- },\n-}\n-\ndescribe('Add Related Person Modal', () => {\nconst patients = [\n{\n@@ -35,14 +28,12 @@ describe('Add Related Person Modal', () => {\njest.spyOn(PatientRepository, 'count').mockResolvedValue(2)\nreturn render(\n- <ReactQueryConfigProvider config={noRetryConfig}>\n<AddRelatedPersonModal\nshow\npatientId={patients[0].id}\nonCloseButtonClick={jest.fn()}\ntoggle={jest.fn()}\n- />\n- </ReactQueryConfigProvider>,\n+ />,\n)\n}\n@@ -136,6 +127,6 @@ describe('Add Related Person Modal', () => {\n],\n}),\n)\n- }, 40000)\n+ }, 60000)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "@@ -18,7 +18,6 @@ configure({ defaultHidden: true })\njest.setTimeout(10000)\nafterEach(() => {\n- jest.resetAllMocks()\njest.restoreAllMocks()\nqueryCache.clear()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx", "new_path": "src/__tests__/scheduling/appointments/AppointmentDetailForm.test.tsx", "diff": "-import { Typeahead, Alert } from '@hospitalrun/components'\n-import { act } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport addMinutes from 'date-fns/addMinutes'\nimport roundToNearestMinutes from 'date-fns/roundToNearestMinutes'\n-import { mount, ReactWrapper } from 'enzyme'\nimport React from 'react'\nimport AppointmentDetailForm from '../../../scheduling/appointments/AppointmentDetailForm'\n-import PatientRepository from '../../../shared/db/PatientRepository'\nimport Appointment from '../../../shared/model/Appointment'\nimport Patient from '../../../shared/model/Patient'\n-describe('AppointmentDetailForm', () => {\n- describe('Error handling', () => {\n- it('should display errors', () => {\n- const error = {\n- message: 'some message',\n- patient: 'patient message',\n- startDateTime: 'start date time message',\n- }\n-\n- const wrapper = mount(\n- <AppointmentDetailForm\n- appointment={{} as Appointment}\n- patient={{} as Patient}\n- isEditable\n- error={error}\n- />,\n- )\n- wrapper.update()\n-\n- const errorMessage = wrapper.find(Alert)\n- const patientTypeahead = wrapper.find(Typeahead)\n- const startDateInput = wrapper.findWhere((w: any) => w.prop('name') === 'startDate')\n- expect(errorMessage).toBeTruthy()\n- expect(errorMessage.prop('message')).toMatch(error.message)\n- expect(patientTypeahead.prop('isInvalid')).toBeTruthy()\n- expect(patientTypeahead.prop('feedback')).toEqual(error.patient)\n- expect(startDateInput.prop('isInvalid')).toBeTruthy()\n- expect(startDateInput.prop('feedback')).toEqual(error.startDateTime)\n- })\n+const setup = (appointment: Appointment, patient?: Patient, error = {}) => ({\n+ ...render(\n+ <AppointmentDetailForm appointment={appointment} patient={patient} isEditable error={error} />,\n+ ),\n})\n- describe('layout - editable', () => {\n- let wrapper: ReactWrapper\n+describe('AppointmentDetailForm', () => {\n+ it('should render a type select box', () => {\nconst expectedAppointment = {\nstartDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\nendDateTime: addMinutes(\n@@ -54,75 +27,21 @@ describe('AppointmentDetailForm', () => {\ntype: 'emergency',\n} as Appointment\n- beforeEach(() => {\n- wrapper = mount(\n- <AppointmentDetailForm appointment={expectedAppointment} onFieldChange={jest.fn()} />,\n- )\n- })\n-\n- it('should render a typeahead for patients', () => {\n- const patientTypeahead = wrapper.find(Typeahead)\n+ setup(expectedAppointment)\n- expect(patientTypeahead).toHaveLength(1)\n- expect(patientTypeahead.prop('placeholder')).toEqual('scheduling.appointment.patient')\n- expect(patientTypeahead.prop('value')).toEqual(expectedAppointment.patient)\n- })\n+ const types = ['checkup', 'emergency', 'followUp', 'routine', 'walkIn']\n- it('should render as start date date time picker', () => {\n- const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDate')\n+ userEvent.click(screen.getByPlaceholderText('-- Choose --'))\n- expect(startDateTimePicker).toHaveLength(1)\n- expect(startDateTimePicker.prop('label')).toEqual('scheduling.appointment.startDate')\n- expect(startDateTimePicker.prop('value')).toEqual(\n- roundToNearestMinutes(new Date(), { nearestTo: 15 }),\n- )\n+ types.forEach((type) => {\n+ const typeOption = screen.getByRole('option', {\n+ name: `scheduling.appointment.types.${type}`,\n})\n-\n- it('should render an end date time picker', () => {\n- const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDate')\n-\n- expect(endDateTimePicker).toHaveLength(1)\n- expect(endDateTimePicker.prop('label')).toEqual('scheduling.appointment.endDate')\n- expect(endDateTimePicker.prop('value')).toEqual(\n- addMinutes(roundToNearestMinutes(new Date(), { nearestTo: 15 }), 60),\n- )\n- })\n-\n- it('should render a location text input box', () => {\n- const locationTextInputBox = wrapper.findWhere((w) => w.prop('name') === 'location')\n-\n- expect(locationTextInputBox).toHaveLength(1)\n- expect(locationTextInputBox.prop('label')).toEqual('scheduling.appointment.location')\n- expect(locationTextInputBox.prop('value')).toEqual(expectedAppointment.location)\n- })\n-\n- it('should render a type select box', () => {\n- const typeSelect = wrapper.findWhere((w) => w.prop('name') === 'type')\n-\n- expect(typeSelect).toHaveLength(1)\n- expect(typeSelect.prop('label')).toEqual('scheduling.appointment.type')\n- expect(typeSelect.prop('options')[0].label).toEqual('scheduling.appointment.types.checkup')\n- expect(typeSelect.prop('options')[0].value).toEqual('checkup')\n- expect(typeSelect.prop('options')[1].label).toEqual('scheduling.appointment.types.emergency')\n- expect(typeSelect.prop('options')[1].value).toEqual('emergency')\n- expect(typeSelect.prop('options')[2].label).toEqual('scheduling.appointment.types.followUp')\n- expect(typeSelect.prop('options')[2].value).toEqual('follow up')\n- expect(typeSelect.prop('options')[3].label).toEqual('scheduling.appointment.types.routine')\n- expect(typeSelect.prop('options')[3].value).toEqual('routine')\n- expect(typeSelect.prop('options')[4].label).toEqual('scheduling.appointment.types.walkIn')\n- expect(typeSelect.prop('options')[4].value).toEqual('walk in')\n- expect(typeSelect.prop('defaultSelected')[0].value).toEqual(expectedAppointment.type)\n- })\n-\n- it('should render a reason text field input', () => {\n- const reasonTextField = wrapper.findWhere((w) => w.prop('name') === 'reason')\n-\n- expect(reasonTextField).toHaveLength(1)\n- expect(reasonTextField.prop('label')).toEqual('scheduling.appointment.reason')\n+ expect(typeOption).toBeInTheDocument()\n+ userEvent.click(typeOption)\n})\n})\n- describe('layout - editable but patient prop passed (Edit Appointment functionality)', () => {\nit('should disable patient typeahead if patient prop passed', () => {\nconst expectedAppointment = {\nstartDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\n@@ -131,179 +50,12 @@ describe('AppointmentDetailForm', () => {\n60,\n).toISOString(),\n} as Appointment\n-\n- const wrapper = mount(\n- <AppointmentDetailForm\n- isEditable\n- appointment={expectedAppointment}\n- patient={{} as Patient}\n- onFieldChange={jest.fn()}\n- />,\n- )\n- const patientTypeahead = wrapper.find(Typeahead)\n- expect(patientTypeahead.prop('disabled')).toBeTruthy()\n- })\n- })\n-\n- describe('layout - not editable', () => {\n- let wrapper: ReactWrapper\n- const expectedAppointment = {\n- patient: 'patientId',\n- startDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\n- endDateTime: addMinutes(\n- roundToNearestMinutes(new Date(), { nearestTo: 15 }),\n- 60,\n- ).toISOString(),\n- } as Appointment\n-\nconst expectedPatient = {\n- id: '123',\n- fullName: 'full name',\n+ fullName: 'Mr Popo',\n} as Patient\n- beforeEach(() => {\n- wrapper = mount(\n- <AppointmentDetailForm\n- isEditable={false}\n- appointment={expectedAppointment}\n- patient={expectedPatient}\n- onFieldChange={jest.fn()}\n- />,\n- )\n- })\n- it('should disable fields', () => {\n- const patientTypeahead = wrapper.find(Typeahead)\n- const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDate')\n- const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDate')\n- const locationTextInputBox = wrapper.findWhere((w) => w.prop('name') === 'location')\n- const reasonTextField = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- const typeSelect = wrapper.findWhere((w) => w.prop('name') === 'type')\n-\n- expect(patientTypeahead).toHaveLength(1)\n- expect(patientTypeahead.prop('disabled')).toBeTruthy()\n- expect(patientTypeahead.prop('value')).toEqual(expectedPatient.fullName)\n- expect(startDateTimePicker.prop('isEditable')).toBeFalsy()\n- expect(endDateTimePicker.prop('isEditable')).toBeFalsy()\n- expect(locationTextInputBox.prop('isEditable')).toBeFalsy()\n- expect(reasonTextField.prop('isEditable')).toBeFalsy()\n- expect(typeSelect.prop('isEditable')).toBeFalsy()\n- })\n- })\n-\n- describe('change handlers', () => {\n- let wrapper: ReactWrapper\n- const appointment = {\n- startDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\n- endDateTime: addMinutes(\n- roundToNearestMinutes(new Date(), { nearestTo: 15 }),\n- 30,\n- ).toISOString(),\n- } as Appointment\n- const onFieldChange = jest.fn()\n-\n- beforeEach(() => {\n- wrapper = mount(\n- <AppointmentDetailForm appointment={appointment} onFieldChange={onFieldChange} />,\n- )\n- })\n-\n- it('should call onFieldChange when patient input changes', () => {\n- const expectedPatientId = '123'\n-\n- act(() => {\n- const patientTypeahead = wrapper.find(Typeahead)\n- patientTypeahead.prop('onChange')([{ id: expectedPatientId }] as Patient[])\n- })\n- wrapper.update()\n-\n- expect(onFieldChange).toHaveBeenLastCalledWith('patient', expectedPatientId)\n- })\n-\n- it('should call onFieldChange when start date time changes', () => {\n- const expectedStartDateTime = roundToNearestMinutes(new Date(), { nearestTo: 15 })\n-\n- act(() => {\n- const startDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'startDate')\n- startDateTimePicker.prop('onChange')(expectedStartDateTime)\n- })\n- wrapper.update()\n-\n- expect(onFieldChange).toHaveBeenLastCalledWith(\n- 'startDateTime',\n- expectedStartDateTime.toISOString(),\n- )\n- })\n-\n- it('should call onFieldChange when end date time changes', () => {\n- const expectedStartDateTime = roundToNearestMinutes(new Date(), { nearestTo: 15 })\n- const expectedEndDateTime = addMinutes(expectedStartDateTime, 30)\n-\n- act(() => {\n- const endDateTimePicker = wrapper.findWhere((w) => w.prop('name') === 'endDate')\n- endDateTimePicker.prop('onChange')(expectedEndDateTime)\n- })\n- wrapper.update()\n-\n- expect(onFieldChange).toHaveBeenLastCalledWith(\n- 'endDateTime',\n- expectedEndDateTime.toISOString(),\n- )\n- })\n-\n- it('should call onFieldChange when location changes', () => {\n- const expectedLocation = 'location'\n-\n- act(() => {\n- const locationTextInputBox = wrapper.findWhere((w) => w.prop('name') === 'location')\n- locationTextInputBox.prop('onChange')({ target: { value: expectedLocation } })\n- })\n- wrapper.update()\n-\n- expect(onFieldChange).toHaveBeenLastCalledWith('location', expectedLocation)\n- })\n-\n- it('should call onFieldChange when reason changes', () => {\n- const expectedReason = 'reason'\n-\n- act(() => {\n- const reasonTextField = wrapper.findWhere((w) => w.prop('name') === 'reason')\n- reasonTextField.prop('onChange')({ currentTarget: { value: expectedReason } })\n- })\n- wrapper.update()\n+ setup(expectedAppointment, expectedPatient)\n- expect(onFieldChange).toHaveBeenLastCalledWith('reason', expectedReason)\n- })\n- })\n-\n- describe('typeahead search', () => {\n- let wrapper: ReactWrapper\n- beforeEach(() => {\n- wrapper = mount(\n- <AppointmentDetailForm\n- appointment={\n- {\n- startDateTime: roundToNearestMinutes(new Date(), { nearestTo: 15 }).toISOString(),\n- endDateTime: addMinutes(\n- roundToNearestMinutes(new Date(), { nearestTo: 15 }),\n- 60,\n- ).toISOString(),\n- } as Appointment\n- }\n- onFieldChange={jest.fn()}\n- />,\n- )\n- })\n-\n- it('should call the PatientRepository search when typeahead changes', () => {\n- const patientTypeahead = wrapper.find(Typeahead)\n- const patientRepositorySearch = jest.spyOn(PatientRepository, 'search')\n- const expectedSearchString = 'search'\n-\n- act(() => {\n- patientTypeahead.prop('onSearch')(expectedSearchString)\n- })\n-\n- expect(patientRepositorySearch).toHaveBeenCalledWith(expectedSearchString)\n- })\n+ expect(screen.getByDisplayValue(expectedPatient.fullName as string)).toBeDisabled()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\n+import startOfDay from 'date-fns/startOfDay'\n+import subYears from 'date-fns/subYears'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Router } from 'react-router-dom'\n@@ -16,7 +18,7 @@ const patient = {\nsex: 'male',\ntype: 'charity',\nbloodType: 'A-',\n- dateOfBirth: '12/31/1990',\n+ dateOfBirth: startOfDay(subYears(new Date(), 30)).toISOString(),\nisApproximateDateOfBirth: false,\noccupation: 'MockOccupationValue',\npreferredLanguage: 'MockPreferredLanguage',\n@@ -74,13 +76,17 @@ it('should display errors', () => {\nexpect(screen.getByDisplayValue(/not a phone number/i)).toHaveClass('is-invalid')\n})\n-describe('General Information, without isEditable', () => {\n+function typeWritableAssertion(inputElement: HTMLElement, mockValue: any) {\n+ expect(inputElement).toHaveDisplayValue(mockValue)\n+ userEvent.type(inputElement, 'willexist')\n+ expect(inputElement).toHaveDisplayValue(/willexist/i)\n+}\nfunction typeReadonlyAssertion(inputElement: HTMLElement, mockValue: any) {\nexpect(inputElement).toHaveDisplayValue(mockValue)\nuserEvent.type(inputElement, 'wontexist')\nexpect(inputElement).not.toHaveDisplayValue(/wontexist/i)\n}\n-\n+describe('General Information, readonly', () => {\nit('should render the prefix', () => {\nsetup(patient, false)\n@@ -104,12 +110,12 @@ describe('General Information, without isEditable', () => {\nit('should render the date of the birth of the patient', () => {\nsetup(patient, false)\n- typeReadonlyAssertion(screen.getByDisplayValue('12/31/1990'), patient.dateOfBirth)\n+ typeReadonlyAssertion(screen.getByDisplayValue('12/31/1990'), ['12/31/1990'])\n})\nit('should render the approximate age if patient.isApproximateDateOfBirth is true', async () => {\n- patient.isApproximateDateOfBirth = true\n- setup(patient, false)\n+ const newPatient = { ...patient, isApproximateDateOfBirth: true }\n+ setup(newPatient, false)\ntypeReadonlyAssertion(screen.getByPlaceholderText(/patient.approximateAge/i), '30')\n})\n@@ -144,397 +150,140 @@ describe('General Information, without isEditable', () => {\nsetup(patient, false)\nconst phoneNumberField = screen.getByDisplayValue(/address A/i)\nexpect(phoneNumberField).toHaveProperty('id', 'address0TextField')\n- typeReadonlyAssertion(phoneNumberField, patient.addresses[0])\n+ typeReadonlyAssertion(phoneNumberField, patient.addresses[0].value)\n})\nit('should render the sex select options', () => {\nsetup(patient, false)\n- // const sexSelect = wrapper.findWhere((w: any) => w.prop('name') === 'sex')\n- // expect(sexSelect.prop('defaultSelected')[0].value).toEqual(patient.sex)\n- // expect(sexSelect.prop('label')).toEqual('patient.sex')\n- // expect(sexSelect.prop('isEditable')).toBeFalsy()\n- // expect(sexSelect.prop('options')).toHaveLength(4)\n- // expect(sexSelect.prop('options')[0].label).toEqual('sex.male')\n- // expect(sexSelect.prop('options')[0].value).toEqual('male')\n- // expect(sexSelect.prop('options')[1].label).toEqual('sex.female')\n- // expect(sexSelect.prop('options')[1].value).toEqual('female')\n- // expect(sexSelect.prop('options')[2].label).toEqual('sex.other')\n- // expect(sexSelect.prop('options')[2].value).toEqual('other')\n- // expect(sexSelect.prop('options')[3].label).toEqual('sex.unknown')\n- // expect(sexSelect.prop('options')[3].value).toEqual('unknown')\n- })\n-\n- it('should render the blood type select options', () => {\n- setup(patient, false)\n- // const bloodTypeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'bloodType')\n- // expect(bloodTypeSelect.prop('defaultSelected')[0].value).toEqual(patient.bloodType)\n- // expect(bloodTypeSelect.prop('label')).toEqual('patient.bloodType')\n- // expect(bloodTypeSelect.prop('isEditable')).toBeFalsy()\n- // expect(bloodTypeSelect.prop('options')).toHaveLength(9)\n- // expect(bloodTypeSelect.prop('options')[0].label).toEqual('bloodType.apositive')\n- // expect(bloodTypeSelect.prop('options')[0].value).toEqual('A+')\n- // expect(bloodTypeSelect.prop('options')[1].label).toEqual('bloodType.anegative')\n- // expect(bloodTypeSelect.prop('options')[1].value).toEqual('A-')\n- // expect(bloodTypeSelect.prop('options')[2].label).toEqual('bloodType.abpositive')\n- // expect(bloodTypeSelect.prop('options')[2].value).toEqual('AB+')\n- // expect(bloodTypeSelect.prop('options')[3].label).toEqual('bloodType.abnegative')\n- // expect(bloodTypeSelect.prop('options')[3].value).toEqual('AB-')\n- // expect(bloodTypeSelect.prop('options')[4].label).toEqual('bloodType.bpositive')\n- // expect(bloodTypeSelect.prop('options')[4].value).toEqual('B+')\n- // expect(bloodTypeSelect.prop('options')[5].label).toEqual('bloodType.bnegative')\n- // expect(bloodTypeSelect.prop('options')[5].value).toEqual('B-')\n- // expect(bloodTypeSelect.prop('options')[6].label).toEqual('bloodType.opositive')\n- // expect(bloodTypeSelect.prop('options')[6].value).toEqual('O+')\n- // expect(bloodTypeSelect.prop('options')[7].label).toEqual('bloodType.onegative')\n- // expect(bloodTypeSelect.prop('options')[7].value).toEqual('O-')\n- // expect(bloodTypeSelect.prop('options')[8].label).toEqual('bloodType.unknown')\n- // expect(bloodTypeSelect.prop('options')[8].value).toEqual('unknown')\n+ const patientSex = screen.getByDisplayValue(/sex/)\n+ expect(patientSex).toBeDisabled()\n+ expect(patientSex).toHaveDisplayValue('male')\n})\n+ it('should render the blood type select options', async () => {\n+ setup(patient, false)\n+ const bloodType = screen.getByDisplayValue(/bloodType/)\n+ expect(bloodType).toBeDisabled()\n+ expect(bloodType).toHaveDisplayValue(['bloodType.anegative'])\n+ })\nit('should render the patient type select options', () => {\nsetup(patient, false)\n- // const typeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'type')\n- // expect(typeSelect.prop('defaultSelected')[0].value).toEqual(patient.type)\n- // expect(typeSelect.prop('label')).toEqual('patient.type')\n- // expect(typeSelect.prop('isEditable')).toBeFalsy()\n- // expect(typeSelect.prop('options')).toHaveLength(2)\n- // expect(typeSelect.prop('options')[0].label).toEqual('patient.types.charity')\n- // expect(typeSelect.prop('options')[0].value).toEqual('charity')\n- // expect(typeSelect.prop('options')[1].label).toEqual('patient.types.private')\n- // expect(typeSelect.prop('options')[1].value).toEqual('private')\n+ const patientType = screen.getByDisplayValue(/patient.type/)\n+ expect(patientType).toBeDisabled()\n+ expect(patientType).toHaveDisplayValue('charity')\n})\ndescribe('General Information, isEditable', () => {\n- //! isEditable SETUP\n- const expectedPrefix = 'expectedPrefix'\n- const expectedGivenName = 'expectedGivenName'\n- const expectedFamilyName = 'expectedFamilyName'\n- const expectedSuffix = 'expectedSuffix'\n- const expectedDateOfBirth = '1937-06-14T05:00:00.000Z'\n- const expectedOccupation = 'expectedOccupation'\n- const expectedPreferredLanguage = 'expectedPreferredLanguage'\n- const expectedPhoneNumbers = [\n- { value: '111111', type: undefined, id: '123' },\n- { value: '222222', type: undefined, id: '456' },\n- ]\n- const expectedEmails = [\n- { value: '[email protected]', type: undefined, id: '789' },\n- { value: '[email protected]', type: undefined, id: '987' },\n- ]\n- const expectedAddresses = [\n- { value: 'address C', type: undefined, id: '654' },\n- { value: 'address D', type: undefined, id: '321' },\n- ]\n- const expectedBloodType = 'unknown'\n-\nit('should render the prefix', () => {\nsetup(patient)\n-\n- // const prefixInput = wrapper.findWhere((w: any) => w.prop('name') === 'prefix')\n-\n- // expect(prefixInput.prop('value')).toEqual(patient.prefix)\n- // expect(prefixInput.prop('label')).toEqual('patient.prefix')\n- // expect(prefixInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = prefixInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedPrefix\n- // input.simulate('change')\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({ ...patient, prefix: expectedPrefix })\n+ typeWritableAssertion(\n+ screen.getByRole('textbox', { name: /patient\\.prefix/i }),\n+ patient.prefix,\n+ )\n})\nit('should render the given name', () => {\nsetup(patient)\n-\n- // const givenNameInput = wrapper.findWhere((w: any) => w.prop('name') === 'givenName')\n-\n- // expect(givenNameInput.prop('value')).toEqual(patient.givenName)\n- // expect(givenNameInput.prop('label')).toEqual('patient.givenName')\n- // expect(givenNameInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = givenNameInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedGivenName\n- // input.simulate('change')\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({ ...patient, givenName: expectedGivenName })\n+ typeWritableAssertion(screen.getByPlaceholderText(/patient\\.givenName/i), patient.givenName)\n})\nit('should render the family name', () => {\nsetup(patient)\n-\n- // const familyNameInput = wrapper.findWhere((w: any) => w.prop('name') === 'familyName')\n-\n- // expect(familyNameInput.prop('value')).toEqual(patient.familyName)\n- // expect(familyNameInput.prop('label')).toEqual('patient.familyName')\n- // expect(familyNameInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = familyNameInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedFamilyName\n- // input.simulate('change')\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({ ...patient, familyName: expectedFamilyName })\n+ typeWritableAssertion(screen.getByPlaceholderText(/patient\\.familyName/i), patient.familyName)\n})\nit('should render the suffix', () => {\nsetup(patient)\n-\n- // const suffixInput = wrapper.findWhere((w: any) => w.prop('name') === 'suffix')\n-\n- // expect(suffixInput.prop('value')).toEqual(patient.suffix)\n- // expect(suffixInput.prop('label')).toEqual('patient.suffix')\n- // expect(suffixInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = suffixInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedSuffix\n- // input.simulate('change')\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({ ...patient, suffix: expectedSuffix })\n+ typeWritableAssertion(screen.getByPlaceholderText(/patient\\.suffix/i), patient.suffix)\n})\n- it('should render the sex select', () => {\n+ it('should render the date of the birth of the patient', () => {\nsetup(patient)\n-\n- // const sexSelect = wrapper.findWhere((w: any) => w.prop('name') === 'sex')\n-\n- // expect(sexSelect.prop('defaultSelected')[0].value).toEqual(patient.sex)\n- // expect(sexSelect.prop('label')).toEqual('patient.sex')\n- // expect(sexSelect.prop('isEditable')).toBeTruthy()\n- // expect(sexSelect.prop('options')).toHaveLength(4)\n-\n- // expect(sexSelect.prop('options')[0].label).toEqual('sex.male')\n- // expect(sexSelect.prop('options')[0].value).toEqual('male')\n- // expect(sexSelect.prop('options')[1].label).toEqual('sex.female')\n- // expect(sexSelect.prop('options')[1].value).toEqual('female')\n- // expect(sexSelect.prop('options')[2].label).toEqual('sex.other')\n- // expect(sexSelect.prop('options')[2].value).toEqual('other')\n- // expect(sexSelect.prop('options')[3].label).toEqual('sex.unknown')\n- // expect(sexSelect.prop('options')[3].value).toEqual('unknown')\n+ typeWritableAssertion(screen.getByDisplayValue('12/31/1990'), ['12/31/1990'])\n})\n- it('should render the blood type select', () => {\n+ it('should render the occupation of the patient', () => {\nsetup(patient)\n-\n- // const bloodTypeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'bloodType')\n- // expect(bloodTypeSelect.prop('defaultSelected')[0].value).toEqual(patient.bloodType)\n- // expect(bloodTypeSelect.prop('label')).toEqual('patient.bloodType')\n- // expect(bloodTypeSelect.prop('isEditable')).toBeTruthy()\n- // expect(bloodTypeSelect.prop('options')).toHaveLength(9)\n- // expect(bloodTypeSelect.prop('options')[0].label).toEqual('bloodType.apositive')\n- // expect(bloodTypeSelect.prop('options')[0].value).toEqual('A+')\n- // expect(bloodTypeSelect.prop('options')[1].label).toEqual('bloodType.anegative')\n- // expect(bloodTypeSelect.prop('options')[1].value).toEqual('A-')\n- // expect(bloodTypeSelect.prop('options')[2].label).toEqual('bloodType.abpositive')\n- // expect(bloodTypeSelect.prop('options')[2].value).toEqual('AB+')\n- // expect(bloodTypeSelect.prop('options')[3].label).toEqual('bloodType.abnegative')\n- // expect(bloodTypeSelect.prop('options')[3].value).toEqual('AB-')\n- // expect(bloodTypeSelect.prop('options')[4].label).toEqual('bloodType.bpositive')\n- // expect(bloodTypeSelect.prop('options')[4].value).toEqual('B+')\n- // expect(bloodTypeSelect.prop('options')[5].label).toEqual('bloodType.bnegative')\n- // expect(bloodTypeSelect.prop('options')[5].value).toEqual('B-')\n- // expect(bloodTypeSelect.prop('options')[6].label).toEqual('bloodType.opositive')\n- // expect(bloodTypeSelect.prop('options')[6].value).toEqual('O+')\n- // expect(bloodTypeSelect.prop('options')[7].label).toEqual('bloodType.onegative')\n- // expect(bloodTypeSelect.prop('options')[7].value).toEqual('O-')\n- // expect(bloodTypeSelect.prop('options')[8].label).toEqual('bloodType.unknown')\n- // expect(bloodTypeSelect.prop('options')[8].value).toEqual('unknown')\n- // act(() => {\n- // bloodTypeSelect.prop('onChange')([expectedBloodType])\n- // })\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({\n- // ...patient,\n- // bloodType: expectedBloodType,\n- // })\n+ typeWritableAssertion(screen.getByPlaceholderText(/patient.occupation/i), [\n+ patient.occupation,\n+ ])\n})\n- it('should render the patient type select', () => {\n+ it('should render the preferred language of the patient', () => {\nsetup(patient)\n-\n- // const typeSelect = wrapper.findWhere((w: any) => w.prop('name') === 'type')\n-\n- // expect(typeSelect.prop('defaultSelected')[0].value).toEqual(patient.type)\n- // expect(typeSelect.prop('label')).toEqual('patient.type')\n- // expect(typeSelect.prop('isEditable')).toBeTruthy()\n-\n- // expect(typeSelect.prop('options')).toHaveLength(2)\n- // expect(typeSelect.prop('options')[0].label).toEqual('patient.types.charity')\n- // expect(typeSelect.prop('options')[0].value).toEqual('charity')\n- // expect(typeSelect.prop('options')[1].label).toEqual('patient.types.private')\n- // expect(typeSelect.prop('options')[1].value).toEqual('private')\n+ typeWritableAssertion(\n+ screen.getByPlaceholderText(/patient.preferredLanguage/i),\n+ patient.preferredLanguage,\n+ )\n})\n- it('should render the date of the birth of the patient', () => {\n+ it('should render the phone numbers of the patient', () => {\nsetup(patient)\n-\n- // const dateOfBirthInput = wrapper.findWhere((w: any) => w.prop('name') === 'dateOfBirth')\n-\n- // expect(dateOfBirthInput.prop('value')).toEqual(new Date(patient.dateOfBirth))\n- // expect(dateOfBirthInput.prop('label')).toEqual('patient.dateOfBirth')\n- // expect(dateOfBirthInput.prop('isEditable')).toBeTruthy()\n- // expect(dateOfBirthInput.prop('maxDate')).toEqual(new Date(Date.now()))\n-\n- // act(() => {\n- // dateOfBirthInput.prop('onChange')(new Date(expectedDateOfBirth))\n- // })\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({ ...patient, dateOfBirth: expectedDateOfBirth })\n+ const phoneNumberField = screen.getByDisplayValue(/123456789/i)\n+ expect(phoneNumberField).toHaveProperty('id', 'phoneNumber0TextInput')\n+ typeWritableAssertion(phoneNumberField, patient.phoneNumbers[0].value)\n})\n- it('should render the approximate age if patient.isApproximateDateOfBirth is true', async () => {\n- patient.isApproximateDateOfBirth = true\n+ it('should render the emails of the patient', () => {\nsetup(patient)\n-\n- // const approximateAgeInput = wrapper.findWhere((w: any) => w.prop('name') === 'approximateAge')\n-\n- // expect(approximateAgeInput.prop('value')).toEqual('30')\n- // expect(approximateAgeInput.prop('label')).toEqual('patient.approximateAge')\n- // expect(approximateAgeInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = approximateAgeInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = '20'\n- // input.simulate('change')\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({\n- // ...patient,\n- // dateOfBirth: startOfDay(subYears(new Date(Date.now()), 20)).toISOString(),\n- // })\n+ const emailsField = screen.getByDisplayValue(/[email protected]/i)\n+ expect(emailsField).toHaveProperty('id', 'email0TextInput')\n+ typeWritableAssertion(emailsField, patient.emails[0].value)\n})\n- it('should render the occupation of the patient', () => {\n+ it('should render the addresses of the patient', () => {\nsetup(patient)\n- // const occupationInput = wrapper.findWhere((w: any) => w.prop('name') === 'occupation')\n-\n- // expect(occupationInput.prop('value')).toEqual(patient.occupation)\n- // expect(occupationInput.prop('label')).toEqual('patient.occupation')\n- // expect(occupationInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = occupationInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedOccupation\n- // input.simulate('change')\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({ ...patient, occupation: expectedOccupation })\n+ const phoneNumberField = screen.getByDisplayValue(/address A/i)\n+ expect(phoneNumberField).toHaveProperty('id', 'address0TextField')\n+ typeReadonlyAssertion(phoneNumberField, patient.addresses[0].value)\n})\n-\n- it('should render the preferred language of the patient', () => {\n+ it('should render the sex select', () => {\nsetup(patient)\n-\n- // const preferredLanguageInput = wrapper.findWhere(\n- // (w: any) => w.prop('name') === 'preferredLanguage',\n- // )\n-\n- // expect(preferredLanguageInput.prop('value')).toEqual(patient.preferredLanguage)\n- // expect(preferredLanguageInput.prop('label')).toEqual('patient.preferredLanguage')\n- // expect(preferredLanguageInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = preferredLanguageInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedPreferredLanguage\n- // input.simulate('change')\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(1)\n- // expect(onFieldChange).toHaveBeenCalledWith({\n- // ...patient,\n- // preferredLanguage: expectedPreferredLanguage,\n- // })\n+ const patientSex = screen.getByDisplayValue(/sex/)\n+ expect(patientSex).not.toBeDisabled()\n+ userEvent.click(patientSex)\n+ const bloodArr = [/sex.male/i, /sex.female/i, /sex.female/i, /sex.unknown/i]\n+ bloodArr.forEach((reg) => {\n+ const sexOption = screen.getByRole('option', { name: reg })\n+ userEvent.click(sexOption)\n+ expect(sexOption).toBeInTheDocument()\n})\n-\n- it('should render the phone numbers of the patient', () => {\n- setup(patient)\n-\n- // patient.phoneNumbers.forEach((phoneNumber, i) => {\n- // const phoneNumberInput = wrapper.findWhere((w: any) => w.prop('name') === `phoneNumber${i}`)\n- // expect(phoneNumberInput.prop('value')).toEqual(phoneNumber.value)\n- // expect(phoneNumberInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = phoneNumberInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedPhoneNumbers[i].value\n- // input.simulate('change')\n- // })\n-\n- // const calledWith = [] as any\n- // patient.phoneNumbers.forEach((_, i) => {\n- // const newPhoneNumbers = [] as any\n- // patient.phoneNumbers.forEach((__, j) => {\n- // if (j <= i) {\n- // newPhoneNumbers.push(expectedPhoneNumbers[j])\n- // } else {\n- // newPhoneNumbers.push(patient.phoneNumbers[j])\n- // }\n- // })\n- // calledWith.push({ ...patient, phoneNumbers: newPhoneNumbers })\n- // })\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(calledWith.length)\n- // expect(onFieldChange).toHaveBeenNthCalledWith(1, calledWith[0])\n- // expect(onFieldChange).toHaveBeenNthCalledWith(2, calledWith[1])\n})\n- it('should render the emails of the patient', () => {\n+ it('should render the blood type select', () => {\nsetup(patient)\n-\n- // patient.emails.forEach((email, i) => {\n- // const emailInput = wrapper.findWhere((w: any) => w.prop('name') === `email${i}`)\n- // expect(emailInput.prop('value')).toEqual(email.value)\n- // expect(emailInput.prop('isEditable')).toBeTruthy()\n-\n- // const input = emailInput.find('input')\n- // input.getDOMNode<HTMLInputElement>().value = expectedEmails[i].value\n- // input.simulate('change')\n- // })\n-\n- // const calledWith = [] as any\n- // patient.emails.forEach((_, i) => {\n- // const newEmails = [] as any\n- // patient.emails.forEach((__, j) => {\n- // if (j <= i) {\n- // newEmails.push(expectedEmails[j])\n- // } else {\n- // newEmails.push(patient.emails[j])\n- // }\n- // })\n- // calledWith.push({ ...patient, emails: newEmails })\n- // })\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(calledWith.length)\n- // expect(onFieldChange).toHaveBeenNthCalledWith(1, calledWith[0])\n- // expect(onFieldChange).toHaveBeenNthCalledWith(2, calledWith[1])\n+ const bloodType = screen.getByDisplayValue(/bloodType/)\n+ expect(bloodType).not.toBeDisabled()\n+ userEvent.click(bloodType)\n+ const bloodArr = [\n+ /bloodType.apositive/i,\n+ /bloodType.anegative/i,\n+ /bloodType.abpositive/i,\n+ /bloodType.abnegative/i,\n+ /bloodType.bpositive/i,\n+ /bloodType.bnegative/i,\n+ /bloodType.opositive/i,\n+ /bloodType.onegative/i,\n+ /bloodType.unknown/i,\n+ ]\n+ bloodArr.forEach((reg) => {\n+ const bloodOption = screen.getByRole('option', { name: reg })\n+ userEvent.click(bloodOption)\n+ expect(bloodOption).toBeInTheDocument()\n+ })\n})\n- it('should render the addresses of the patient', () => {\n+ it('should render the patient type select', () => {\nsetup(patient)\n-\n- // patient.addresses.forEach((address, i) => {\n- // const addressTextArea = wrapper.findWhere((w: any) => w.prop('name') === `address${i}`)\n- // expect(addressTextArea.prop('value')).toEqual(address.value)\n- // expect(addressTextArea.prop('isEditable')).toBeTruthy()\n-\n- // const textarea = addressTextArea.find('textarea')\n- // textarea.getDOMNode<HTMLTextAreaElement>().value = expectedAddresses[i].value\n- // textarea.simulate('change')\n- // })\n-\n- // const calledWith = [] as any\n- // patient.addresses.forEach((_, i) => {\n- // const newAddresses = [] as any\n- // patient.addresses.forEach((__, j) => {\n- // if (j <= i) {\n- // newAddresses.push(expectedAddresses[j])\n- // } else {\n- // newAddresses.push(patient.addresses[j])\n- // }\n- // })\n- // calledWith.push({ ...patient, addresses: newAddresses })\n- // })\n-\n- // expect(onFieldChange).toHaveBeenCalledTimes(calledWith.length)\n- // expect(onFieldChange).toHaveBeenNthCalledWith(1, calledWith[0])\n- // expect(onFieldChange).toHaveBeenNthCalledWith(2, calledWith[1])\n+ const patientType = screen.getByDisplayValue(/patient.type/)\n+ expect(patientType).not.toBeDisabled()\n+ userEvent.click(patientType)\n+ const bloodArr = [/patient.types.charity/i, /patient.types.private/i]\n+ bloodArr.forEach((reg) => {\n+ const typeOption = screen.getByRole('option', { name: reg })\n+ userEvent.click(typeOption)\n+ expect(typeOption).toBeInTheDocument()\n+ })\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -156,7 +156,7 @@ describe('General Information, readonly', () => {\nsetup(patient, false)\nconst patientSex = screen.getByDisplayValue(/sex/)\nexpect(patientSex).toBeDisabled()\n- expect(patientSex).toHaveDisplayValue('male')\n+ expect(patientSex).toHaveDisplayValue([/sex.male/i])\n})\nit('should render the blood type select options', async () => {\n@@ -169,7 +169,7 @@ describe('General Information, readonly', () => {\nsetup(patient, false)\nconst patientType = screen.getByDisplayValue(/patient.type/)\nexpect(patientType).toBeDisabled()\n- expect(patientType).toHaveDisplayValue('charity')\n+ expect(patientType).toHaveDisplayValue([/patient.types.charity/i])\n})\ndescribe('General Information, isEditable', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -108,9 +108,9 @@ describe('General Information, readonly', () => {\ntypeReadonlyAssertion(screen.getByPlaceholderText(/patient\\.suffix/i), patient.suffix)\n})\n- it('should render the date of the birth of the patient', () => {\n+ it('should render the date of the birth of the patient', async () => {\nsetup(patient, false)\n- typeReadonlyAssertion(screen.getByDisplayValue('12/31/1990'), ['12/31/1990'])\n+ typeReadonlyAssertion(await screen.findByDisplayValue('12/31/1990'), ['12/31/1990'])\n})\nit('should render the approximate age if patient.isApproximateDateOfBirth is true', async () => {\n@@ -196,9 +196,9 @@ describe('General Information, readonly', () => {\ntypeWritableAssertion(screen.getByPlaceholderText(/patient\\.suffix/i), patient.suffix)\n})\n- it('should render the date of the birth of the patient', () => {\n+ it('should render the date of the birth of the patient', async () => {\nsetup(patient)\n- typeWritableAssertion(screen.getByDisplayValue('12/31/1990'), ['12/31/1990'])\n+ typeWritableAssertion(await screen.findByDisplayValue('12/31/1990'), ['12/31/1990'])\n})\nit('should render the occupation of the patient', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -110,7 +110,12 @@ describe('General Information, readonly', () => {\nit('should render the date of the birth of the patient', async () => {\nsetup(patient, false)\n- typeReadonlyAssertion(await screen.findByDisplayValue('12/31/1990'), ['12/31/1990'])\n+ typeReadonlyAssertion(\n+ await screen.findByDisplayValue('12/31/1990', undefined, {\n+ timeout: 5000\n+ }),\n+ ['12/31/1990'],\n+ )\n})\nit('should render the approximate age if patient.isApproximateDateOfBirth is true', async () => {\n@@ -198,7 +203,12 @@ describe('General Information, readonly', () => {\nit('should render the date of the birth of the patient', async () => {\nsetup(patient)\n- typeWritableAssertion(await screen.findByDisplayValue('12/31/1990'), ['12/31/1990'])\n+ typeWritableAssertion(\n+ await screen.findByDisplayValue('12/31/1990', undefined, {\n+ timeout: 5000\n+ }),\n+ ['12/31/1990'],\n+ )\n})\nit('should render the occupation of the patient', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -112,7 +112,7 @@ describe('General Information, readonly', () => {\nsetup(patient, false)\ntypeReadonlyAssertion(\nawait screen.findByDisplayValue('12/31/1990', undefined, {\n- timeout: 5000\n+ timeout: 5000,\n}),\n['12/31/1990'],\n)\n@@ -205,7 +205,7 @@ describe('General Information, readonly', () => {\nsetup(patient)\ntypeWritableAssertion(\nawait screen.findByDisplayValue('12/31/1990', undefined, {\n- timeout: 5000\n+ timeout: 5000,\n}),\n['12/31/1990'],\n)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/Appointments.test.tsx", "diff": "-import { mount, ReactWrapper } from 'enzyme'\n+import { render, screen } from '@testing-library/react'\n+import { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n-import { MemoryRouter, Route } from 'react-router-dom'\n+import { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import Dashboard from '../../../dashboard/Dashboard'\nimport HospitalRun from '../../../HospitalRun'\nimport { addBreadcrumbs } from '../../../page-header/breadcrumbs/breadcrumbs-slice'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\n-import Appointments from '../../../scheduling/appointments/Appointments'\n-import EditAppointment from '../../../scheduling/appointments/edit/EditAppointment'\n-import NewAppointment from '../../../scheduling/appointments/new/NewAppointment'\n-import ViewAppointments from '../../../scheduling/appointments/ViewAppointments'\n-import AppointmentRepository from '../../../shared/db/AppointmentRepository'\n-import PatientRepository from '../../../shared/db/PatientRepository'\n-import Appointment from '../../../shared/model/Appointment'\n-import Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\nconst { TitleProvider } = titleUtil\nconst mockStore = createMockStore<RootState, any>([thunk])\n-let route: any\n-\n-describe('/appointments', () => {\n- // eslint-disable-next-line no-shadow\n-\n- const setup = (setupRoute: string, permissions: Permissions[], renderHr: boolean = false) => {\n- const appointment = {\n- id: '123',\n- patient: '456',\n- } as Appointment\n-\n- const patient = {\n- id: '456',\n- } as Patient\n-\n- jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+const setup = (url: string, permissions: Permissions[]) => {\n+ const history = createMemoryHistory({ initialEntries: [url] })\nconst store = mockStore({\n- title: 'test',\nuser: { user: { id: '123' }, permissions },\n- appointment: { appointment, patient: { id: '456' } as Patient },\n- appointments: [{ appointment, patient: { id: '456' } as Patient }],\nbreadcrumbs: { breadcrumbs: [] },\ncomponents: { sidebarCollapsed: false },\n} as any)\n- jest.useFakeTimers()\n- const wrapper = mount(\n+\n+ return {\n+ history,\n+ store,\n+ ...render(\n<Provider store={store}>\n- <MemoryRouter initialEntries={[setupRoute]}>\n- <TitleProvider>{renderHr ? <HospitalRun /> : <Appointments />}</TitleProvider>\n- </MemoryRouter>\n+ <Router history={history}>\n+ <TitleProvider>\n+ <HospitalRun />\n+ </TitleProvider>\n+ </Router>\n</Provider>,\n- )\n- jest.advanceTimersByTime(100)\n- if (!renderHr) {\n- wrapper.find(Appointments).props().updateTitle = jest.fn()\n+ ),\n}\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper, store }\n}\n+describe('/appointments', () => {\nit('should render the appointments screen when /appointments is accessed', async () => {\n- route = '/appointments'\n- const permissions: Permissions[] = [Permissions.ReadAppointments]\n- const { wrapper, store } = await setup(route, permissions)\n+ const { store } = setup('/appointments', [Permissions.ReadAppointments])\n- expect(wrapper.find(ViewAppointments)).toHaveLength(1)\n+ expect(\n+ await screen.findByRole('heading', { name: /scheduling\\.appointments\\.label/i }),\n+ ).toBeInTheDocument()\nexpect(store.getActions()).toContainEqual(\naddBreadcrumbs([\n@@ -82,62 +55,20 @@ describe('/appointments', () => {\n})\nit('should render the Dashboard when the user does not have read appointment privileges', async () => {\n- route = '/appointments'\n- const permissions: Permissions[] = []\n- const { wrapper } = await setup(route, permissions, true)\n+ setup('/appointments', [])\n- wrapper.update()\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\n})\ndescribe('/appointments/new', () => {\n- // eslint-disable-next-line no-shadow\n- const setup = (route: string, permissions: Permissions[], renderHr: boolean = false) => {\n- const appointment = {\n- id: '123',\n- patient: '456',\n- } as Appointment\n-\n- const patient = {\n- id: '456',\n- } as Patient\n-\n- jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n-\n- const store = mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions },\n- appointment: { appointment, patient: { id: '456' } as Patient },\n- appointments: [{ appointment, patient: { id: '456' } as Patient }],\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)\n-\n- const wrapper = mount(\n- <Provider store={store}>\n- <MemoryRouter initialEntries={[route]}>\n- <TitleProvider>{renderHr ? <HospitalRun /> : <NewAppointment />}</TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n- if (!renderHr) {\n- wrapper.find(NewAppointment).props().updateTitle = jest.fn()\n- }\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper, store }\n- }\nit('should render the new appointment screen when /appointments/new is accessed', async () => {\n- route = '/appointments/new'\n- const permissions: Permissions[] = [Permissions.WriteAppointments]\n- const { wrapper, store } = setup(route, permissions, false)\n+ const { store } = setup('/appointments/new', [Permissions.WriteAppointments])\n- wrapper.update()\n+ expect(\n+ await screen.findByRole('heading', { name: /scheduling\\.appointments\\.new/i }),\n+ ).toBeInTheDocument()\n- expect(wrapper.find(NewAppointment)).toHaveLength(1)\nexpect(store.getActions()).toContainEqual(\naddBreadcrumbs([\n{ i18nKey: 'scheduling.appointments.label', location: '/appointments' },\n@@ -147,140 +78,31 @@ describe('/appointments/new', () => {\n)\n})\n- it('should render the Dashboard when the user does not have read appointment privileges', () => {\n- route = '/appointments/new'\n- const permissions: Permissions[] = []\n- const { wrapper } = setup(route, permissions, true)\n+ it('should render the Dashboard when the user does not have read appointment privileges', async () => {\n+ setup('/appointments/new', [])\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\n})\ndescribe('/appointments/edit/:id', () => {\n- // eslint-disable-next-line no-shadow\n- const setup = async (route: string, permissions: Permissions[], renderHr: boolean = false) => {\n- const appointment = {\n- id: '123',\n- patient: '456',\n- } as Appointment\n-\n- const patient = {\n- id: '456',\n- } as Patient\n-\n- jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n-\n- const store = mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions },\n- appointment: { appointment, patient: { id: '456' } as Patient },\n- appointments: [{ appointment, patient: { id: '456' } as Patient }],\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)\n-\n- const wrapper = await mount(\n- <Provider store={store}>\n- <MemoryRouter initialEntries={[route]}>\n- <Route path=\"/appointments/edit/:id\">\n- <TitleProvider>{renderHr ? <HospitalRun /> : <EditAppointment />}</TitleProvider>\n- </Route>\n- </MemoryRouter>\n- </Provider>,\n- )\n- if (!renderHr) {\n- wrapper.find(EditAppointment).props().updateTitle = jest.fn()\n- }\n- wrapper.update()\n-\n- return { wrapper: wrapper as ReactWrapper, store }\n- }\n-\nit('should render the edit appointment screen when /appointments/edit/:id is accessed', async () => {\n- route = '/appointments/edit/123'\n- const permissions: Permissions[] = [Permissions.WriteAppointments, Permissions.ReadAppointments]\n- const { wrapper } = await setup(route, permissions, false)\n+ setup('/appointments/edit/123', [Permissions.WriteAppointments, Permissions.ReadAppointments])\n- expect(wrapper.find(EditAppointment)).toHaveLength(1)\n- expect(AppointmentRepository.find).toHaveBeenCalledTimes(1)\n- expect(AppointmentRepository.find).toHaveBeenCalledWith('123')\n+ expect(\n+ await screen.findByRole('heading', { name: /scheduling\\.appointments\\.editAppointment/i }),\n+ ).toBeInTheDocument()\n})\nit('should render the Dashboard when the user does not have read appointment privileges', async () => {\n- route = '/appointments/edit/123'\n- const permissions: Permissions[] = []\n- const appointment = {\n- id: '123',\n- patient: '456',\n- } as Appointment\n-\n- const patient = {\n- id: '456',\n- } as Patient\n-\n- jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n- const store = mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions },\n- appointment: { appointment, patient: { id: '456' } as Patient },\n- appointments: [{ appointment, patient: { id: '456' } as Patient }],\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)\n-\n- const wrapper = await mount(\n- <Provider store={store}>\n- <MemoryRouter initialEntries={[route]}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n- await wrapper.update()\n+ setup('/appointments/edit/123', [Permissions.WriteAppointments])\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\nit('should render the Dashboard when the user does not have write appointment privileges', async () => {\n- route = '/appointments/edit/123'\n- const permissions: Permissions[] = []\n- const appointment = {\n- id: '123',\n- patient: '456',\n- } as Appointment\n-\n- const patient = {\n- id: '456',\n- } as Patient\n-\n- jest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\n- jest.spyOn(AppointmentRepository, 'find').mockResolvedValue(appointment)\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n- const store = mockStore({\n- title: 'test',\n- user: { user: { id: '123' }, permissions },\n- appointment: { appointment, patient: { id: '456' } as Patient },\n- appointments: [{ appointment, patient: { id: '456' } as Patient }],\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)\n- const wrapper = await mount(\n- <Provider store={store}>\n- <MemoryRouter initialEntries={[route]}>\n- <TitleProvider>\n- <HospitalRun />\n- </TitleProvider>\n- </MemoryRouter>\n- </Provider>,\n- )\n-\n- await wrapper.update()\n+ setup('/appointments/edit/123', [Permissions.ReadAppointments])\n- expect(wrapper.find(Dashboard)).toHaveLength(1)\n+ expect(await screen.findByRole('heading', { name: /dashboard\\.label/i })).toBeInTheDocument()\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "new_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "diff": "@@ -18,7 +18,9 @@ const EditAppointment = () => {\nconst { id } = useParams()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('scheduling.appointments.editAppointment'))\n+ }, [updateTitle, t])\nconst history = useHistory()\nconst [newAppointment, setAppointment] = useState({} as Appointment)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\n+import format from 'date-fns/format'\nimport startOfDay from 'date-fns/startOfDay'\nimport subYears from 'date-fns/subYears'\nimport { createMemoryHistory } from 'history'\n@@ -110,12 +111,10 @@ describe('General Information, readonly', () => {\nit('should render the date of the birth of the patient', async () => {\nsetup(patient, false)\n- typeReadonlyAssertion(\n- await screen.findByDisplayValue('12/31/1990', undefined, {\n- timeout: 5000,\n- }),\n- ['12/31/1990'],\n- )\n+\n+ const expectedDate = format(new Date(patient.dateOfBirth), 'MM/dd/yyyy')\n+\n+ typeReadonlyAssertion(await screen.findByDisplayValue(expectedDate), [expectedDate])\n})\nit('should render the approximate age if patient.isApproximateDateOfBirth is true', async () => {\n@@ -203,12 +202,10 @@ describe('General Information, readonly', () => {\nit('should render the date of the birth of the patient', async () => {\nsetup(patient)\n- typeWritableAssertion(\n- await screen.findByDisplayValue('12/31/1990', undefined, {\n- timeout: 5000,\n- }),\n- ['12/31/1990'],\n- )\n+\n+ const expectedDate = format(new Date(patient.dateOfBirth), 'MM/dd/yyyy')\n+\n+ typeWritableAssertion(await screen.findByDisplayValue(expectedDate), [expectedDate])\n})\nit('should render the occupation of the patient', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/new/NewPatient.test.tsx", "new_path": "src/__tests__/patients/new/NewPatient.test.tsx", "diff": "import * as components from '@hospitalrun/components'\n-import { mount } from 'enzyme'\n+import { Toaster } from '@hospitalrun/components'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore, { MockStore } from 'redux-mock-store'\nimport thunk from 'redux-thunk'\nimport * as titleUtil from '../../../page-header/title/TitleContext'\n-import GeneralInformation from '../../../patients/GeneralInformation'\nimport NewPatient from '../../../patients/new/NewPatient'\n-import * as patientSlice from '../../../patients/patient-slice'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport { RootState } from '../../../shared/store'\n@@ -21,8 +20,12 @@ const mockStore = createMockStore<RootState, any>([thunk])\ndescribe('New Patient', () => {\nconst patient = {\n- givenName: 'first',\n- fullName: 'first',\n+ id: '123',\n+ givenName: 'givenName',\n+ fullName: 'givenName',\n+ familyName: 'familyName',\n+ sex: 'male',\n+ dateOfBirth: '01/01/2020',\n} as Patient\nlet history: any\n@@ -36,7 +39,8 @@ describe('New Patient', () => {\nstore = mockStore({ patient: { patient: {} as Patient, createError: error } } as any)\nhistory.push('/patients/new')\n- const wrapper = mount(\n+\n+ return render(\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/patients/new\">\n@@ -45,11 +49,9 @@ describe('New Patient', () => {\n</TitleProvider>\n</Route>\n</Router>\n+ <Toaster draggable hideProgressBar />\n</Provider>,\n)\n-\n- wrapper.update()\n- return wrapper\n}\nbeforeEach(() => {\n@@ -57,116 +59,61 @@ describe('New Patient', () => {\n})\nit('should render a general information form', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- expect(wrapper.find(GeneralInformation)).toHaveLength(1)\n+ setup()\n+ expect(screen.getByText(/patient\\.basicInformation/i))\n})\nit('should pass the error object to general information', async () => {\nconst expectedError = { message: 'some message' }\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup(expectedError)\n- })\n- wrapper.update()\n-\n- const generalInformationForm = wrapper.find(GeneralInformation)\n- expect(generalInformationForm.prop('error')).toEqual(expectedError)\n+ setup(expectedError)\n+ expect(screen.getByRole('alert')).toHaveTextContent(expectedError.message)\n})\nit('should dispatch createPatient when save button is clicked', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- const generalInformationForm = wrapper.find(GeneralInformation)\n-\n- act(() => {\n- generalInformationForm.prop('onChange')(patient)\n- })\n-\n- wrapper.update()\n-\n- const saveButton = wrapper.find('.btn-save').at(0)\n- const onClick = saveButton.prop('onClick') as any\n- expect(saveButton.text().trim()).toEqual('patients.createPatient')\n-\n- await act(async () => {\n- await onClick()\n- })\n-\n- expect(PatientRepository.save).toHaveBeenCalledWith(patient)\n- expect(store.getActions()).toContainEqual(patientSlice.createPatientStart())\n- expect(store.getActions()).toContainEqual(patientSlice.createPatientSuccess())\n+ setup()\n+ userEvent.type(screen.getByLabelText(/patient\\.givenName/i), patient.givenName as string)\n+ userEvent.click(screen.getByRole('button', { name: /patients\\.createPatient/i }))\n+ expect(PatientRepository.save).toHaveBeenCalledWith(\n+ expect.objectContaining({ fullName: patient.fullName, givenName: patient.givenName }),\n+ )\n})\nit('should reveal modal (return true) when save button is clicked if an existing patient has the same information', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- const saveButton = wrapper.find('.btn-save').at(0)\n- const onClick = saveButton.prop('onClick') as any\n- expect(saveButton.text().trim()).toEqual('patients.createPatient')\n-\n- act(() => {\n- onClick()\n- })\n- wrapper.update()\n-\n- expect(onClick()).toEqual(true)\n+ const { container } = setup()\n+ userEvent.type(screen.getByLabelText(/patient\\.givenName/i), patient.givenName as string)\n+ userEvent.type(screen.getByLabelText(/patient\\.familyName/i), patient.familyName as string)\n+ userEvent.type(\n+ screen.getAllByPlaceholderText('-- Choose --')[0],\n+ `${patient.sex}{arrowdown}{enter}`,\n+ )\n+ userEvent.type(\n+ container.querySelector('.react-datepicker__input-container')!.children[0],\n+ '01/01/2020',\n+ )\n+ userEvent.click(screen.getByRole('button', { name: /patients\\.createPatient/i }))\n+ expect(await screen.findByRole('alert')).toBeInTheDocument()\n+ screen.debug(screen.getByRole('alert'))\n+ expect(screen.getByText(/patients.duplicatePatientWarning/i)).toBeInTheDocument()\n})\nit('should navigate to /patients/:id and display a message after a new patient is successfully created', async () => {\njest.spyOn(components, 'Toast').mockImplementation(jest.fn())\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n- })\n-\n- const generalInformationForm = wrapper.find(GeneralInformation)\n-\n- act(() => {\n- generalInformationForm.prop('onChange')(patient)\n- })\n-\n- wrapper.update()\n-\n- const saveButton = wrapper.find('.btn-save').at(0)\n- const onClick = saveButton.prop('onClick') as any\n- expect(saveButton.text().trim()).toEqual('patients.createPatient')\n-\n- await act(async () => {\n- await onClick()\n- })\n-\n+ const { container } = setup()\n+ userEvent.type(screen.getByLabelText(/patient\\.givenName/i), patient.givenName as string)\n+ userEvent.click(screen.getByRole('button', { name: /patients\\.createPatient/i }))\n+ await waitFor(() => {\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}`)\n- expect(components.Toast).toHaveBeenCalledWith(\n- 'success',\n- 'states.success',\n- `patients.successfullyCreated ${patient.fullName}`,\n- )\n})\n-\n- it('should navigate to /patients when cancel is clicked', async () => {\n- let wrapper: any\n- await act(async () => {\n- wrapper = await setup()\n+ await waitFor(() => {\n+ expect(container.querySelector('.Toastify')).toBeInTheDocument()\n})\n-\n- const cancelButton = wrapper.find('.btn-cancel').at(0)\n- const onClick = cancelButton.prop('onClick') as any\n- expect(cancelButton.text().trim()).toEqual('actions.cancel')\n-\n- act(() => {\n- onClick()\n})\n+ it('should navigate to /patients when cancel is clicked', async () => {\n+ setup()\n+ userEvent.click(screen.getByRole('button', { name: /actions.cancel/i }))\n+ await waitFor(() => {\nexpect(history.location.pathname).toEqual('/patients')\n})\n})\n+})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/page-header/breadcrumbs/useAddBreadcrumbs.test.tsx", "new_path": "src/__tests__/page-header/breadcrumbs/useAddBreadcrumbs.test.tsx", "diff": "@@ -6,9 +6,8 @@ import thunk from 'redux-thunk'\nimport * as breadcrumbsSlice from '../../../page-header/breadcrumbs/breadcrumbs-slice'\nimport useAddBreadcrumbs from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\n-import { RootState } from '../../../shared/store'\n-const mockStore = createMockStore<RootState, any>([thunk])\n+const mockStore = createMockStore<any, any>([thunk])\ndescribe('useAddBreadcrumbs', () => {\nbeforeEach(() => jest.clearAllMocks())\n@@ -20,7 +19,9 @@ describe('useAddBreadcrumbs', () => {\nlocation: '/patients',\n},\n]\n- const wrapper = ({ children }: any) => <Provider store={mockStore({})}>{children}</Provider>\n+ const wrapper: React.FC = ({ children }) => (\n+ <Provider store={mockStore({})}>{children}</Provider>\n+ )\nreturn { breadcrumbs, wrapper }\n}\n@@ -38,7 +39,7 @@ describe('useAddBreadcrumbs', () => {\njest.spyOn(breadcrumbsSlice, 'addBreadcrumbs')\nconst { breadcrumbs, wrapper } = setup()\n- renderHook(() => useAddBreadcrumbs(breadcrumbs, true), { wrapper } as any)\n+ renderHook(() => useAddBreadcrumbs(breadcrumbs, true), { wrapper })\nexpect(breadcrumbsSlice.addBreadcrumbs).toHaveBeenCalledTimes(1)\nexpect(breadcrumbsSlice.addBreadcrumbs).toHaveBeenCalledWith([\n...breadcrumbs,\n@@ -50,7 +51,7 @@ describe('useAddBreadcrumbs', () => {\njest.spyOn(breadcrumbsSlice, 'removeBreadcrumbs')\nconst { breadcrumbs, wrapper } = setup()\n- const { unmount } = renderHook(() => useAddBreadcrumbs(breadcrumbs), { wrapper } as any)\n+ const { unmount } = renderHook(() => useAddBreadcrumbs(breadcrumbs), { wrapper })\nunmount()\nexpect(breadcrumbsSlice.removeBreadcrumbs).toHaveBeenCalledTimes(1)\nexpect(breadcrumbsSlice.removeBreadcrumbs).toHaveBeenCalledWith(breadcrumbs)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/page-header/button-toolbar/ButtonBarProvider.test.tsx", "new_path": "src/__tests__/page-header/button-toolbar/ButtonBarProvider.test.tsx", "diff": "import { Button } from '@hospitalrun/components'\n-import { renderHook } from '@testing-library/react-hooks'\n-import React, { useEffect } from 'react'\n+import { renderHook, act } from '@testing-library/react-hooks'\n+import React from 'react'\nimport {\nButtonBarProvider,\n@@ -11,20 +11,19 @@ import {\ndescribe('Button Bar Provider', () => {\nit('should update and fetch data from the button bar provider', () => {\nconst expectedButtons = [<Button>test 1</Button>]\n- const wrapper = ({ children }: any) => <ButtonBarProvider>{children}</ButtonBarProvider>\n+ const wrapper: React.FC = ({ children }) => <ButtonBarProvider>{children}</ButtonBarProvider>\nconst { result } = renderHook(\n() => {\nconst update = useButtonToolbarSetter()\n- useEffect(() => {\n- update(expectedButtons)\n- }, [update])\n-\n- return useButtons()\n+ const buttons = useButtons()\n+ return { buttons, update }\n},\n{ wrapper },\n)\n- expect(result.current).toEqual(expectedButtons)\n+ act(() => result.current.update(expectedButtons))\n+\n+ expect(result.current.buttons).toEqual(expectedButtons)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/page-header/title/TitleProvider.test.tsx", "new_path": "src/__tests__/page-header/title/TitleProvider.test.tsx", "diff": "-import { renderHook } from '@testing-library/react-hooks'\n+import { renderHook, act } from '@testing-library/react-hooks'\nimport React from 'react'\n-import { Provider } from 'react-redux'\n-import createMockStore from 'redux-mock-store'\n-import thunk from 'redux-thunk'\n-import { TitleProvider } from '../../../page-header/title/TitleContext'\n-import { RootState } from '../../../shared/store'\n-\n-const mockStore = createMockStore<RootState, any>([thunk])\n+import { TitleProvider, useTitle, useUpdateTitle } from '../../../page-header/title/TitleContext'\ndescribe('useTitle', () => {\n- const store = mockStore({\n- user: { user: { id: '123' }, permissions: [] },\n- appointments: { appointments: [] },\n- medications: { medications: [] },\n- labs: { labs: [] },\n- imagings: { imagings: [] },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- } as any)\n-\nit('should call the updateTitle with the correct data.', () => {\n- const wrapper = ({ children }: any) => (\n- <TitleProvider>\n- <Provider store={store}>{children}</Provider>\n- </TitleProvider>\n- )\n-\n- const useTitle = jest.fn()\nconst expectedTitle = 'title'\n+ const wrapper: React.FC = ({ children }) => <TitleProvider>{children}</TitleProvider>\n+\n+ const { result } = renderHook(\n+ () => {\n+ const update = useUpdateTitle()\n+ const title = useTitle()\n+ return { ...title, update }\n+ },\n+ { wrapper },\n+ )\n- renderHook(() => useTitle(expectedTitle), { wrapper } as any)\n+ act(() => result.current.update(expectedTitle))\n- expect(useTitle).toHaveBeenCalledTimes(1)\n- expect(useTitle).toHaveBeenCalledWith(expectedTitle)\n+ expect(result.current.title).toBe(expectedTitle)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/shared/hooks/useTranslator.test.ts", "new_path": "src/__tests__/shared/hooks/useTranslator.test.ts", "diff": "@@ -11,12 +11,11 @@ describe('useTranslator', () => {\n})\nit('should return useTranslation hook result if input value is NOT undefined', () => {\n- const { result: useTranslatorResult } = renderHook(() => useTranslator())\n- const { result: useTranslationResult } = renderHook(() => useTranslation())\n+ const mockTranslation = useTranslation() as any\n+ const expected = mockTranslation.t('patient.firstName')\n- const result = useTranslatorResult.current.t('patient.firstName')\n- const expected = useTranslationResult.current.t('patient.firstName')\n+ const { result } = renderHook(() => useTranslator())\n- expect(result).toBe(expected)\n+ expect(result.current.t('patient.firstName')).toBe(expected)\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/shared/hooks/useUpdateEffect.test.ts", "new_path": "src/__tests__/shared/hooks/useUpdateEffect.test.ts", "diff": "@@ -3,13 +3,17 @@ import { renderHook } from '@testing-library/react-hooks'\nimport useUpdateEffect from '../../../shared/hooks/useUpdateEffect'\ndescribe('useUpdateEffect', () => {\n- it('should call the function after udpate', () => {\n+ it('should call the function after update', () => {\nconst mockFn = jest.fn()\nlet someVal = 'someVal'\n+\nconst { rerender } = renderHook(() => useUpdateEffect(mockFn, [someVal]))\n+\nexpect(mockFn).not.toHaveBeenCalled()\n+\nsomeVal = 'newVal'\nrerender()\n+\nexpect(mockFn).toHaveBeenCalledTimes(1)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/network-status/NetworkStatusMessage.test.tsx", "new_path": "src/__tests__/shared/components/network-status/NetworkStatusMessage.test.tsx", "diff": "import { render } from '@testing-library/react'\n-import { renderHook } from '@testing-library/react-hooks'\nimport React from 'react'\nimport { useTranslation } from '../../../../__mocks__/react-i18next'\n@@ -7,6 +6,8 @@ import { NetworkStatusMessage } from '../../../../shared/components/network-stat\nimport { useNetworkStatus } from '../../../../shared/components/network-status/useNetworkStatus'\njest.mock('../../../../shared/components/network-status/useNetworkStatus')\n+\n+describe('NetworkStatusMessage', () => {\nconst useNetworkStatusMock = (useNetworkStatus as unknown) as jest.MockInstance<\nReturnType<typeof useNetworkStatus>,\nany\n@@ -17,11 +18,13 @@ const englishTranslationsMock = {\n'networkStatus.online': 'you are back online',\n}\n-const { result } = renderHook(() => useTranslation() as any)\n-result.current.t = (key: keyof typeof englishTranslationsMock) => englishTranslationsMock[key]\n-const { t } = result.current\n+ const t = (key: keyof typeof englishTranslationsMock) => englishTranslationsMock[key]\n+\n+ beforeEach(() => {\n+ const mockTranslation = useTranslation() as any\n+ mockTranslation.t = t\n+ })\n-describe('NetworkStatusMessage', () => {\nit('returns null if the app has always been online', () => {\nuseNetworkStatusMock.mockReturnValue({\nisOnline: true,\n" } ]