Datasets:

---

JetBrains-Research

/

commit-chronicle

like 8

Follow

JetBrains Research 63

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/new/NewPatient.test.tsx", "new_path": "src/__tests__/patients/new/NewPatient.test.tsx", "diff": "@@ -78,23 +78,25 @@ describe('New Patient', () => {\n)\n})\n- it('should reveal modal (return true) when save button is clicked if an existing patient has the same information', async () => {\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- })\n+ // TODO: https://github.com/HospitalRun/hospitalrun-frontend/pull/2516#issuecomment-753378004\n+ // it('should reveal modal (return true) when save button is clicked if an existing patient has the same information', async () => {\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') as HTMLInputElement)\n+ // .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" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/HospitalRun.test.tsx", "new_path": "src/__tests__/HospitalRun.test.tsx", "diff": "-import { render as rtlRender, screen, within } from '@testing-library/react'\n-import React, { FC, ReactElement } from 'react'\n+import { render, screen, within } from '@testing-library/react'\n+import React from 'react'\nimport { Provider } from 'react-redux'\nimport { MemoryRouter } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -19,7 +19,7 @@ const { TitleProvider } = titleUtil\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('HospitalRun', () => {\n- const render = (route: string, permissions: Permissions[] = []) => {\n+ const setup = (route: string, permissions: Permissions[] = []) => {\njest.spyOn(titleUtil, 'useUpdateTitle').mockImplementation(() => jest.fn())\nconst store = mockStore({\nuser: { user: { id: '123' }, permissions },\n@@ -31,24 +31,24 @@ describe('HospitalRun', () => {\ncomponents: { sidebarCollapsed: false },\n} as any)\n- const Wrapper = ({ children }: { children: ReactElement }) => (\n+ const results = render(\n<Provider store={store}>\n<MemoryRouter initialEntries={[route]}>\n- <TitleProvider>{children}</TitleProvider>\n+ <TitleProvider>\n+ <HospitalRun />\n+ </TitleProvider>\n</MemoryRouter>\n- </Provider>\n+ </Provider>,\n)\n- const results = rtlRender(<HospitalRun />, { wrapper: Wrapper as FC })\n-\n- return { results, store: store as any }\n+ return { ...results, store: store as any }\n}\ndescribe('routing', () => {\ndescribe('/appointments', () => {\nit('should render the appointments screen when /appointments is accessed', () => {\nconst permissions: Permissions[] = [Permissions.ReadAppointments]\n- const { store } = render('/appointments', permissions)\n+ const { store } = setup('/appointments', permissions)\nexpect(\nscreen.getByRole('button', { name: /scheduling.appointments.new/i }),\n@@ -63,7 +63,7 @@ describe('HospitalRun', () => {\n})\nit('should render the Dashboard when the user does not have read appointment privileges', () => {\n- render('/appointments')\n+ setup('/appointments')\nconst main = screen.getByRole('main')\nexpect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n})\n@@ -73,7 +73,7 @@ describe('HospitalRun', () => {\nit('should render the Labs component when /labs is accessed', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\nconst permissions: Permissions[] = [Permissions.ViewLabs]\n- render('/labs', permissions)\n+ setup('/labs', permissions)\nconst table = screen.getByRole('table')\nexpect(within(table).getByText(/labs.lab.code/i)).toBeInTheDocument()\n@@ -85,7 +85,7 @@ describe('HospitalRun', () => {\nit('should render the dashboard if the user does not have permissions to view labs', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\n- render('/labs')\n+ setup('/labs')\nconst main = screen.getByRole('main')\nexpect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n})\n@@ -95,7 +95,7 @@ describe('HospitalRun', () => {\nit('should render the Medications component when /medications is accessed', () => {\njest.spyOn(MedicationRepository, 'search').mockResolvedValue([])\nconst permissions: Permissions[] = [Permissions.ViewMedications]\n- render('/medications', permissions)\n+ setup('/medications', permissions)\nconst medicationInput = screen.getByRole(/combobox/i) as HTMLInputElement\nexpect(medicationInput.value).toBe('medications.filter.all')\n@@ -104,7 +104,7 @@ describe('HospitalRun', () => {\nit('should render the dashboard if the user does not have permissions to view medications', () => {\njest.spyOn(MedicationRepository, 'findAll').mockResolvedValue([])\n- render('/medications')\n+ setup('/medications')\nconst main = screen.getByRole('main')\nexpect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n@@ -117,7 +117,7 @@ describe('HospitalRun', () => {\nit('should render the Incidents component when /incidents is accessed', () => {\njest.spyOn(IncidentRepository, 'search').mockResolvedValue([])\nconst permissions: Permissions[] = [Permissions.ViewIncidents]\n- render('/incidents', permissions)\n+ setup('/incidents', permissions)\nconst incidentInput = screen.getByRole(/combobox/i) as HTMLInputElement\nexpect(incidentInput.value).toBe('incidents.status.reported')\n@@ -126,7 +126,7 @@ describe('HospitalRun', () => {\nit('should render the dashboard if the user does not have permissions to view incidents', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\n- render('/incidents')\n+ setup('/incidents')\nconst main = screen.getByRole('main')\nexpect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n@@ -141,7 +141,7 @@ describe('HospitalRun', () => {\nit('should render the Imagings component when /imaging is accessed', () => {\njest.spyOn(ImagingRepository, 'search').mockResolvedValue([])\nconst permissions: Permissions[] = [Permissions.ViewImagings]\n- render('/imaging', permissions)\n+ setup('/imaging', permissions)\nexpect(screen.getByRole('main')).toBeInTheDocument()\nexpect(screen.queryByRole('heading', { name: /example/i })).not.toBeInTheDocument()\n@@ -149,7 +149,7 @@ describe('HospitalRun', () => {\nit('should render the dashboard if the user does not have permissions to view imagings', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\n- render('/imaging')\n+ setup('/imaging')\nconst main = screen.getByRole('main')\nexpect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n@@ -158,7 +158,7 @@ describe('HospitalRun', () => {\ndescribe('/settings', () => {\nit('should render the Settings component when /settings is accessed', () => {\n- render('/settings')\n+ setup('/settings')\nexpect(screen.getByText(/settings.language.label/i)).toBeInTheDocument()\n})\n@@ -168,7 +168,7 @@ describe('HospitalRun', () => {\ndescribe('layout', () => {\nit('should render a Toaster', () => {\nconst permissions: Permissions[] = [Permissions.WritePatients]\n- render('/', permissions)\n+ setup('/', permissions)\nconst main = screen.getByRole('main')\nexpect(main.lastChild).toHaveClass('Toastify')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/Sidebar.test.tsx", "new_path": "src/__tests__/shared/components/Sidebar.test.tsx", "diff": "-import { render as rtlRender, screen } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n-import React, { FC, ReactElement } from 'react'\n+import React from 'react'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -46,54 +46,44 @@ describe('Sidebar', () => {\ncomponents: { sidebarCollapsed: false },\nuser: { permissions: allPermissions },\n} as any)\n- const render = (location: string) => {\n- history = createMemoryHistory()\n- history.push(location)\n- const Wrapper = ({ children }: { children: ReactElement }) => (\n- <Router history={history}>\n- <Provider store={store}>{children}</Provider>\n- </Router>\n- )\n- return rtlRender(<Sidebar />, { wrapper: Wrapper as FC })\n- }\n- const renderNoPermissions = (location: string) => {\n+ const setup = (location: string, permissions = true) => {\nhistory = createMemoryHistory()\nhistory.push(location)\n- const Wrapper = ({ children }: { children: ReactElement }) => (\n+ return render(\n<Router history={history}>\n<Provider\n- store={mockStore({\n+ store={\n+ permissions\n+ ? store\n+ : mockStore({\ncomponents: { sidebarCollapsed: false },\nuser: { permissions: [] },\n- } as any)}\n+ } as any)\n+ }\n>\n- {children}\n+ <Sidebar />\n</Provider>\n- </Router>\n+ </Router>,\n)\n- return rtlRender(<Sidebar />, { wrapper: Wrapper as FC })\n}\n- /* const getIndex = (wrapper: ReactWrapper, label: string) =>\n- wrapper.reduce((result, item, index) => (item.text().trim() === label ? index : result), -1) */\n-\ndescribe('dashboard links', () => {\nit('should render the dashboard link', () => {\n- render('/')\n+ setup('/')\nexpect(screen.getByText(/dashboard.label/i)).toBeInTheDocument()\n})\nit('should be active when the current path is /', () => {\n- const { container } = render('/')\n+ const { container } = setup('/')\nconst activeElement = container.querySelector('.active')\nexpect(activeElement).toBeInTheDocument()\n})\nit('should navigate to / when the dashboard link is clicked', () => {\n- render('/patients')\n+ setup('/patients')\nuserEvent.click(screen.getByText(/dashboard.label/i))\n@@ -103,43 +93,43 @@ describe('Sidebar', () => {\ndescribe('patients links', () => {\nit('should render the patients main link', () => {\n- render('/')\n+ setup('/')\nexpect(screen.getByText(/patients.label/i)).toBeInTheDocument()\n})\nit('should render the new_patient link', () => {\n- render('/patients')\n+ setup('/patients')\nexpect(screen.getByText(/patients.newPatient/i)).toBeInTheDocument()\n})\nit('should not render the new_patient link when the user does not have write patient privileges', () => {\n- renderNoPermissions('/patients')\n+ setup('/patients', false)\nexpect(screen.queryByText(/patients.newPatient/i)).not.toBeInTheDocument()\n})\nit('should render the patients_list link', () => {\n- render('/patients')\n+ setup('/patients')\nexpect(screen.getByText(/patients.patientsList/i)).toBeInTheDocument()\n})\nit('should not render the patients_list link when the user does not have read patient privileges', () => {\n- renderNoPermissions('/patients')\n+ setup('/patients', false)\nexpect(screen.queryByText(/patients.patientsList/i)).not.toBeInTheDocument()\n})\nit('main patients link should be active when the current path is /patients', () => {\n- const { container } = render('/patients')\n+ const { container } = setup('/patients')\nexpect(container.querySelector('.active')).toHaveTextContent(/patients.label/i)\n})\nit('should navigate to /patients when the patients main link is clicked', () => {\n- render('/')\n+ setup('/')\nuserEvent.click(screen.getByText(/patients.label/i))\n@@ -147,26 +137,26 @@ describe('Sidebar', () => {\n})\nit('new patient should be active when the current path is /patients/new', () => {\n- const { container } = render('/patients/new')\n+ const { container } = setup('/patients/new')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/patients.newPatient/i)\n})\nit('should navigate to /patients/new when the patients new link is clicked', () => {\n- render('/patients')\n+ setup('/patients')\nuserEvent.click(screen.getByText(/patients.newPatient/i))\nexpect(history.location.pathname).toEqual('/patients/new')\n})\nit('patients list link should be active when the current path is /patients', () => {\n- const { container } = render('/patients')\n+ const { container } = setup('/patients')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/patients.patientsList/i)\n})\nit('should navigate to /patients when the patients list link is clicked', () => {\n- render('/patients')\n+ setup('/patients')\nuserEvent.click(screen.getByText(/patients.patientsList/i))\nexpect(history.location.pathname).toEqual('/patients')\n@@ -175,43 +165,43 @@ describe('Sidebar', () => {\ndescribe('appointments link', () => {\nit('should render the scheduling link', () => {\n- render('/appointments')\n+ setup('/appointments')\nexpect(screen.getByText(/scheduling.label/i)).toBeInTheDocument()\n})\nit('should render the new appointment link', () => {\n- render('/appointments/new')\n+ setup('/appointments/new')\nexpect(screen.getByText(/scheduling.appointments.new/i)).toBeInTheDocument()\n})\nit('should not render the new appointment link when the user does not have write appointments privileges', () => {\n- renderNoPermissions('/appointments')\n+ setup('/appointments', false)\nexpect(screen.queryByText(/scheduling.appointments.new/i)).not.toBeInTheDocument()\n})\nit('should render the appointments schedule link', () => {\n- render('/appointments')\n+ setup('/appointments')\nexpect(screen.getByText(/scheduling.appointments.schedule/i)).toBeInTheDocument()\n})\nit('should not render the appointments schedule link when the user does not have read appointments privileges', () => {\n- renderNoPermissions('/appointments')\n+ setup('/appointments', false)\nexpect(screen.queryByText(/scheduling.appointments.schedule/i)).not.toBeInTheDocument()\n})\nit('main scheduling link should be active when the current path is /appointments', () => {\n- const { container } = render('/appointments')\n+ const { container } = setup('/appointments')\nexpect(container.querySelector('.active')).toHaveTextContent(/scheduling.label/i)\n})\nit('should navigate to /appointments when the main scheduling link is clicked', () => {\n- render('/')\n+ setup('/')\nuserEvent.click(screen.getByText(/scheduling.label/i))\n@@ -219,20 +209,20 @@ describe('Sidebar', () => {\n})\nit('new appointment link should be active when the current path is /appointments/new', () => {\n- const { container } = render('/appointments/new')\n+ const { container } = setup('/appointments/new')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/appointments.new/i)\n})\nit('should navigate to /appointments/new when the new appointment link is clicked', () => {\n- render('/appointments')\n+ setup('/appointments')\nuserEvent.click(screen.getByText(/scheduling.appointments.new/i))\nexpect(history.location.pathname).toEqual('/appointments/new')\n})\nit('appointments schedule link should be active when the current path is /appointments', () => {\n- const { container } = render('/appointments')\n+ const { container } = setup('/appointments')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(\n/scheduling.appointments.schedule/i,\n@@ -240,7 +230,7 @@ describe('Sidebar', () => {\n})\nit('should navigate to /appointments when the appointments schedule link is clicked', () => {\n- render('/appointments')\n+ setup('/appointments')\nuserEvent.click(screen.getByText(/scheduling.appointments.schedule/i))\n@@ -250,43 +240,43 @@ describe('Sidebar', () => {\ndescribe('labs links', () => {\nit('should render the main labs link', () => {\n- render('/labs')\n+ setup('/labs')\nexpect(screen.getByText(/labs.label/i)).toBeInTheDocument()\n})\nit('should render the new labs request link', () => {\n- render('/labs')\n+ setup('/labs')\nexpect(screen.getByText(/labs.requests.new/i)).toBeInTheDocument()\n})\nit('should not render the new labs request link when user does not have request labs privileges', () => {\n- renderNoPermissions('/labs')\n+ setup('/labs', false)\nexpect(screen.queryByText(/labs.requests.new/i)).not.toBeInTheDocument()\n})\nit('should render the labs list link', () => {\n- render('/labs')\n+ setup('/labs')\nexpect(screen.getByText(/labs.requests.label/i)).toBeInTheDocument()\n})\nit('should not render the labs list link when user does not have view labs privileges', () => {\n- renderNoPermissions('/labs')\n+ setup('/labs', false)\nexpect(screen.queryByText(/labs.requests.label/i)).not.toBeInTheDocument()\n})\nit('main labs link should be active when the current path is /labs', () => {\n- const { container } = render('/labs')\n+ const { container } = setup('/labs')\nexpect(container.querySelector('.active')).toHaveTextContent(/labs.label/i)\n})\nit('should navigate to /labs when the main lab link is clicked', () => {\n- render('/')\n+ setup('/')\nuserEvent.click(screen.getByText(/labs.label/i))\n@@ -294,13 +284,13 @@ describe('Sidebar', () => {\n})\nit('new lab request link should be active when the current path is /labs/new', () => {\n- const { container } = render('/labs/new')\n+ const { container } = setup('/labs/new')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/labs.requests.new/i)\n})\nit('should navigate to /labs/new when the new labs link is clicked', () => {\n- render('/labs')\n+ setup('/labs')\nuserEvent.click(screen.getByText(/labs.requests.new/))\n@@ -308,13 +298,13 @@ describe('Sidebar', () => {\n})\nit('labs list link should be active when the current path is /labs', () => {\n- const { container } = render('/labs')\n+ const { container } = setup('/labs')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/labs.requests.label/i)\n})\nit('should navigate to /labs when the labs list link is clicked', () => {\n- render('/labs')\n+ setup('/labs')\nuserEvent.click(screen.getByText(/labs.label/i))\n@@ -324,61 +314,61 @@ describe('Sidebar', () => {\ndescribe('incident links', () => {\nit('should render the main incidents link', () => {\n- render('/incidents')\n+ setup('/incidents')\nexpect(screen.getByText(/incidents.label/i)).toBeInTheDocument()\n})\nit('should render the new incident report link', () => {\n- render('/incidents')\n+ setup('/incidents')\nexpect(screen.getByText(/incidents.reports.new/i)).toBeInTheDocument()\n})\nit('should be the last one in the sidebar', () => {\n- render('/incidents')\n+ setup('/incidents')\nexpect(screen.getAllByText(/label/i)[5]).toHaveTextContent(/imagings.label/i)\nexpect(screen.getAllByText(/label/i)[6]).toHaveTextContent(/incidents.label/i)\n})\nit('should not render the new incident report link when user does not have the report incidents privileges', () => {\n- renderNoPermissions('/incidents')\n+ setup('/incidents', false)\nexpect(screen.queryByText(/incidents.reports.new/i)).not.toBeInTheDocument()\n})\nit('should render the incidents list link', () => {\n- render('/incidents')\n+ setup('/incidents')\nexpect(screen.getByText(/incidents.reports.label/i)).toBeInTheDocument()\n})\nit('should not render the incidents list link when user does not have the view incidents privileges', () => {\n- renderNoPermissions('/incidents')\n+ setup('/incidents', false)\nexpect(screen.queryByText(/incidents.reports.label/i)).not.toBeInTheDocument()\n})\nit('should render the incidents visualize link', () => {\n- render('/incidents')\n+ setup('/incidents')\nexpect(screen.getByText(/incidents.visualize.label/i)).toBeInTheDocument()\n})\nit('should not render the incidents visualize link when user does not have the view incident widgets privileges', () => {\n- renderNoPermissions('/incidents')\n+ setup('/incidents', false)\nexpect(screen.queryByText(/incidents.visualize.label/i)).not.toBeInTheDocument()\n})\nit('main incidents link should be active when the current path is /incidents', () => {\n- const { container } = render('/incidents')\n+ const { container } = setup('/incidents')\nexpect(container.querySelector('.active')).toHaveTextContent(/incidents.labe/i)\n})\nit('should navigate to /incidents when the main incident link is clicked', () => {\n- render('/')\n+ setup('/')\nuserEvent.click(screen.getByText(/incidents.label/i))\n@@ -386,13 +376,13 @@ describe('Sidebar', () => {\n})\nit('new incident report link should be active when the current path is /incidents/new', () => {\n- const { container } = render('/incidents/new')\n+ const { container } = setup('/incidents/new')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/incidents.reports.new/i)\n})\nit('should navigate to /incidents/new when the new incidents link is clicked', () => {\n- render('/incidents')\n+ setup('/incidents')\nuserEvent.click(screen.getByText(/incidents.reports.new/i))\n@@ -400,7 +390,7 @@ describe('Sidebar', () => {\n})\nit('should navigate to /incidents/visualize when the incidents visualize link is clicked', () => {\n- render('/incidents')\n+ setup('/incidents')\nuserEvent.click(screen.getByText(/incidents.visualize.label/i))\n@@ -408,13 +398,13 @@ describe('Sidebar', () => {\n})\nit('incidents list link should be active when the current path is /incidents', () => {\n- const { container } = render('/incidents')\n+ const { container } = setup('/incidents')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/incidents.reports.label/i)\n})\nit('should navigate to /incidents/new when the incidents list link is clicked', () => {\n- render('/incidents/new')\n+ setup('/incidents/new')\nuserEvent.click(screen.getByText(/incidents.reports.label/i))\n@@ -424,43 +414,43 @@ describe('Sidebar', () => {\ndescribe('imagings links', () => {\nit('should render the main imagings link', () => {\n- render('/imaging')\n+ setup('/imaging')\nexpect(screen.getByText(/imagings.label/i)).toBeInTheDocument()\n})\nit('should render the new imaging request link', () => {\n- render('/imagings')\n+ setup('/imagings')\nexpect(screen.getByText(/imagings.requests.new/i)).toBeInTheDocument()\n})\nit('should not render the new imaging request link when user does not have the request imaging privileges', () => {\n- renderNoPermissions('/imagings')\n+ setup('/imagings', false)\nexpect(screen.queryByText(/imagings.requests.new/i)).not.toBeInTheDocument()\n})\nit('should render the imagings list link', () => {\n- render('/imagings')\n+ setup('/imagings')\nexpect(screen.getByText(/imagings.requests.label/i)).toBeInTheDocument()\n})\nit('should not render the imagings list link when user does not have the view imagings privileges', () => {\n- renderNoPermissions('/imagings')\n+ setup('/imagings', false)\nexpect(screen.queryByText(/imagings.requests.label/i)).not.toBeInTheDocument()\n})\nit('main imagings link should be active when the current path is /imagings', () => {\n- const { container } = render('/imagings')\n+ const { container } = setup('/imagings')\nexpect(container.querySelector('.active')).toHaveTextContent(/imagings.label/i)\n})\nit('should navigate to /imaging when the main imagings link is clicked', () => {\n- render('/')\n+ setup('/')\nuserEvent.click(screen.getByText(/imagings.label/i))\n@@ -468,13 +458,13 @@ describe('Sidebar', () => {\n})\nit('new imaging request link should be active when the current path is /imagings/new', () => {\n- const { container } = render('/imagings/new')\n+ const { container } = setup('/imagings/new')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/imagings.requests.new/i)\n})\nit('should navigate to /imaging/new when the new imaging link is clicked', () => {\n- render('/imagings')\n+ setup('/imagings')\nuserEvent.click(screen.getByText(/imagings.requests.new/i))\n@@ -482,13 +472,13 @@ describe('Sidebar', () => {\n})\nit('imagings list link should be active when the current path is /imagings', () => {\n- const { container } = render('/imagings')\n+ const { container } = setup('/imagings')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(/imagings.requests.label/)\n})\nit('should navigate to /imaging when the imagings list link is clicked', () => {\n- render('/imagings/new')\n+ setup('/imagings/new')\nuserEvent.click(screen.getByText(/imagings.label/i))\n@@ -498,43 +488,43 @@ describe('Sidebar', () => {\ndescribe('medications links', () => {\nit('should render the main medications link', () => {\n- render('/medications')\n+ setup('/medications')\nexpect(screen.getByText(/medications.label/i)).toBeInTheDocument()\n})\nit('should render the new medications request link', () => {\n- render('/medications')\n+ setup('/medications')\nexpect(screen.getByText(/medications.requests.new/i)).toBeInTheDocument()\n})\nit('should not render the new medications request link when user does not have request medications privileges', () => {\n- renderNoPermissions('/medications')\n+ setup('/medications', false)\nexpect(screen.queryByText(/medications.requests.new/i)).not.toBeInTheDocument()\n})\nit('should render the medications list link', () => {\n- render('/medications')\n+ setup('/medications')\nexpect(screen.getByText(/medications.requests.label/i)).toBeInTheDocument()\n})\nit('should not render the medications list link when user does not have view medications privileges', () => {\n- renderNoPermissions('/medications')\n+ setup('/medications', false)\nexpect(screen.queryByText(/medications.requests.label/i)).not.toBeInTheDocument()\n})\nit('main medications link should be active when the current path is /medications', () => {\n- const { container } = render('/medications')\n+ const { container } = setup('/medications')\nexpect(container.querySelector('.active')).toHaveTextContent(/medications.label/i)\n})\nit('should navigate to /medications when the main lab link is clicked', () => {\n- render('/')\n+ setup('/')\nuserEvent.click(screen.getByText(/medications.label/i))\n@@ -542,7 +532,7 @@ describe('Sidebar', () => {\n})\nit('new lab request link should be active when the current path is /medications/new', () => {\n- const { container } = render('/medications/new')\n+ const { container } = setup('/medications/new')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(\n/medications.requests.new/i,\n@@ -550,14 +540,14 @@ describe('Sidebar', () => {\n})\nit('should navigate to /medications/new when the new medications link is clicked', () => {\n- render('/medications')\n+ setup('/medications')\nuserEvent.click(screen.getByText(/medications.requests.new/i))\nexpect(history.location.pathname).toEqual('/medications/new')\n})\nit('medications list link should be active when the current path is /medications', () => {\n- const { container } = render('/medications')\n+ const { container } = setup('/medications')\nexpect(container.querySelectorAll('.active')[1]).toHaveTextContent(\n/medications.requests.label/i,\n@@ -565,7 +555,7 @@ describe('Sidebar', () => {\n})\nit('should navigate to /medications when the medications list link is clicked', () => {\n- render('/medications/new')\n+ setup('/medications/new')\nuserEvent.click(screen.getByText(/medications.requests.label/i))\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/CONTRIBUTING.md", "new_path": ".github/CONTRIBUTING.md", "diff": "@@ -58,7 +58,7 @@ _Note: We no longer support the use of yarn._\n## 4. Before pushing your changes, check locally that your branch passes CI checks\n-### We use Jest + Enzyme for Behavior-Driven Development Tests\n+### We use Jest + React Testing Library for Behavior-Driven Development Tests\n`npm run test:ci` will run the entire test suite\n@@ -94,6 +94,6 @@ _Note: We no longer support the use of yarn._\n- [Getting started with PouchDB and CouchDB (tutorial) by Nolan Lawson](https://youtu.be/-Z7UF2TuSp0)\n-### Enzyme\n+### React Testing Library\n-- [Enzyme Cheatsheet by @rstacruz](https://devhints.io/enzyme)\n+- [React Testing Library Cheatsheet](https://testing-library.com/docs/react-testing-library/cheatsheet/)\n" }, { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"@testing-library/react\": \"~11.2.2\",\n\"@testing-library/react-hooks\": \"~3.7.0\",\n\"@testing-library/user-event\": \"~12.6.0\",\n- \"@types/enzyme\": \"^3.10.5\",\n\"@types/jest\": \"~26.0.0\",\n\"@types/lodash\": \"^4.14.150\",\n\"@types/node\": \"~14.11.1\",\n\"cross-env\": \"~7.0.0\",\n\"cz-conventional-changelog\": \"~3.3.0\",\n\"dateformat\": \"~4.4.0\",\n- \"enzyme\": \"~3.11.0\",\n- \"enzyme-adapter-react-16\": \"~1.15.2\",\n\"eslint\": \"~6.8.0\",\n\"eslint-config-airbnb\": \"~18.2.0\",\n\"eslint-config-prettier\": \"~6.15.0\",\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "/* eslint-disable import/no-extraneous-dependencies */\nimport '@testing-library/jest-dom'\nimport { configure, act } from '@testing-library/react'\n-import Enzyme from 'enzyme'\n-import Adapter from 'enzyme-adapter-react-16'\nimport 'jest-canvas-mock'\nimport { queryCache } from 'react-query'\n@@ -10,8 +8,6 @@ import './__mocks__/i18next'\nimport './__mocks__/matchMediaMock'\nimport './__mocks__/react-i18next'\n-Enzyme.configure({ adapter: new Adapter() })\n-\n// speeds up *ByRole queries a bit, but will need to specify { hidden: false } in some cases\nconfigure({ defaultHidden: true })\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"memdown\": \"~5.1.0\",\n\"prettier\": \"~2.2.0\",\n\"react-select-event\": \"~5.1.0\",\n+ \"react-test-renderer\": \"~16.13.1\",\n\"redux-mock-store\": \"~1.5.4\",\n\"rimraf\": \"~3.0.2\",\n\"source-map-explorer\": \"^2.2.2\",\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "diff": "@@ -93,23 +93,4 @@ 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__/imagings/search/ImagingRequestTable.test.tsx", "new_path": "src/__tests__/imagings/search/ImagingRequestTable.test.tsx", "diff": "import { render as rtlRender, screen } from '@testing-library/react'\n+import format from 'date-fns/format'\nimport React from 'react'\nimport ImagingSearchRequest from '../../../imagings/model/ImagingSearchRequest'\nimport ImagingRequestTable from '../../../imagings/search/ImagingRequestTable'\nimport ImagingRepository from '../../../shared/db/ImagingRepository'\n-import SortRequest from '../../../shared/db/SortRequest'\nimport Imaging from '../../../shared/model/Imaging'\n-const defaultSortRequest: SortRequest = {\n- sorts: [\n- {\n- field: 'requestedOn',\n- direction: 'desc',\n- },\n- ],\n-}\n-\ndescribe('Imaging Request Table', () => {\nconst expectedImaging = {\ncode: 'I-1234',\n@@ -27,31 +18,20 @@ describe('Imaging Request Table', () => {\nrequestedOn: new Date().toISOString(),\nrequestedBy: 'some user',\n} as Imaging\n- const expectedImagings = [expectedImaging]\nconst render = (searchRequest: ImagingSearchRequest) => {\njest.resetAllMocks()\n- jest.spyOn(ImagingRepository, 'search').mockResolvedValue(expectedImagings)\n-\n- const results = rtlRender(<ImagingRequestTable searchRequest={searchRequest} />)\n+ jest.spyOn(ImagingRepository, 'search').mockResolvedValue([expectedImaging])\n- return results\n+ return rtlRender(<ImagingRequestTable searchRequest={searchRequest} />)\n}\n- it('should search for imaging requests ', () => {\n- const expectedSearch: ImagingSearchRequest = { status: 'all', text: 'text' }\n- render(expectedSearch)\n-\n- expect(ImagingRepository.search).toHaveBeenCalledTimes(1)\n- expect(ImagingRepository.search).toHaveBeenCalledWith({ ...expectedSearch, defaultSortRequest })\n- })\n-\nit('should render a table of imaging requests', async () => {\nconst expectedSearch: ImagingSearchRequest = { status: 'all', text: 'text' }\nrender(expectedSearch)\n-\nconst headers = await screen.findAllByRole('columnheader')\nconst cells = screen.getAllByRole('cell')\n+\nexpect(headers[0]).toHaveTextContent(/imagings.imaging.code/i)\nexpect(headers[1]).toHaveTextContent(/imagings.imaging.type/i)\nexpect(headers[2]).toHaveTextContent(/imagings.imaging.requestedOn/i)\n@@ -59,10 +39,13 @@ describe('Imaging Request Table', () => {\nexpect(headers[4]).toHaveTextContent(/imagings.imaging.requestedBy/i)\nexpect(headers[5]).toHaveTextContent(/imagings.imaging.status/i)\n- expect(cells[0]).toHaveTextContent('I-1234')\n- expect(cells[1]).toHaveTextContent('imaging type')\n- expect(cells[3]).toHaveTextContent('full name')\n- expect(cells[4]).toHaveTextContent('some user')\n- expect(cells[5]).toHaveTextContent('requested')\n+ expect(cells[0]).toHaveTextContent(expectedImaging.code)\n+ expect(cells[1]).toHaveTextContent(expectedImaging.type)\n+ expect(cells[2]).toHaveTextContent(\n+ format(new Date(expectedImaging.requestedOn), 'yyyy-MM-dd hh:mm a'),\n+ )\n+ expect(cells[3]).toHaveTextContent(expectedImaging.fullName)\n+ expect(cells[4]).toHaveTextContent(expectedImaging.requestedBy)\n+ expect(cells[5]).toHaveTextContent(expectedImaging.status)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/settings/Settings.test.tsx", "new_path": "src/__tests__/settings/Settings.test.tsx", "diff": "-import { render } from '@testing-library/react'\n+import { render, screen } 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'\nimport { Router } from 'react-router-dom'\n+import { CombinedState } from 'redux'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n@@ -15,20 +17,39 @@ const mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Settings', () => {\nconst setup = () => {\n- const store = mockStore({ title: 'test' } as any)\n+ const store = mockStore({ title: 'test' } as CombinedState<any>)\nconst history = createMemoryHistory()\nhistory.push('/settings')\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ return render(\n<Provider store={store}>\n<Router history={history}>\n- <TitleProvider>{children}</TitleProvider>\n+ <TitleProvider>\n+ <Settings />\n+ </TitleProvider>\n</Router>\n- </Provider>\n+ </Provider>,\n)\n- return render(<Settings />, { wrapper: Wrapper })\n}\n- test('should ', () => {\n+ test('settings combo selection works', () => {\nsetup()\n+ const langArr = [\n+ /Arabic/i,\n+ /Chinese/i,\n+ /English, American/i,\n+ /French/i,\n+ /German/i,\n+ /Italian/i,\n+ /Japanese/i,\n+ /Portuguese/i,\n+ /Russian/i,\n+ /Spanish/i,\n+ ]\n+\n+ langArr.forEach((lang) => {\n+ const combobox = screen.getByRole('combobox')\n+ userEvent.click(combobox)\n+ expect(screen.getByRole('option', { name: lang })).toBeInTheDocument()\n+ userEvent.type(combobox, '{enter}')\n+ })\n})\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, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -59,17 +59,12 @@ const setup = (permissions: Permissions[]) => {\nit('should filter incidents by status=reported on first load ', () => {\nsetup([Permissions.ViewIncidents])\n-\n- expect(IncidentRepository.search).toHaveBeenCalled()\n- expect(IncidentRepository.search).toHaveBeenCalledWith({ status: IncidentFilter.reported })\n+ expect(screen.getByRole('combobox')).toHaveValue('incidents.status.reported')\n})\ndescribe('layout', () => {\nit('should render a table with the incidents', async () => {\n- const { container } = setup([Permissions.ViewIncidents])\n-\n- await waitFor(() => {\n- expect(container.querySelector('table')).toHaveTextContent(IncidentFilter.reported)\n- })\n+ setup([Permissions.ViewIncidents])\n+ expect(await screen.findByRole('table')).toHaveTextContent(IncidentFilter.reported)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/list/ViewIncidentsTable.test.tsx", "new_path": "src/__tests__/incidents/list/ViewIncidentsTable.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\n@@ -13,7 +13,19 @@ import Incident from '../../../shared/model/Incident'\nimport { extractUsername } from '../../../shared/util/extractUsername'\ndescribe('View Incidents Table', () => {\n- const setup = (expectedSearchRequest: IncidentSearchRequest, expectedIncidents: Incident[]) => {\n+ const expectedIncident = {\n+ id: 'incidentId1',\n+ code: 'someCode',\n+ date: new Date(2020, 7, 4, 0, 0, 0, 0).toISOString(),\n+ reportedOn: new Date(2020, 8, 4, 0, 0, 0, 0).toISOString(),\n+ reportedBy: 'com.test:user',\n+ status: 'reported',\n+ } as Incident\n+\n+ const setup = (\n+ expectedSearchRequest: IncidentSearchRequest,\n+ expectedIncidents = [expectedIncident],\n+ ) => {\njest.spyOn(IncidentRepository, 'search').mockResolvedValue(expectedIncidents)\nconst history = createMemoryHistory()\n@@ -31,62 +43,32 @@ describe('View Incidents Table', () => {\njest.resetAllMocks()\n})\n- it('should call the incidents search with the search request', async () => {\n- const expectedSearchRequest: IncidentSearchRequest = { status: IncidentFilter.all }\n-\n- setup(expectedSearchRequest, [])\n-\n- expect(IncidentRepository.search).toHaveBeenCalledTimes(1)\n- expect(IncidentRepository.search).toHaveBeenCalledWith(expectedSearchRequest)\n- })\n-\nit('should display a table of incidents', async () => {\n- const expectedIncidents: Incident[] = [\n- {\n- id: 'incidentId1',\n- code: 'someCode',\n- date: new Date(2020, 7, 4, 0, 0, 0, 0).toISOString(),\n- reportedOn: new Date(2020, 8, 4, 0, 0, 0, 0).toISOString(),\n- reportedBy: 'com.test:user',\n- status: 'reported',\n- } as Incident,\n- ]\n- const { container } = setup({ status: IncidentFilter.all }, expectedIncidents)\n-\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeTruthy()\n- })\n- expect(screen.getByText(expectedIncidents[0].code)).toBeInTheDocument()\n- expect(\n- screen.getByText(format(new Date(expectedIncidents[0].date), 'yyyy-MM-dd hh:mm a')),\n- ).toBeInTheDocument()\n- expect(\n- screen.getByText(format(new Date(expectedIncidents[0].reportedOn), 'yyyy-MM-dd hh:mm a')),\n- ).toBeInTheDocument()\n- expect(screen.getByText(extractUsername(expectedIncidents[0].reportedBy))).toBeInTheDocument()\n- expect(screen.getByText(expectedIncidents[0].status)).toBeInTheDocument()\n-\n- expect(screen.getByText(/incidents.reports.code/i)).toBeInTheDocument()\n- expect(screen.getByText(/incidents.reports.dateOfIncident/i)).toBeInTheDocument()\n- expect(screen.getByText(/incidents.reports.reportedBy/i)).toBeInTheDocument()\n- expect(screen.getByText(/incidents.reports.reportedOn/i)).toBeInTheDocument()\n- expect(screen.getByText(/incidents.reports.status/i)).toBeInTheDocument()\n- expect(screen.getByText(/actions.label/i)).toBeInTheDocument()\n+ setup({ status: IncidentFilter.all })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n+\n+ const headers = screen.getAllByRole('columnheader')\n+ const cells = screen.getAllByRole('cell')\n+ expect(headers[0]).toHaveTextContent(/incidents.reports.code/i)\n+ expect(headers[1]).toHaveTextContent(/incidents.reports.dateOfIncident/i)\n+ expect(headers[2]).toHaveTextContent(/incidents.reports.reportedBy/i)\n+ expect(headers[3]).toHaveTextContent(/incidents.reports.reportedOn/i)\n+ expect(headers[4]).toHaveTextContent(/incidents.reports.status/i)\n+ expect(headers[5]).toHaveTextContent(/actions.label/i)\n+ expect(cells[0]).toHaveTextContent(expectedIncident.code)\n+ expect(cells[1]).toHaveTextContent(\n+ format(new Date(expectedIncident.date), 'yyyy-MM-dd hh:mm a'),\n+ )\n+ expect(cells[2]).toHaveTextContent(extractUsername(expectedIncident.reportedBy))\n+ expect(cells[3]).toHaveTextContent(\n+ format(new Date(expectedIncident.reportedOn), 'yyyy-MM-dd hh:mm a'),\n+ )\n+ expect(cells[4]).toHaveTextContent(expectedIncident.status)\n+ expect(screen.getByRole('button', { name: /actions.view/i })).toBeInTheDocument()\n})\nit('should display a download button', async () => {\n- const expectedIncidents: Incident[] = [\n- {\n- id: 'incidentId1',\n- code: 'someCode',\n- date: new Date(2020, 7, 4, 0, 0, 0, 0).toISOString(),\n- reportedOn: new Date(2020, 8, 4, 0, 0, 0, 0).toISOString(),\n- reportedBy: 'com.test:user',\n- status: 'reported',\n- } as Incident,\n- ]\n- setup({ status: IncidentFilter.all }, expectedIncidents)\n-\n+ setup({ status: IncidentFilter.all })\nexpect(\nawait screen.findByRole('button', { name: /incidents.reports.download/i }),\n).toBeInTheDocument()\n@@ -128,21 +110,9 @@ describe('View Incidents Table', () => {\n})\nit('should navigate to the view incident screen when view button is clicked', async () => {\n- const expectedIncidents: Incident[] = [\n- {\n- id: 'incidentId1',\n- code: 'someCode',\n- date: new Date(2020, 7, 4, 12, 0, 0, 0).toISOString(),\n- reportedOn: new Date(2020, 8, 4, 12, 0, 0, 0).toISOString(),\n- reportedBy: 'com.test:user',\n- status: 'reported',\n- } as Incident,\n- ]\n- const { container, history } = await setup({ status: IncidentFilter.all }, expectedIncidents)\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ const { history } = setup({ status: IncidentFilter.all })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\nuserEvent.click(screen.getByRole('button', { name: /actions.view/i }))\n- expect(history.location.pathname).toEqual(`/incidents/${expectedIncidents[0].id}`)\n+ expect(history.location.pathname).toEqual(`/incidents/${expectedIncident.id}`)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/view/ViewIncident.tsx", "new_path": "src/incidents/view/ViewIncident.tsx", "diff": "-import React from 'react'\n+import React, { useEffect } from 'react'\nimport { useSelector } from 'react-redux'\nimport { useParams } from 'react-router-dom'\n@@ -13,7 +13,9 @@ const ViewIncident = () => {\nconst { permissions } = useSelector((root: RootState) => root.user)\nconst { t } = useTranslator()\nconst updateTitle = useUpdateTitle()\n+ useEffect(() => {\nupdateTitle(t('incidents.reports.view'))\n+ })\nuseAddBreadcrumbs([\n{\ni18nKey: 'incidents.reports.view',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/Incidents.test.tsx", "new_path": "src/__tests__/incidents/Incidents.test.tsx", "diff": "-import { render, waitFor } from '@testing-library/react'\n+import { render, screen, waitFor } from '@testing-library/react'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport { MemoryRouter } from 'react-router-dom'\n@@ -15,13 +15,14 @@ import { RootState } from '../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Incidents', () => {\n- function setup(permissions: Permissions[], path: string) {\nconst expectedIncident = {\nid: '1234',\ncode: '1234',\ndate: new Date().toISOString(),\nreportedOn: new Date().toISOString(),\n+ reportedBy: 'some user',\n} as Incident\n+ function setup(permissions: Permissions[], path: string) {\njest.spyOn(IncidentRepository, 'search').mockResolvedValue([])\njest.spyOn(IncidentRepository, 'find').mockResolvedValue(expectedIncident)\nconst store = mockStore({\n@@ -45,22 +46,19 @@ describe('Incidents', () => {\ndescribe('routing', () => {\ndescribe('/incidents/new', () => {\nit('The new incident screen when /incidents/new is accessed', () => {\n- const { container } = setup([Permissions.ReportIncident], '/incidents/new')\n-\n- expect(container).toHaveTextContent('incidents.reports')\n+ setup([Permissions.ReportIncident], '/incidents/new')\n+ expect(screen.getAllByText(/incidents.reports/i)[0]).toBeInTheDocument()\n})\nit('should not navigate to /incidents/new if the user does not have ReportIncident permissions', () => {\n- const { container } = setup([], '/incidents/new')\n-\n- expect(container).not.toHaveTextContent('incidents.reports')\n+ setup([], '/incidents/new')\n+ expect(screen.queryByText(/incidents.reports/i)).not.toBeInTheDocument()\n})\n})\ndescribe('/incidents/visualize', () => {\nit('The incident visualize screen when /incidents/visualize is accessed', async () => {\nconst { container } = setup([Permissions.ViewIncidentWidgets], '/incidents/visualize')\n-\nawait waitFor(() => {\nexpect(container.querySelector('.chartjs-render-monitor')).toBeInTheDocument()\n})\n@@ -68,20 +66,19 @@ describe('Incidents', () => {\nit('should not navigate to /incidents/visualize if the user does not have ViewIncidentWidgets permissions', () => {\nconst { container } = setup([], '/incidents/visualize')\n-\n- expect(container.querySelector('.chartjs-render-monitor')).not.toBeInTheDocument()\n+ expect(container).toMatchInlineSnapshot(`<div />`)\n})\n})\ndescribe('/incidents/:id', () => {\n- it('The view incident screen when /incidents/:id is accessed', () => {\n- const { container } = setup([Permissions.ViewIncident], '/incidents/1234')\n- expect(container.querySelectorAll('div').length).toBe(3)\n+ it('The view incident screen when /incidents/:id is accessed', async () => {\n+ setup([Permissions.ViewIncident], `/incidents/${expectedIncident.id}`)\n+ expect(await screen.findByText(expectedIncident.reportedBy)).toBeInTheDocument()\n})\n- it('should not navigate to /incidents/:id if the user does not have ViewIncident permissions', () => {\n- const { container } = setup([], '/incidents/1234')\n- expect(container.querySelectorAll('div').length).not.toBe(3)\n+ it('should not navigate to /incidents/:id if the user does not have ViewIncident permissions', async () => {\n+ const { container } = setup([], `/incidents/${expectedIncident.id}`)\n+ expect(container).toMatchInlineSnapshot(`<div />`)\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/medications/MedicationsList.test.tsx", "new_path": "src/__tests__/patients/medications/MedicationsList.test.tsx", "diff": "-import { render, screen } 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@@ -19,20 +19,20 @@ const expectedPatient = {\nconst expectedMedications = [\n{\n- id: '123456',\n- rev: '1',\n- patient: '1234',\n- requestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n- requestedBy: 'someone',\n+ id: '1234',\n+ medication: 'Ibuprofen',\n+ status: 'active',\n+ intent: 'order',\npriority: 'routine',\n+ requestedOn: new Date().toISOString(),\n},\n{\n- id: '456789',\n- rev: '1',\n- patient: '1234',\n- requestedOn: new Date(2020, 1, 1, 9, 0, 0, 0).toISOString(),\n- requestedBy: 'someone',\n- priority: 'routine',\n+ id: '2',\n+ medication: 'Hydrocortisone',\n+ status: 'active',\n+ intent: 'reflex order',\n+ priority: 'asap',\n+ requestedOn: new Date().toISOString(),\n},\n] as Medication[]\n@@ -55,35 +55,51 @@ const setup = async (patient = expectedPatient, medications = expectedMedication\n)\n}\n-describe('MedicationsList', () => {\n- describe('Table', () => {\n- it('should render a list of medications', async () => {\n+describe('Medications table', () => {\n+ it('should render patient medications table headers', async () => {\nsetup()\n+\nexpect(await screen.findByRole('table')).toBeInTheDocument()\n+ const headers = screen.getAllByRole('columnheader')\n+\n+ expect(headers[0]).toHaveTextContent(/medications\\.medication\\.medication/i)\n+ expect(headers[1]).toHaveTextContent(/medications\\.medication\\.priority/i)\n+ expect(headers[2]).toHaveTextContent(/medications\\.medication\\.intent/i)\n+ expect(headers[3]).toHaveTextContent(/medications\\.medication\\.requestedOn/i)\n+ expect(headers[4]).toHaveTextContent(/medications\\.medication\\.status/i)\n+ expect(headers[5]).toHaveTextContent(/actions\\.label/i)\n+ })\n+\n+ it('should render patient medication list', async () => {\n+ setup()\n+\n+ await screen.findByRole('table')\n+\n+ const cells = screen.getAllByRole('cell')\n+ expect(cells[0]).toHaveTextContent('Ibuprofen')\n+ expect(cells[1]).toHaveTextContent('routine')\n+ expect(cells[2]).toHaveTextContent('order')\n+ })\n+\n+ it('render an action button', async () => {\n+ setup()\n+\n+ await waitFor(() => {\n+ const row = screen.getAllByRole('row')\n+\nexpect(\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+ within(row[1]).getByRole('button', {\n+ name: /actions\\.view/i,\n+ }),\n).toBeInTheDocument()\n- expect(screen.getByRole('columnheader', { name: /actions.label/i })).toBeInTheDocument()\n- expect(screen.getAllByRole('button', { name: /actions.view/i })[0]).toBeInTheDocument()\n+ })\n})\nit('should navigate to medication view on medication click', async () => {\nsetup()\nexpect(await screen.findByRole('table')).toBeInTheDocument()\nuserEvent.click(screen.getAllByRole('button', { name: /actions.view/i })[0])\n- expect(history.location.pathname).toEqual('/medications/123456')\n+ expect(history.location.pathname).toEqual('/medications/1234')\n})\n})\n@@ -95,4 +111,3 @@ describe('MedicationsList', () => {\nexpect(screen.getByText(/patient.medications.noMedicationsMessage/i)).toBeInTheDocument()\n})\n})\n-})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "new_path": "src/__tests__/patients/appointments/AppointmentsList.test.tsx", "diff": "@@ -61,18 +61,17 @@ const setup = (patient = expectedPatient, appointments = expectedAppointments) =\ndescribe('AppointmentsList', () => {\ndescribe('Table', () => {\nit('should render a list of appointments', async () => {\n- const { container } = setup()\n-\n+ setup()\nawait waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n+ expect(screen.getByRole('table')).toBeInTheDocument()\n})\n- const columns = container.querySelectorAll('th')\n+ const header = screen.getAllByRole('columnheader')\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(header[0]).toHaveTextContent(/scheduling.appointment.startDate/i)\n+ expect(header[1]).toHaveTextContent(/scheduling.appointment.endDate/i)\n+ expect(header[2]).toHaveTextContent(/scheduling.appointment.location/i)\n+ expect(header[3]).toHaveTextContent(/scheduling.appointment.type/i)\n+ expect(header[4]).toHaveTextContent(/actions.label/i)\nexpect(screen.getAllByRole('button', { name: /actions.view/i })[0]).toBeInTheDocument()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/ViewAllergy.test.tsx", "new_path": "src/__tests__/patients/allergies/ViewAllergy.test.tsx", "diff": "-import { render, screen } from '@testing-library/react'\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'\nimport ViewAllergy from '../../../patients/allergies/ViewAllergy'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\n-describe('View Care Plan', () => {\n+describe('ViewAllergy', () => {\nconst patient = {\nid: 'patientId',\n- allergies: [{ id: '123', name: 'some name' }],\n+ allergies: [{ id: '123', name: 'cats' }],\n} as Patient\nconst setup = async () => {\n@@ -19,22 +18,22 @@ describe('View Care Plan', () => {\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/allergies/${patient.allergies![0].id}`)\n- await act(async () => {\n- await render(\n+ return render(\n<Router history={history}>\n<Route path=\"/patients/:id/allergies/:allergyId\">\n<ViewAllergy />\n</Route>\n</Router>,\n)\n- })\n}\nit('should render a allergy input with the correct data', async () => {\n- await setup()\n-\n- const allergyName = screen.getByDisplayValue(/some name/)\n+ setup()\n- expect(allergyName).toBeInTheDocument()\n+ await waitFor(() => {\n+ expect(\n+ screen.getByRole('textbox', { name: /patient.allergies.allergyName/i }),\n+ ).toBeInTheDocument()\n+ })\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/allergies/ViewAllergy.tsx", "new_path": "src/patients/allergies/ViewAllergy.tsx", "diff": "@@ -18,7 +18,7 @@ const ViewAllergy = () => {\nreturn (\n<>\n<TextInputWithLabelFormGroup\n- name=\"name\"\n+ name=\"allergy\"\nlabel={t('patient.allergies.allergyName')}\nisEditable={false}\nplaceholder={t('patient.allergies.allergyName')}\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, screen } from '@testing-library/react'\n+import { render, screen, within } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -6,7 +6,6 @@ import { Route, Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n-import IncidentFilter from '../../../incidents/IncidentFilter'\nimport ViewIncidents from '../../../incidents/list/ViewIncidents'\nimport * as breadcrumbUtil from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\nimport * as ButtonBarProvider from '../../../page-header/button-toolbar/ButtonBarProvider'\n@@ -65,6 +64,6 @@ it('should filter incidents by status=reported on first load ', () => {\ndescribe('layout', () => {\nit('should render a table with the incidents', async () => {\nsetup([Permissions.ViewIncidents])\n- expect(await screen.findByRole('table')).toHaveTextContent(IncidentFilter.reported)\n+ expect(within(await screen.findByRole('table')).getByText('some code')).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/incidents/report/ReportIncident.tsx", "new_path": "src/incidents/report/ReportIncident.tsx", "diff": "@@ -64,7 +64,7 @@ const ReportIncident = () => {\n}\nreturn (\n- <form>\n+ <form aria-label=\"Report Incident form\">\n<Row>\n<Column md={6}>\n<DateTimePickerWithLabelFormGroup\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/Incidents.test.tsx", "new_path": "src/__tests__/incidents/Incidents.test.tsx", "diff": "@@ -31,28 +31,27 @@ describe('Incidents', () => {\ncomponents: { sidebarCollapsed: false },\n} as any)\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ return render(\n<Provider store={store}>\n<MemoryRouter initialEntries={[path]}>\n- <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider>\n+ <Incidents />\n+ </titleUtil.TitleProvider>\n</MemoryRouter>\n- </Provider>\n+ </Provider>,\n)\n-\n- return render(<Incidents />, { wrapper: Wrapper })\n}\ndescribe('routing', () => {\ndescribe('/incidents/new', () => {\nit('The new incident screen when /incidents/new is accessed', () => {\nsetup([Permissions.ReportIncident], '/incidents/new')\n- expect(screen.getAllByText(/incidents.reports/i)[0]).toBeInTheDocument()\n+ expect(screen.getByRole('form')).toBeInTheDocument()\n})\nit('should not navigate to /incidents/new if the user does not have ReportIncident permissions', () => {\n- setup([], '/incidents/new')\n- expect(screen.queryByText(/incidents.reports/i)).not.toBeInTheDocument()\n+ const { container } = setup([], '/incidents/new')\n+ expect(container).toMatchInlineSnapshot(`<div />`)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/Incidents.test.tsx", "new_path": "src/__tests__/incidents/Incidents.test.tsx", "diff": "@@ -46,7 +46,7 @@ describe('Incidents', () => {\ndescribe('/incidents/new', () => {\nit('The new incident screen when /incidents/new is accessed', () => {\nsetup([Permissions.ReportIncident], '/incidents/new')\n- expect(screen.getByRole('form')).toBeInTheDocument()\n+ expect(screen.getByRole('form', { name: /report incident form/i })).toBeInTheDocument()\n})\nit('should not navigate to /incidents/new if the user does not have ReportIncident permissions', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/search/ImagingRequestTable.test.tsx", "new_path": "src/__tests__/imagings/search/ImagingRequestTable.test.tsx", "diff": "-import { render as rtlRender, screen } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport format from 'date-fns/format'\nimport React from 'react'\n@@ -19,16 +19,16 @@ describe('Imaging Request Table', () => {\nrequestedBy: 'some user',\n} as Imaging\n- const render = (searchRequest: ImagingSearchRequest) => {\n+ const setup = (searchRequest: ImagingSearchRequest) => {\njest.resetAllMocks()\njest.spyOn(ImagingRepository, 'search').mockResolvedValue([expectedImaging])\n- return rtlRender(<ImagingRequestTable searchRequest={searchRequest} />)\n+ return render(<ImagingRequestTable searchRequest={searchRequest} />)\n}\nit('should render a table of imaging requests', async () => {\nconst expectedSearch: ImagingSearchRequest = { status: 'all', text: 'text' }\n- render(expectedSearch)\n+ setup(expectedSearch)\nconst headers = await screen.findAllByRole('columnheader')\nconst cells = screen.getAllByRole('cell')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/ViewVisit.test.tsx", "new_path": "src/__tests__/patients/visits/ViewVisit.test.tsx", "diff": "@@ -67,12 +67,18 @@ describe('View Visit', () => {\nexpect(startDateTimePicker).toHaveDisplayValue(\nformat(new Date(visit.startDateTime), 'MM/dd/yyyy h:mm aa'),\n)\n+ expect(startDateTimePicker).toBeDisabled()\nexpect(endDateTimePicker).toHaveDisplayValue(\nformat(new Date(visit.endDateTime), 'MM/dd/yyyy h:mm aa'),\n)\n+ expect(endDateTimePicker).toBeDisabled()\nexpect(typeInput).toHaveDisplayValue(visit.type)\n+ expect(typeInput).toBeDisabled()\nexpect(statusSelector).toHaveDisplayValue(visit.status)\n+ expect(statusSelector).toBeDisabled()\nexpect(reasonInput).toHaveDisplayValue(visit.reason)\n+ expect(reasonInput).toBeDisabled()\nexpect(locationInput).toHaveDisplayValue(visit.location)\n+ expect(locationInput).toBeDisabled()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/ViewAllergy.test.tsx", "new_path": "src/__tests__/patients/allergies/ViewAllergy.test.tsx", "diff": "@@ -5,6 +5,7 @@ import { Route, Router } from 'react-router-dom'\nimport ViewAllergy from '../../../patients/allergies/ViewAllergy'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import Allergy from '../../../shared/model/Allergy'\nimport Patient from '../../../shared/model/Patient'\ndescribe('ViewAllergy', () => {\n@@ -16,7 +17,7 @@ describe('ViewAllergy', () => {\nconst setup = async () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst history = createMemoryHistory()\n- history.push(`/patients/${patient.id}/allergies/${patient.allergies![0].id}`)\n+ history.push(`/patients/${patient.id}/allergies/${(patient.allergies as Allergy[])[0].id}`)\nreturn render(\n<Router history={history}>\n@@ -27,7 +28,7 @@ describe('ViewAllergy', () => {\n)\n}\n- it('should render a allergy input with the correct data', async () => {\n+ it('should render an allergy input with the correct data', async () => {\nsetup()\nawait waitFor(() => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/ViewNote.test.tsx", "new_path": "src/__tests__/patients/notes/ViewNote.test.tsx", "diff": "@@ -5,18 +5,19 @@ import { Route, Router } from 'react-router-dom'\nimport ViewNote from '../../../patients/notes/ViewNote'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n+import Note from '../../../shared/model/Note'\nimport Patient from '../../../shared/model/Patient'\ndescribe('View Note', () => {\nconst patient = {\nid: 'patientId',\n- notes: [{ id: '123', text: 'some name', date: '1947-09-09T14:48:00.000Z' }],\n+ notes: [{ id: '123', text: 'some name', date: '1947-09-09T14:48:00.000Z' }] as Note[],\n} as Patient\nit('should render a note input with the correct data', async () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst history = createMemoryHistory({\n- initialEntries: [`/patients/${patient.id}/notes/${patient.notes![0].id}`],\n+ initialEntries: [`/patients/${patient.id}/notes/${(patient.notes as Note[])[0].id}`],\n})\nrender(\n@@ -28,6 +29,6 @@ describe('View Note', () => {\n)\nconst input = await screen.findByLabelText(/patient.note/i)\n- expect(input).toHaveValue(patient.notes![0].text)\n+ expect(input).toHaveValue((patient.notes as Note[])[0].text)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "new_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "diff": "@@ -53,13 +53,13 @@ const setup = (permissions: any[] | undefined, id: string | undefined) => {\nreturn { ...renderResults, history }\n}\n-it('should set the breadcrumbs properly', async () => {\n- setup([Permissions.ViewIncident], '1234')\n+// it('should set the breadcrumbs properly', async () => {\n+// setup([Permissions.ViewIncident], '1234')\n- expect(breadcrumbUtil.default).toHaveBeenCalledWith([\n- { i18nKey: 'incidents.reports.view', location: '/incidents/1234' },\n- ])\n-})\n+// expect(breadcrumbUtil.default).toHaveBeenCalledWith([\n+// { i18nKey: 'incidents.reports.view', location: '/incidents/1234' },\n+// ])\n+// })\nit('smoke test ViewIncidentDetails no Permissions', async () => {\nsetup(undefined, '1234')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "new_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "diff": "@@ -53,14 +53,6 @@ const setup = (permissions: any[] | undefined, id: string | undefined) => {\nreturn { ...renderResults, history }\n}\n-// it('should set the breadcrumbs properly', async () => {\n-// setup([Permissions.ViewIncident], '1234')\n-\n-// expect(breadcrumbUtil.default).toHaveBeenCalledWith([\n-// { i18nKey: 'incidents.reports.view', location: '/incidents/1234' },\n-// ])\n-// })\n-\nit('smoke test ViewIncidentDetails no Permissions', async () => {\nsetup(undefined, '1234')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "new_path": "src/__tests__/scheduling/appointments/ViewAppointments.test.tsx", "diff": "@@ -66,7 +66,7 @@ describe('ViewAppointments', () => {\n})\nit('should render a calendar with the proper events', async () => {\n- const { container, expectedPatient, expectedAppointment } = setup()\n+ const { expectedPatient, expectedAppointment } = setup()\nawait waitFor(() => {\nexpect(screen.getAllByText(expectedPatient.fullName as string)[0]).toBeInTheDocument()\n@@ -75,13 +75,6 @@ describe('ViewAppointments', () => {\nconst expectedStart = format(new Date(expectedAppointment.startDateTime), 'h:mm')\nconst expectedEnd = format(new Date(expectedAppointment.endDateTime), 'h:mm')\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(expectedEnd),\n- )\n+ expect(screen.getByText(`${expectedStart} - ${expectedEnd}`)).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/Incidents.test.tsx", "new_path": "src/__tests__/incidents/Incidents.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n-import React from 'react'\n+import { render as rtlRender, screen, waitForElementToBeRemoved } from '@testing-library/react'\n+import React, { ReactNode } from 'react'\nimport { Provider } from 'react-redux'\nimport { MemoryRouter } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -14,6 +14,11 @@ 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', () => {\nconst expectedIncident = {\nid: '1234',\n@@ -22,7 +27,8 @@ describe('Incidents', () => {\nreportedOn: new Date().toISOString(),\nreportedBy: 'some user',\n} as Incident\n- function setup(permissions: Permissions[], path: string) {\n+\n+ function render(permissions: Permissions[], path: string) {\njest.spyOn(IncidentRepository, 'search').mockResolvedValue([])\njest.spyOn(IncidentRepository, 'find').mockResolvedValue(expectedIncident)\nconst store = mockStore({\n@@ -31,52 +37,57 @@ describe('Incidents', () => {\ncomponents: { sidebarCollapsed: false },\n} as any)\n- return render(\n+ function Wrapper({ children }: WrapperProps) {\n+ return (\n<Provider store={store}>\n<MemoryRouter initialEntries={[path]}>\n- <titleUtil.TitleProvider>\n- <Incidents />\n- </titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n</MemoryRouter>\n- </Provider>,\n+ </Provider>\n)\n}\n+ return rtlRender(<Incidents />, { wrapper: Wrapper })\n+ }\n+\ndescribe('routing', () => {\ndescribe('/incidents/new', () => {\nit('The new incident screen when /incidents/new is accessed', () => {\n- setup([Permissions.ReportIncident], '/incidents/new')\n+ render([Permissions.ReportIncident], '/incidents/new')\nexpect(screen.getByRole('form', { name: /report incident form/i })).toBeInTheDocument()\n})\nit('should not navigate to /incidents/new if the user does not have ReportIncident permissions', () => {\n- const { container } = setup([], '/incidents/new')\n+ const { container } = render([], '/incidents/new')\nexpect(container).toMatchInlineSnapshot(`<div />`)\n})\n})\ndescribe('/incidents/visualize', () => {\nit('The incident visualize screen when /incidents/visualize is accessed', async () => {\n- const { container } = setup([Permissions.ViewIncidentWidgets], '/incidents/visualize')\n- await waitFor(() => {\n- expect(container.querySelector('.chartjs-render-monitor')).toBeInTheDocument()\n- })\n+ const { container } = render([Permissions.ViewIncidentWidgets], '/incidents/visualize')\n+ await waitForElementToBeRemoved(() => container.querySelector('.css-1jydqjy'))\n+ expect(container.querySelector('canvas')).toBeInTheDocument()\n})\nit('should not navigate to /incidents/visualize if the user does not have ViewIncidentWidgets permissions', () => {\n- const { container } = setup([], '/incidents/visualize')\n+ const { container } = render([], '/incidents/visualize')\nexpect(container).toMatchInlineSnapshot(`<div />`)\n})\n})\ndescribe('/incidents/:id', () => {\nit('The view incident screen when /incidents/:id is accessed', async () => {\n- setup([Permissions.ViewIncident], `/incidents/${expectedIncident.id}`)\n- expect(await screen.findByText(expectedIncident.reportedBy)).toBeInTheDocument()\n+ const { container } = render(\n+ [Permissions.ViewIncident],\n+ `/incidents/${expectedIncident.id}`,\n+ )\n+ await waitForElementToBeRemoved(() => container.querySelector('.css-1jydqjy'))\n+ expect(screen.getByText(expectedIncident.reportedBy)).toBeInTheDocument()\n})\nit('should not navigate to /incidents/:id if the user does not have ViewIncident permissions', async () => {\n- const { container } = setup([], `/incidents/${expectedIncident.id}`)\n+ const { container } = render([], `/incidents/${expectedIncident.id}`)\nexpect(container).toMatchInlineSnapshot(`<div />`)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": ".github/CONTRIBUTING.md", "new_path": ".github/CONTRIBUTING.md", "diff": "@@ -25,7 +25,7 @@ This should launch a new CouchDB instance on `http://localhost:5984`, create sys\nGo to `http://localhost:5984/_utils` in your browser to view Fauxton and perform administrative tasks.\n**_Cleanup_**\n-To delete the development database, go to the root of the project and run `./couchdb/couchdb-init.bat` on Windows or `./couchdb/couchdb-init.sh` on UNIX like systems.\n+To delete the development database, go to the root of the project and run `./couchdb/couchdb-cleanup.bat` on Windows or `./couchdb/couchdb-cleanup.sh` on UNIX like systems.\n### Install dependencies & start the application\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "new_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "diff": "@@ -145,23 +145,25 @@ describe('Report Incident', () => {\nconst catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\nconst catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\nconst inputArr = await screen.findAllByRole('textbox')\n- const descInput = inputArr[inputArr.length - 1]\n+ const descInput = inputArr[inputArr.length - 2]\nconst dateInput = inputArr[0]\nconst invalidInputs = container.querySelectorAll('.is-invalid')\nexpect(invalidInputs).toHaveLength(5)\n+ // expect(dateInput).toBeInvalid()\nexpect(dateInput).toHaveClass('is-invalid')\n- // // expect(depInput).toBeInvalid()\n+\n+ // expect(depInput).toBeInvalid()\nexpect(depInput).toHaveClass('is-invalid')\n- // // expect(catInput).toBeInvalid()\n+ // expect(catInput).toBeInvalid()\nexpect(catInput).toHaveClass('is-invalid')\n- // // expect(catItemInput).toBeInvalid()\n+ // expect(catItemInput).toBeInvalid()\nexpect(catItemInput).toHaveClass('is-invalid')\n- // // expect(descInput).toBeInvalid()\n+ // expect(descInput).toBeInvalid()\nexpect(descInput).toHaveClass('is-invalid')\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/navbar/Navbar.test.tsx", "new_path": "src/__tests__/shared/components/navbar/Navbar.test.tsx", "diff": "import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n-import cloneDeep from 'lodash/cloneDeep'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\n@@ -9,6 +8,7 @@ import createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\nimport Navbar from '../../../../shared/components/navbar/Navbar'\n+import pageMap from '../../../../shared/components/navbar/pageMap'\nimport Permissions from '../../../../shared/model/Permissions'\nimport User from '../../../../shared/model/User'\nimport { RootState } from '../../../../shared/store'\n@@ -40,32 +40,7 @@ describe('Navbar', () => {\nfamilyName: 'familyName',\n} as User\n- const allPermissions = [\n- Permissions.ReadPatients,\n- Permissions.WritePatients,\n- Permissions.ReadAppointments,\n- Permissions.WriteAppointments,\n- Permissions.DeleteAppointment,\n- Permissions.AddAllergy,\n- Permissions.AddDiagnosis,\n- Permissions.RequestLab,\n- Permissions.CancelLab,\n- Permissions.CompleteLab,\n- Permissions.ViewLab,\n- Permissions.ViewLabs,\n- Permissions.RequestMedication,\n- Permissions.CancelMedication,\n- Permissions.CompleteMedication,\n- Permissions.ViewMedication,\n- Permissions.ViewMedications,\n- Permissions.ViewIncidents,\n- Permissions.ViewIncident,\n- Permissions.ReportIncident,\n- Permissions.AddVisit,\n- Permissions.ReadVisits,\n- Permissions.RequestImaging,\n- Permissions.ViewImagings,\n- ]\n+ const allPermissions = Object.values(Permissions)\ndescribe('hamberger', () => {\nit('should render a hamberger link list', () => {\n@@ -73,42 +48,39 @@ describe('Navbar', () => {\nconst navButton = screen.getByRole('button', { hidden: false })\nuserEvent.click(navButton)\n- const labels = [\n- 'dashboard.label',\n- 'patients.newPatient',\n- 'labs.requests.label',\n- 'incidents.reports.new',\n- 'incidents.reports.label',\n- 'medications.requests.new',\n- 'medications.requests.label',\n- 'imagings.requests.new',\n- 'imagings.requests.label',\n- 'visits.visit.new',\n- 'settings.label',\n- ]\n- labels.forEach((label) => expect(screen.getByText(label)).toBeInTheDocument())\n+ // We want all the labels from the page mapping to be rendered when we have all permissions\n+ const expectedLabels = Object.values(pageMap).map(pm => pm.label)\n+\n+ // Checks both order, and length - excluding buttons with no label\n+ const renderedLabels = screen.getAllByRole('button').map(b => b.textContent).filter(s => s)\n+ expect(renderedLabels).toStrictEqual(expectedLabels)\n})\nit('should not show an item if user does not have a permission', () => {\n// exclude labs, incidents, and imagings permissions\n- setup(cloneDeep(allPermissions).slice(0, 6))\n+ // NOTE: \"View Imagings\" is based on the ReadPatients permission - not an Imagings permission\n+ const excludedPermissions = [\n+ Permissions.ViewLab,\n+ Permissions.ViewLabs,\n+ Permissions.CancelLab,\n+ Permissions.RequestLab,\n+ Permissions.CompleteLab,\n+ Permissions.ViewIncident,\n+ Permissions.ViewIncidents,\n+ Permissions.ViewIncidentWidgets,\n+ Permissions.ReportIncident,\n+ Permissions.ResolveIncident,\n+ Permissions.ViewImagings,\n+ Permissions.RequestImaging,\n+ ]\n+ setup(allPermissions.filter(p => !excludedPermissions.includes(p) ))\nconst navButton = screen.getByRole('button', { hidden: false })\nuserEvent.click(navButton)\n- const labels = [\n- 'labs.requests.new',\n- 'labs.requests.label',\n- 'incidents.reports.new',\n- 'incidents.reports.label',\n- 'medications.requests.new',\n- 'medications.requests.label',\n- 'imagings.requests.new',\n- // TODO: Mention to Jack this was not passing, was previously rendering\n- // 'imagings.requests.label',\n- ]\n+ const unexpectedLabels = Object.values(pageMap).filter(pm => excludedPermissions.includes(pm.permission as Permissions)).map(pm => pm.label)\n- labels.forEach((label) => expect(screen.queryByText(label)).not.toBeInTheDocument())\n+ unexpectedLabels.forEach((label) => expect(screen.queryByText(label)).not.toBeInTheDocument())\n})\ndescribe('header', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/Sidebar.test.tsx", "new_path": "src/__tests__/shared/components/Sidebar.test.tsx", "diff": "@@ -15,33 +15,7 @@ const mockStore = createMockStore<RootState, any>([thunk])\ndescribe('Sidebar', () => {\nlet history = createMemoryHistory()\n- const allPermissions = [\n- Permissions.ReadPatients,\n- Permissions.WritePatients,\n- Permissions.ReadAppointments,\n- Permissions.WriteAppointments,\n- Permissions.DeleteAppointment,\n- Permissions.AddAllergy,\n- Permissions.AddDiagnosis,\n- Permissions.RequestLab,\n- Permissions.CancelLab,\n- Permissions.CompleteLab,\n- Permissions.ViewLab,\n- Permissions.ViewLabs,\n- Permissions.RequestMedication,\n- Permissions.CompleteMedication,\n- Permissions.CancelMedication,\n- Permissions.ViewMedications,\n- Permissions.ViewMedication,\n- Permissions.ViewIncidents,\n- Permissions.ViewIncident,\n- Permissions.ViewIncidentWidgets,\n- Permissions.ReportIncident,\n- Permissions.ReadVisits,\n- Permissions.AddVisit,\n- Permissions.RequestImaging,\n- Permissions.ViewImagings,\n- ]\n+ const allPermissions = Object.values(Permissions)\nconst store = mockStore({\ncomponents: { sidebarCollapsed: false },\nuser: { permissions: allPermissions },\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/navbar/Navbar.test.tsx", "new_path": "src/__tests__/shared/components/navbar/Navbar.test.tsx", "diff": "@@ -50,10 +50,13 @@ describe('Navbar', () => {\nuserEvent.click(navButton)\n// We want all the labels from the page mapping to be rendered when we have all permissions\n- const expectedLabels = Object.values(pageMap).map(pm => pm.label)\n+ const expectedLabels = Object.values(pageMap).map((pm) => pm.label)\n// Checks both order, and length - excluding buttons with no label\n- const renderedLabels = screen.getAllByRole('button').map(b => b.textContent).filter(s => s)\n+ const renderedLabels = screen\n+ .getAllByRole('button')\n+ .map((b) => b.textContent)\n+ .filter((s) => s)\nexpect(renderedLabels).toStrictEqual(expectedLabels)\n})\n@@ -74,11 +77,13 @@ describe('Navbar', () => {\nPermissions.ViewImagings,\nPermissions.RequestImaging,\n]\n- setup(allPermissions.filter(p => !excludedPermissions.includes(p) ))\n+ setup(allPermissions.filter((p) => !excludedPermissions.includes(p)))\nconst navButton = screen.getByRole('button', { hidden: false })\nuserEvent.click(navButton)\n- const unexpectedLabels = Object.values(pageMap).filter(pm => excludedPermissions.includes(pm.permission as Permissions)).map(pm => pm.label)\n+ const unexpectedLabels = Object.values(pageMap)\n+ .filter((pm) => excludedPermissions.includes(pm.permission as Permissions))\n+ .map((pm) => pm.label)\nunexpectedLabels.forEach((label) => expect(screen.queryByText(label)).not.toBeInTheDocument())\n})\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 { render, screen } from '@testing-library/react'\n+import { render as rtlRender, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n-import React from 'react'\n+import React, { ReactNode } from 'react'\nimport { Provider } from 'react-redux'\nimport { Route, Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -19,6 +18,11 @@ import { expectOneConsoleError } from '../../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\n+type WrapperProps = {\n+ // eslint-disable-next-line react/require-default-props\n+ children?: ReactNode\n+}\n+\ndescribe('Report Incident', () => {\nlet history: any\n@@ -27,7 +31,7 @@ describe('Report Incident', () => {\n})\nlet setButtonToolBarSpy: any\n- const setup = (permissions: Permissions[]) => {\n+ const render = (permissions: Permissions[]) => {\njest.spyOn(breadcrumbUtil, 'default')\nsetButtonToolBarSpy = jest.fn()\njest.spyOn(ButtonBarProvider, 'useButtonToolbarSetter').mockReturnValue(setButtonToolBarSpy)\n@@ -43,22 +47,24 @@ describe('Report Incident', () => {\n},\n} as any)\n- return render(\n+ function Wrapper({ children }: WrapperProps) {\n+ return (\n<ButtonBarProvider.ButtonBarProvider>\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/incidents/new\">\n- <titleUtil.TitleProvider>\n- <ReportIncident />\n- </titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider> {children} </titleUtil.TitleProvider>\n</Route>\n</Router>\n</Provider>\n- </ButtonBarProvider.ButtonBarProvider>,\n+ </ButtonBarProvider.ButtonBarProvider>\n)\n}\n+\n+ return rtlRender(<ReportIncident />, { wrapper: Wrapper })\n+ }\ntest('type into department field', async () => {\n- setup([Permissions.ViewIncident, Permissions.ResolveIncident])\n+ render([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\nexpect(depInput).toBeEnabled()\n@@ -69,7 +75,7 @@ describe('Report Incident', () => {\n})\ntest('type into category field', async () => {\n- setup([Permissions.ViewIncident, Permissions.ResolveIncident])\n+ render([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\nexpect(catInput).toBeEnabled()\n@@ -80,7 +86,7 @@ describe('Report Incident', () => {\n})\ntest('type into category item field', async () => {\n- setup([Permissions.ViewIncident, Permissions.ResolveIncident])\n+ render([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\nexpect(catItemInput).toBeInTheDocument()\n@@ -91,7 +97,7 @@ describe('Report Incident', () => {\n})\ntest('type into description field', async () => {\n- setup([Permissions.ViewIncident, Permissions.ResolveIncident])\n+ render([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst inputArr = await screen.findAllByRole('textbox', { name: /required/i })\nconst descInput = inputArr[inputArr.length - 1]\n@@ -102,7 +108,7 @@ describe('Report Incident', () => {\nexpect(descInput).toHaveDisplayValue('Geordi requested analysis')\n})\ntest('action save after all the input fields are filled out', async () => {\n- setup([Permissions.ViewIncident, Permissions.ResolveIncident])\n+ render([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\nconst catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\nconst catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\n@@ -133,7 +139,7 @@ describe('Report Incident', () => {\n}\nexpectOneConsoleError(error)\njest.spyOn(validationUtil, 'default').mockReturnValue(error)\n- const { container } = setup([Permissions.ReportIncident])\n+ render([Permissions.ReportIncident])\nuserEvent.click(\nscreen.getByRole('button', {\n@@ -148,28 +154,22 @@ describe('Report Incident', () => {\nconst descInput = inputArr[inputArr.length - 2]\nconst dateInput = inputArr[0]\n- const invalidInputs = container.querySelectorAll('.is-invalid')\n- expect(invalidInputs).toHaveLength(5)\n+ screen.debug(undefined, Infinity)\n- // expect(dateInput).toBeInvalid()\nexpect(dateInput).toHaveClass('is-invalid')\n- // expect(depInput).toBeInvalid()\nexpect(depInput).toHaveClass('is-invalid')\n- // expect(catInput).toBeInvalid()\nexpect(catInput).toHaveClass('is-invalid')\n- // expect(catItemInput).toBeInvalid()\nexpect(catItemInput).toHaveClass('is-invalid')\n- // expect(descInput).toBeInvalid()\nexpect(descInput).toHaveClass('is-invalid')\n})\ndescribe('on cancel', () => {\n- it('should navigate to /incidents', async () => {\n- setup([Permissions.ReportIncident])\n+ it('should navigate to /incidents', () => {\n+ render([Permissions.ReportIncident])\nexpect(history.location.pathname).toBe('/incidents/new')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLab.test.tsx", "new_path": "src/__tests__/labs/ViewLab.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import {\n+ render as rtlRender,\n+ screen,\n+ waitFor,\n+ waitForElementToBeRemoved,\n+} from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\n-import React from 'react'\n+import React, { ReactNode } from 'react'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -23,7 +28,12 @@ import { expectOneConsoleError } from '../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-const setup = (permissions: Permissions[], lab?: Partial<Lab>, error = {}) => {\n+type WrapperProps = {\n+ // eslint-disable-next-line react/require-default-props\n+ children?: ReactNode\n+}\n+\n+const render = (permissions: Permissions[], lab?: Partial<Lab>, error = {}) => {\nconst expectedDate = new Date()\nconst mockPatient = { fullName: 'test' }\nconst mockLab = {\n@@ -58,8 +68,7 @@ const setup = (permissions: Permissions[], lab?: Partial<Lab>, error = {}) => {\n},\n} as any)\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ const Wrapper = ({ children }: WrapperProps) => (\n<ButtonBarProvider>\n<Provider store={store}>\n<Router history={history}>\n@@ -71,20 +80,22 @@ const setup = (permissions: Permissions[], lab?: Partial<Lab>, error = {}) => {\n</ButtonBarProvider>\n)\n+ const utils = rtlRender(<ViewLab />, { wrapper: Wrapper })\n+\nreturn {\nhistory,\nstore,\nexpectedDate,\nexpectedLab: mockLab,\nexpectedPatient: mockPatient,\n- ...render(<ViewLab />, { wrapper: Wrapper }),\n+ ...utils,\n}\n}\ndescribe('View Lab', () => {\ndescribe('page content', () => {\nit(\"should display the patients' full name\", async () => {\n- const { expectedPatient } = setup([Permissions.ViewLab])\n+ const { expectedPatient } = render([Permissions.ViewLab])\nawait waitFor(() => {\nexpect(screen.getByText('labs.lab.for')).toBeInTheDocument()\n@@ -93,7 +104,7 @@ describe('View Lab', () => {\n})\nit('should display the lab-type', async () => {\n- const { expectedLab } = setup([Permissions.ViewLab], { type: 'expected type' })\n+ const { expectedLab } = render([Permissions.ViewLab], { type: 'expected type' })\nawait waitFor(() => {\nexpect(screen.getByRole('heading', { name: /labs.lab.type/i })).toBeInTheDocument()\n@@ -102,7 +113,7 @@ describe('View Lab', () => {\n})\nit('should display the requested on date', async () => {\n- const { expectedLab } = setup([Permissions.ViewLab], {\n+ const { expectedLab } = render([Permissions.ViewLab], {\nrequestedOn: '2020-03-30T04:43:20.102Z',\n})\n@@ -116,11 +127,9 @@ describe('View Lab', () => {\nit('should not display the completed date if the lab is not completed', async () => {\nconst completedDate = new Date('2020-10-10T10:10:10.100') // We want a different date than the mocked date\n- setup([Permissions.ViewLab], { completedOn: completedDate.toISOString() })\n+ render([Permissions.ViewLab], { completedOn: completedDate.toISOString() })\n- await waitFor(() => {\n- expect(screen.queryByText(/loading/i)).not.toBeInTheDocument()\n- })\n+ await waitForElementToBeRemoved(() => screen.queryByText(/loading/i))\nexpect(\nscreen.queryByText(format(completedDate, 'yyyy-MM-dd HH:mm a')),\n@@ -129,11 +138,9 @@ describe('View Lab', () => {\nit('should not display the canceled date if the lab is not canceled', async () => {\nconst cancelledDate = new Date('2020-10-10T10:10:10.100') // We want a different date than the mocked date\n- setup([Permissions.ViewLab], { canceledOn: cancelledDate.toISOString() })\n+ render([Permissions.ViewLab], { canceledOn: cancelledDate.toISOString() })\n- await waitFor(() => {\n- expect(screen.queryByText(/loading/i)).not.toBeInTheDocument()\n- })\n+ await waitForElementToBeRemoved(() => screen.queryByText(/loading/i))\nexpect(\nscreen.queryByText(format(cancelledDate, 'yyyy-MM-dd HH:mm a')),\n@@ -141,7 +148,7 @@ describe('View Lab', () => {\n})\nit('should render a result text field', async () => {\n- const { expectedLab } = setup([Permissions.ViewLab], { result: 'expected results' })\n+ const { expectedLab } = render([Permissions.ViewLab], { result: 'expected results' })\nawait waitFor(() => {\nexpect(\n@@ -152,15 +159,15 @@ describe('View Lab', () => {\n})\n})\n- it('should not display past notes if there is not', async () => {\n- const { container } = setup([Permissions.ViewLab], { notes: [] })\n+ it('should not display past notes if there is not', () => {\n+ const { container } = render([Permissions.ViewLab], { notes: [] })\nexpect(container.querySelector('.callout')).not.toBeInTheDocument()\n})\nit('should display the past notes', async () => {\nconst expectedNotes = 'expected notes'\n- const { container } = setup([Permissions.ViewLab], { notes: [expectedNotes] })\n+ const { container } = render([Permissions.ViewLab], { notes: [expectedNotes] })\nawait waitFor(() => {\nexpect(screen.getByText(expectedNotes)).toBeInTheDocument()\n@@ -169,7 +176,7 @@ describe('View Lab', () => {\n})\nit('should display the notes text field empty', async () => {\n- setup([Permissions.ViewLab])\n+ render([Permissions.ViewLab])\nawait waitFor(() => {\nexpect(screen.getByLabelText('labs.lab.notes')).toHaveValue('')\n@@ -177,7 +184,7 @@ describe('View Lab', () => {\n})\nit('should display errors', async () => {\n- setup([Permissions.ViewLab, Permissions.CompleteLab], { status: 'requested' })\n+ render([Permissions.ViewLab, Permissions.CompleteLab], { status: 'requested' })\nconst expectedError = { message: 'some message', result: 'some result feedback' } as LabError\nexpectOneConsoleError(expectedError)\n@@ -201,7 +208,7 @@ describe('View Lab', () => {\ndescribe('requested lab request', () => {\nit('should display a warning badge if the status is requested', async () => {\n- const { expectedLab } = setup([Permissions.ViewLab], { status: 'requested' })\n+ const { expectedLab } = render([Permissions.ViewLab], { status: 'requested' })\nawait waitFor(() => {\nexpect(\n@@ -214,7 +221,7 @@ describe('View Lab', () => {\n})\nit('should display a update lab, complete lab, and cancel lab button if the lab is in a requested state', async () => {\n- setup([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab])\n+ render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab])\nawait waitFor(() => {\nscreen.getByRole('button', {\n@@ -232,7 +239,7 @@ describe('View Lab', () => {\ndescribe('canceled lab request', () => {\nit('should display a danger badge if the status is canceled', async () => {\n- setup([Permissions.ViewLab], { status: 'canceled' })\n+ render([Permissions.ViewLab], { status: 'canceled' })\nawait waitFor(() => {\nexpect(\n@@ -249,7 +256,7 @@ describe('View Lab', () => {\n})\nit('should display the canceled on date if the lab request has been canceled', async () => {\n- const { expectedLab } = setup([Permissions.ViewLab], {\n+ const { expectedLab } = render([Permissions.ViewLab], {\nstatus: 'canceled',\ncanceledOn: '2020-03-30T04:45:20.102Z',\n})\n@@ -269,7 +276,7 @@ describe('View Lab', () => {\n})\nit('should not display update, complete, and cancel button if the lab is canceled', async () => {\n- setup([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\n+ render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\nstatus: 'canceled',\n})\n@@ -279,7 +286,7 @@ describe('View Lab', () => {\n})\nit('should not display notes text field if the status is canceled', async () => {\n- setup([Permissions.ViewLab], { status: 'canceled' })\n+ render([Permissions.ViewLab], { status: 'canceled' })\nawait waitFor(() => {\nexpect(screen.getByText('labs.lab.notes')).toBeInTheDocument()\n@@ -290,7 +297,7 @@ describe('View Lab', () => {\ndescribe('completed lab request', () => {\nit('should display a primary badge if the status is completed', async () => {\n- const { expectedLab } = setup([Permissions.ViewLab], { status: 'completed' })\n+ const { expectedLab } = render([Permissions.ViewLab], { status: 'completed' })\nawait waitFor(() => {\nexpect(screen.getByRole('heading', { name: 'labs.lab.status' })).toBeInTheDocument()\n@@ -299,7 +306,7 @@ describe('View Lab', () => {\n})\nit('should display the completed on date if the lab request has been completed', async () => {\n- const { expectedLab } = setup([Permissions.ViewLab], {\n+ const { expectedLab } = render([Permissions.ViewLab], {\nstatus: 'completed',\ncompletedOn: '2020-03-30T04:44:20.102Z',\n})\n@@ -315,7 +322,7 @@ describe('View Lab', () => {\n})\nit('should not display update, complete, and cancel buttons if the lab is completed', async () => {\n- setup([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\n+ render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\nstatus: 'completed',\n})\n@@ -325,7 +332,7 @@ describe('View Lab', () => {\n})\nit('should not display notes text field if the status is completed', async () => {\n- setup([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\n+ render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\nstatus: 'completed',\n})\n@@ -339,7 +346,7 @@ describe('View Lab', () => {\ndescribe('on update', () => {\nit('should update the lab with the new information', async () => {\n- const { history, expectedLab } = setup([Permissions.ViewLab])\n+ const { history, expectedLab } = render([Permissions.ViewLab])\nconst expectedResult = 'expected result'\nconst newNotes = 'expected notes'\n@@ -369,7 +376,7 @@ describe('View Lab', () => {\ndescribe('on complete', () => {\nit('should mark the status as completed and fill in the completed date with the current time', async () => {\n- const { history, expectedLab, expectedDate } = setup([\n+ const { history, expectedLab, expectedDate } = render([\nPermissions.ViewLab,\nPermissions.CompleteLab,\nPermissions.CancelLab,\n@@ -403,7 +410,7 @@ describe('View Lab', () => {\ndescribe('on cancel', () => {\nit('should mark the status as canceled and fill in the cancelled on date with the current time', async () => {\n- const { history, expectedLab, expectedDate } = setup([\n+ const { history, expectedLab, expectedDate } = render([\nPermissions.ViewLab,\nPermissions.CompleteLab,\nPermissions.CancelLab,\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "new_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render as rtlRender, screen, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n-import React from 'react'\n+import React, { ReactNode } from 'react'\nimport { Router } from 'react-router-dom'\nimport MedicationSearchRequest from '../../../medications/models/MedicationSearchRequest'\n@@ -9,8 +9,13 @@ import MedicationRequestTable from '../../../medications/search/MedicationReques\nimport MedicationRepository from '../../../shared/db/MedicationRepository'\nimport Medication from '../../../shared/model/Medication'\n+type WrapperProps = {\n+ // eslint-disable-next-line react/require-default-props\n+ children?: ReactNode\n+}\n+\ndescribe('Medication Request Table', () => {\n- const setup = async (\n+ const render = (\ngivenSearchRequest: MedicationSearchRequest = { text: '', status: 'all' },\ngivenMedications: Medication[] = [],\n) => {\n@@ -18,22 +23,27 @@ describe('Medication Request Table', () => {\njest.spyOn(MedicationRepository, 'search').mockResolvedValue(givenMedications)\nconst history = createMemoryHistory()\n+ function Wrapper({ children }: WrapperProps) {\n+ return <Router history={history}>{children}</Router>\n+ }\n+\n+ const utils = rtlRender(<MedicationRequestTable searchRequest={givenSearchRequest} />, {\n+ wrapper: Wrapper,\n+ })\n+\nreturn {\nhistory,\n- ...render(\n- <Router history={history}>\n- <MedicationRequestTable searchRequest={givenSearchRequest} />\n- </Router>,\n- ),\n+ ...utils,\n}\n}\nit('should render a table with the correct columns', async () => {\n- const { container } = await setup()\n+ const { container } = render()\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n})\n+\nconst columns = container.querySelectorAll('th')\nexpect(columns[0]).toHaveTextContent(/medications.medication.medication/i)\n@@ -53,7 +63,7 @@ describe('Medication Request Table', () => {\nstatus: expectedSearchRequest.status,\n} as Medication,\n]\n- const { container } = await setup(expectedSearchRequest, expectedMedicationRequests)\n+ const { container } = render(expectedSearchRequest, expectedMedicationRequests)\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n@@ -65,13 +75,13 @@ describe('Medication Request Table', () => {\nit('should navigate to the medication when the view button is clicked', async () => {\nconst expectedSearchRequest: MedicationSearchRequest = { text: 'someText', status: 'draft' }\nconst expectedMedicationRequests: Medication[] = [{ id: 'someId' } as Medication]\n- const { container, history } = await setup(expectedSearchRequest, expectedMedicationRequests)\n+ const { container, history } = render(expectedSearchRequest, expectedMedicationRequests)\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n})\nuserEvent.click(screen.getByRole('button', { name: /actions.view/i }))\n- expect(history.location.pathname).toEqual(`/medications/${expectedMedicationRequests[0].id}`)\n+ expect(history.location.pathname).toBe(`/medications/${expectedMedicationRequests[0].id}`)\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "new_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "diff": "-import { render as rtlRender, screen, waitFor } from '@testing-library/react'\n+import { render, screen, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n-import React, { ReactNode } from 'react'\n+import React from 'react'\nimport { Router } from 'react-router-dom'\nimport MedicationSearchRequest from '../../../medications/models/MedicationSearchRequest'\n@@ -9,13 +9,8 @@ import MedicationRequestTable from '../../../medications/search/MedicationReques\nimport MedicationRepository from '../../../shared/db/MedicationRepository'\nimport Medication from '../../../shared/model/Medication'\n-type WrapperProps = {\n- // eslint-disable-next-line react/require-default-props\n- children?: ReactNode\n-}\n-\ndescribe('Medication Request Table', () => {\n- const render = (\n+ const setup = (\ngivenSearchRequest: MedicationSearchRequest = { text: '', status: 'all' },\ngivenMedications: Medication[] = [],\n) => {\n@@ -23,22 +18,18 @@ describe('Medication Request Table', () => {\njest.spyOn(MedicationRepository, 'search').mockResolvedValue(givenMedications)\nconst history = createMemoryHistory()\n- function Wrapper({ children }: WrapperProps) {\n- return <Router history={history}>{children}</Router>\n- }\n-\n- const utils = rtlRender(<MedicationRequestTable searchRequest={givenSearchRequest} />, {\n- wrapper: Wrapper,\n- })\n-\nreturn {\nhistory,\n- ...utils,\n+ ...render(\n+ <Router history={history}>\n+ <MedicationRequestTable searchRequest={givenSearchRequest} />\n+ </Router>,\n+ ),\n}\n}\nit('should render a table with the correct columns', async () => {\n- const { container } = render()\n+ const { container } = setup()\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n@@ -63,7 +54,7 @@ describe('Medication Request Table', () => {\nstatus: expectedSearchRequest.status,\n} as Medication,\n]\n- const { container } = render(expectedSearchRequest, expectedMedicationRequests)\n+ const { container } = setup(expectedSearchRequest, expectedMedicationRequests)\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n@@ -75,7 +66,7 @@ describe('Medication Request Table', () => {\nit('should navigate to the medication when the view button is clicked', async () => {\nconst expectedSearchRequest: MedicationSearchRequest = { text: 'someText', status: 'draft' }\nconst expectedMedicationRequests: Medication[] = [{ id: 'someId' } as Medication]\n- const { container, history } = render(expectedSearchRequest, expectedMedicationRequests)\n+ const { container, history } = setup(expectedSearchRequest, expectedMedicationRequests)\nawait waitFor(() => {\nexpect(container.querySelector('table')).toBeInTheDocument()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/PatientSearchInput.test.tsx", "new_path": "src/__tests__/patients/search/PatientSearchInput.test.tsx", "diff": "-import { render as rtlRender, screen, act } from '@testing-library/react'\n+import { render, screen, act } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\n-import PatientSearchRequest from '../../../patients/models/PatientSearchRequest'\nimport PatientSearchInput from '../../../patients/search/PatientSearchInput'\ndescribe('Patient Search Input', () => {\n- const render = (onChange: (s: PatientSearchRequest) => void) => {\n- const results = rtlRender(<PatientSearchInput onChange={onChange} />)\n-\n- return results\n- }\n-\nit('should render a text box', () => {\n- render(jest.fn())\n+ render(<PatientSearchInput onChange={jest.fn()} />)\nexpect(screen.getByRole('textbox')).toBeInTheDocument()\n})\n@@ -21,9 +14,10 @@ describe('Patient Search Input', () => {\njest.useFakeTimers()\nconst expectedNewQueryString = 'some new query string'\nconst onChangeSpy = jest.fn()\n- render(onChangeSpy)\n- const textbox = screen.getByRole('textbox')\n+ render(<PatientSearchInput onChange={onChangeSpy} />)\n+\n+ const textbox = screen.getByRole('textbox')\nuserEvent.type(textbox, expectedNewQueryString)\nonChangeSpy.mockReset()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/ViewPatientsTable.test.tsx", "new_path": "src/__tests__/patients/search/ViewPatientsTable.test.tsx", "diff": "-import {\n- render as rtlRender,\n- screen,\n- waitFor,\n- waitForElementToBeRemoved,\n-} from '@testing-library/react'\n+import { screen, render, waitFor, waitForElementToBeRemoved } from '@testing-library/react'\nimport format from 'date-fns/format'\nimport React from 'react'\n@@ -13,13 +8,11 @@ import PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\ndescribe('View Patients Table', () => {\n- const render = (expectedSearchRequest: PatientSearchRequest, expectedPatients: Patient[]) => {\n+ const setup = (expectedSearchRequest: PatientSearchRequest, expectedPatients: Patient[]) => {\njest.spyOn(PatientRepository, 'search').mockResolvedValueOnce(expectedPatients)\njest.spyOn(PatientRepository, 'count').mockResolvedValueOnce(expectedPatients.length)\n- const results = rtlRender(<ViewPatientsTable searchRequest={expectedSearchRequest} />)\n-\n- return results\n+ return render(<ViewPatientsTable searchRequest={expectedSearchRequest} />)\n}\nbeforeEach(() => {\n@@ -28,14 +21,14 @@ describe('View Patients Table', () => {\nit('should search for patients given a search request', () => {\nconst expectedSearchRequest = { queryString: 'someQueryString' }\n- render(expectedSearchRequest, [])\n+ setup(expectedSearchRequest, [])\nexpect(PatientRepository.search).toHaveBeenCalledTimes(1)\nexpect(PatientRepository.search).toHaveBeenCalledWith(expectedSearchRequest.queryString)\n})\nit('should display no patients exist if total patient count is 0', async () => {\n- const { container } = render({ queryString: '' }, [])\n+ const { container } = setup({ queryString: '' }, [])\nawait waitForElementToBeRemoved(container.querySelector('.css-0'))\nexpect(screen.getByRole('heading', { name: /patients.noPatients/i })).toBeInTheDocument()\n})\n@@ -51,7 +44,7 @@ describe('View Patients Table', () => {\n} as Patient\nconst expectedPatients = [expectedPatient]\n- render({ queryString: '' }, expectedPatients)\n+ setup({ queryString: '' }, expectedPatients)\nawait waitFor(() => screen.getByText('familyName'))\nconst cells = screen.getAllByRole('cell')\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": "-import { render, screen, waitFor } from '@testing-library/react'\n-import userEvent from '@testing-library/user-event'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Router } from 'react-router-dom'\nimport AddCareGoalModal from '../../../patients/care-goals/AddCareGoalModal'\n-import PatientRepository from '../../../shared/db/PatientRepository'\nimport CareGoal from '../../../shared/model/CareGoal'\nimport Patient from '../../../shared/model/Patient'\n@@ -17,25 +15,15 @@ describe('Add Care Goal Modal', () => {\n} as Patient\nconst setup = () => {\n- const onCloseSpy = jest.fn()\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n- jest.spyOn(PatientRepository, 'saveOrUpdate')\nconst history = createMemoryHistory()\n- return {\n- ...render(\n+ return render(\n<Router history={history}>\n- <AddCareGoalModal patient={patient} show onCloseButtonClick={onCloseSpy} />\n+ <AddCareGoalModal patient={patient} show onCloseButtonClick={jest.fn()} />\n</Router>,\n- ),\n- onCloseSpy,\n- }\n+ )\n}\n- beforeEach(() => {\n- jest.resetAllMocks()\n- })\n-\nit('should render a modal', () => {\nsetup()\n@@ -51,31 +39,4 @@ describe('Add Care Goal Modal', () => {\nexpect(screen.getByLabelText('care-goal-form')).toBeInTheDocument()\n})\n-\n- it('should save care goal when save button is clicked and close', async () => {\n- const expectedCreatedDate = new Date()\n- Date.now = jest.fn().mockReturnValue(expectedCreatedDate)\n-\n- const expectedCareGoal = {\n- description: 'some description',\n- createdOn: expectedCreatedDate.toISOString(),\n- }\n-\n- const { onCloseSpy } = setup()\n-\n- userEvent.type(screen.getAllByRole('textbox')[0], expectedCareGoal.description)\n- userEvent.click(screen.getByRole('button', { name: /patient.careGoal.new/i }))\n-\n- await waitFor(() => {\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n- })\n-\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n- expect.objectContaining({\n- careGoals: expect.arrayContaining([expect.objectContaining(expectedCareGoal)]),\n- }),\n- )\n-\n- expect(onCloseSpy).toHaveBeenCalledTimes(1)\n- })\n})\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": "@@ -23,9 +23,12 @@ const careGoal = {\nconst setup = (disabled = false, initializeCareGoal = true, error?: any) => {\nconst onCareGoalChangeSpy = jest.fn()\n+\nconst TestComponent = () => {\nconst [careGoal2, setCareGoal] = React.useState(initializeCareGoal ? careGoal : {})\n+\nonCareGoalChangeSpy.mockImplementation(setCareGoal)\n+\nreturn (\n<CareGoalForm\ncareGoal={careGoal2}\n@@ -35,9 +38,8 @@ const setup = (disabled = false, initializeCareGoal = true, error?: any) => {\n/>\n)\n}\n- const wrapper = render(<TestComponent />)\n- return { ...wrapper, onCareGoalChangeSpy }\n+ return { ...render(<TestComponent />), onCareGoalChangeSpy }\n}\ndescribe('Care Goal Form', () => {\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, waitForElementToBeRemoved } from '@testing-library/react'\n-import userEvent from '@testing-library/user-event'\n+import { render, screen, waitFor, waitForElementToBeRemoved, within } from '@testing-library/react'\n+import userEvent, { specialChars } from '@testing-library/user-event'\n+import format from 'date-fns/format'\nimport { createMemoryHistory, MemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -9,12 +10,13 @@ import thunk from 'redux-thunk'\nimport CareGoalTab from '../../../patients/care-goals/CareGoalTab'\nimport PatientRepository from '../../../shared/db/PatientRepository'\n-import CareGoal from '../../../shared/model/CareGoal'\n+import CareGoal, { CareGoalStatus } from '../../../shared/model/CareGoal'\nimport Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n+const { selectAll, arrowDown, enter } = specialChars\ntype CareGoalTabWrapper = (store: any, history: MemoryHistory) => React.FC\n@@ -36,7 +38,12 @@ const ViewWrapper: CareGoalTabWrapper = (store: any, history: MemoryHistory) =>\n</Provider>\n)\n-const setup = (route: string, permissions: Permissions[], wrapper = TabWrapper) => {\n+const setup = (\n+ route: string,\n+ permissions: Permissions[],\n+ wrapper = TabWrapper,\n+ includeCareGoal = true,\n+) => {\nconst expectedCareGoal = {\nid: '456',\nstatus: 'accepted',\n@@ -48,7 +55,10 @@ const setup = (route: string, permissions: Permissions[], wrapper = TabWrapper)\ncreatedOn: new Date().toISOString(),\nnote: '',\n} as CareGoal\n- const expectedPatient = { id: '123', careGoals: [expectedCareGoal] } as Patient\n+ const expectedPatient = {\n+ id: '123',\n+ careGoals: includeCareGoal ? [expectedCareGoal] : [],\n+ } as Patient\njest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\nconst history = createMemoryHistory({ initialEntries: [route] })\n@@ -58,12 +68,6 @@ const setup = (route: string, permissions: Permissions[], wrapper = TabWrapper)\n}\ndescribe('Care Goals Tab', () => {\n- it('should render add care goal button if user has correct permissions', async () => {\n- setup('/patients/123/care-goals', [Permissions.AddCareGoal])\n-\n- expect(await screen.findByRole('button', { name: /patient.careGoal.new/i })).toBeInTheDocument()\n- })\n-\nit('should not render add care goal button if user does not have permissions', async () => {\nconst { container } = setup('/patients/123/care-goals', [])\n@@ -72,6 +76,50 @@ describe('Care Goals Tab', () => {\nexpect(screen.queryByRole('button', { name: /patient.careGoal.new/i })).not.toBeInTheDocument()\n})\n+ it('should be able to create a new care goal if user has permissions', async () => {\n+ const expectedCareGoal = {\n+ description: 'some description',\n+ status: CareGoalStatus.Accepted,\n+ startDate: new Date('2020-01-01'),\n+ dueDate: new Date('2020-02-01'),\n+ }\n+\n+ setup('/patients/123/care-goals', [Permissions.AddCareGoal], TabWrapper, false)\n+\n+ userEvent.click(await screen.findByRole('button', { name: /patient.careGoal.new/i }))\n+\n+ const modal = await screen.findByRole('dialog')\n+\n+ userEvent.type(within(modal).getAllByRole('textbox')[0], expectedCareGoal.description)\n+ userEvent.type(\n+ within(modal).getAllByRole('combobox')[1],\n+ `${selectAll}${expectedCareGoal.status}${arrowDown}${enter}`,\n+ )\n+ userEvent.type(\n+ within(modal).getAllByRole('textbox')[4],\n+ `${selectAll}${format(expectedCareGoal.startDate, 'MM/dd/yyyy')}${enter}`,\n+ )\n+ userEvent.type(\n+ within(modal).getAllByRole('textbox')[5],\n+ `${selectAll}${format(expectedCareGoal.dueDate, 'MM/dd/yyyy')}${enter}`,\n+ )\n+\n+ userEvent.click(within(modal).getByRole('button', { name: /patient.careGoal.new/i }))\n+\n+ await waitForElementToBeRemoved(modal)\n+\n+ expect(\n+ await screen.findByRole('cell', { name: expectedCareGoal.description }),\n+ ).toBeInTheDocument()\n+ expect(await screen.findByRole('cell', { name: expectedCareGoal.status })).toBeInTheDocument()\n+ expect(\n+ await screen.findByRole('cell', { name: format(expectedCareGoal.startDate, 'yyyy-MM-dd') }),\n+ ).toBeInTheDocument()\n+ expect(\n+ await screen.findByRole('cell', { name: format(expectedCareGoal.dueDate, 'yyyy-MM-dd') }),\n+ ).toBeInTheDocument()\n+ }, 20000)\n+\nit('should open and close the modal when the add care goal and close buttons are clicked', async () => {\nsetup('/patients/123/care-goals', [Permissions.AddCareGoal])\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": "@@ -106,7 +106,9 @@ describe('Care Goals Tab', () => {\nuserEvent.click(within(modal).getByRole('button', { name: /patient.careGoal.new/i }))\n- await waitForElementToBeRemoved(modal)\n+ await waitFor(() => {\n+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()\n+ })\nexpect(\nawait screen.findByRole('cell', { name: expectedCareGoal.description }),\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": "@@ -108,6 +108,8 @@ describe('Care Goals Tab', () => {\nawait waitFor(() => {\nexpect(screen.queryByRole('dialog')).not.toBeInTheDocument()\n+ }, {\n+ timeout: 3000,\n})\nexpect(\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": "@@ -106,11 +106,14 @@ describe('Care Goals Tab', () => {\nuserEvent.click(within(modal).getByRole('button', { name: /patient.careGoal.new/i }))\n- await waitFor(() => {\n+ await waitFor(\n+ () => {\nexpect(screen.queryByRole('dialog')).not.toBeInTheDocument()\n- }, {\n+ },\n+ {\ntimeout: 3000,\n- })\n+ },\n+ )\nexpect(\nawait screen.findByRole('cell', { name: expectedCareGoal.description }),\n" } ]

[ { "change_type": "MODIFY", "old_path": "package.json", "new_path": "package.json", "diff": "\"npm run test:ci\",\n\"git add .\"\n]\n+ },\n+ \"jest\": {\n+ \"restoreMocks\": true\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useCancelLab.test.ts", "new_path": "src/__tests__/labs/hooks/useCancelLab.test.ts", "diff": "@@ -15,10 +15,9 @@ describe('Use Cancel Lab', () => {\ncanceledOn: expectedCanceledOnDate.toISOString(),\n} as Lab\n+ it('should cancel a lab', async () => {\nDate.now = jest.fn(() => expectedCanceledOnDate.valueOf())\njest.spyOn(LabRepository, 'saveOrUpdate').mockResolvedValue(expectedCanceledLab)\n-\n- it('should cancel a lab', async () => {\nconst actualData = await executeMutation(() => useCancelLab(), lab)\nexpect(LabRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useLab.test.ts", "new_path": "src/__tests__/labs/hooks/useLab.test.ts", "diff": "@@ -9,9 +9,8 @@ describe('Use lab', () => {\nid: expectedLabId,\n} as Lab\n- jest.spyOn(LabRepository, 'find').mockResolvedValue(expectedLab)\n-\nit('should get a lab by id', async () => {\n+ jest.spyOn(LabRepository, 'find').mockResolvedValue(expectedLab)\nconst actualData = await executeQuery(() => useLab(expectedLabId))\nexpect(LabRepository.find).toHaveBeenCalledTimes(1)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/hooks/useUpdateLab.test.ts", "new_path": "src/__tests__/labs/hooks/useUpdateLab.test.ts", "diff": "@@ -9,9 +9,8 @@ describe('Use update lab', () => {\nnotes: ['some note'],\n} as Lab\n- jest.spyOn(LabRepository, 'saveOrUpdate').mockResolvedValue(expectedLab)\n-\nit('should update lab', async () => {\n+ jest.spyOn(LabRepository, 'saveOrUpdate').mockResolvedValue(expectedLab)\nconst actualData = await executeMutation(() => useUpdateLab(), expectedLab)\nexpect(LabRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\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": "@@ -110,9 +110,9 @@ describe('Care Goals Tab', () => {\n() => {\nexpect(screen.queryByRole('dialog')).not.toBeInTheDocument()\n},\n- {\n- timeout: 3000,\n- },\n+ // {\n+ // timeout: 3000,\n+ // },\n)\nexpect(\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/hooks/useUpdateAppointment.test.tsx", "new_path": "src/__tests__/scheduling/hooks/useUpdateAppointment.test.tsx", "diff": "@@ -14,9 +14,8 @@ describe('Use update appointment', () => {\ntype: 'type',\n} as Appointment\n- jest.spyOn(AppointmentRepository, 'saveOrUpdate').mockResolvedValue(expectedAppointment)\n-\nit('should update appointment', async () => {\n+ jest.spyOn(AppointmentRepository, 'saveOrUpdate').mockResolvedValue(expectedAppointment)\nconst actualData = await executeMutation(() => {\nconst result = useUpdateAppointment(expectedAppointment)\nreturn [result.mutate]\n" }, { "change_type": "MODIFY", "old_path": "src/setupTests.js", "new_path": "src/setupTests.js", "diff": "@@ -14,7 +14,6 @@ configure({ defaultHidden: true })\njest.setTimeout(10000)\nafterEach(() => {\n- jest.restoreAllMocks()\nqueryCache.clear()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/Labs.test.tsx", "new_path": "src/__tests__/labs/Labs.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n-import { createMemoryHistory } from 'history'\n+import { render, screen } from '@testing-library/react'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n-import { Router, Route } from 'react-router-dom'\n+import { MemoryRouter } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n@@ -24,27 +23,35 @@ const Title = () => {\nreturn <h1>{title}</h1>\n}\n-const LabsWithTitle = () => (\n- <TitleProvider>\n- <Title />\n- <Labs />\n- </TitleProvider>\n-)\n+const expectedLab = {\n+ code: 'L-code',\n+ id: '1234',\n+ patient: '1234',\n+ type: 'Type',\n+ requestedOn: new Date().toISOString(),\n+} as Lab\n+const expectedPatient = {\n+ fullName: 'fullName',\n+ id: '1234',\n+} as Patient\n-const setup = (ui: React.ReactElement, intialPath: string, permissions: Permissions[]) => {\n+const setup = (initialPath: string, permissions: Permissions[]) => {\n+ jest.resetAllMocks()\n+ jest.spyOn(LabRepository, 'find').mockResolvedValue(expectedLab)\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\nconst store = mockStore({ user: { permissions } } as any)\n- const history = createMemoryHistory({ initialEntries: [intialPath] })\n-\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n- <Provider store={store}>\n- <Router history={history}>{children}</Router>\n- </Provider>\n- )\nreturn {\n- history,\n- ...render(ui, { wrapper: Wrapper }),\n+ ...render(\n+ <Provider store={store}>\n+ <MemoryRouter initialEntries={[initialPath]}>\n+ <TitleProvider>\n+ <Title />\n+ <Labs />\n+ </TitleProvider>\n+ </MemoryRouter>\n+ </Provider>,\n+ ),\n}\n}\n@@ -52,95 +59,47 @@ describe('Labs', () => {\ndescribe('routing', () => {\ndescribe('/labs', () => {\nit('should render the view labs screen when /labs is accessed', async () => {\n- const { history } = setup(<LabsWithTitle />, '/labs', [Permissions.ViewLabs])\n-\n- await waitFor(() => {\n- expect(history.location.pathname).toBe('/labs')\n- })\n- await waitFor(() => {\n+ setup('/labs', [Permissions.ViewLabs])\nexpect(screen.getByRole('heading', { name: /labs\\.label/i })).toBeInTheDocument()\n})\n- })\nit('should not navigate to /labs if the user does not have ViewLabs permissions', async () => {\n- const { history } = setup(<LabsWithTitle />, '/labs', [])\n-\n- await waitFor(() => {\n- expect(history.location.pathname).toBe('/')\n- })\n+ setup('/labs', [])\n+ expect(screen.queryByRole('heading', { name: /labs\\.label/i })).not.toBeInTheDocument()\n})\n})\ndescribe('/labs/new', () => {\nit('should render the new lab request screen when /labs/new is accessed', async () => {\n- const { history } = setup(<LabsWithTitle />, '/labs/new', [Permissions.RequestLab])\n-\n- await waitFor(() => {\n- expect(history.location.pathname).toBe('/labs/new')\n- })\n- await waitFor(() => {\n+ setup('/labs/new', [Permissions.RequestLab])\nexpect(screen.getByRole('heading', { name: /labs\\.requests\\.new/i })).toBeInTheDocument()\n})\n- })\nit('should not navigate to /labs/new if the user does not have RequestLab permissions', async () => {\n- const { history } = setup(<LabsWithTitle />, '/labs/new', [])\n-\n- await waitFor(() => {\n- expect(history.location.pathname).toBe('/')\n- })\n+ setup('/labs/new', [])\n+ expect(\n+ screen.queryByRole('heading', { name: /labs\\.requests\\.new/i }),\n+ ).not.toBeInTheDocument()\n})\n})\ndescribe('/labs/:id', () => {\nit('should render the view lab screen when /labs/:id is accessed', async () => {\n- const expectedLab = {\n- code: 'L-code',\n- id: '1234',\n- patient: '1234',\n- type: 'Type',\n- requestedOn: new Date().toISOString(),\n- } as Lab\n- const expectedPatient = {\n- fullName: 'fullName',\n- id: '1234',\n- } as Patient\n-\n- jest.spyOn(LabRepository, 'find').mockResolvedValue(expectedLab)\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\n-\n- const { history } = setup(\n- <Route path=\"/labs/:id\">\n- <LabsWithTitle />\n- </Route>,\n- '/labs/1234',\n- [Permissions.ViewLab],\n- )\n-\n- await waitFor(() => {\n- expect(history.location.pathname).toBe('/labs/1234')\n- })\n- await waitFor(() => {\n+ setup('/labs/1234', [Permissions.ViewLab])\nexpect(\n- screen.getByRole('heading', {\n+ await screen.findByRole('heading', {\nname: `${expectedLab.type} for ${expectedPatient.fullName}(${expectedLab.code})`,\n}),\n).toBeInTheDocument()\n})\n- })\nit('should not navigate to /labs/:id if the user does not have ViewLab permissions', async () => {\n- const { history } = setup(\n- <Route path=\"/labs/:id\">\n- <LabsWithTitle />\n- </Route>,\n- '/labs/1234',\n- [],\n- )\n-\n- await waitFor(() => {\n- expect(history.location.pathname).toBe('/')\n- })\n+ setup('/labs/1234', [])\n+ expect(\n+ screen.queryByRole('heading', {\n+ name: `${expectedLab.type} for ${expectedPatient.fullName}(${expectedLab.code})`,\n+ }),\n+ ).not.toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLab.test.tsx", "new_path": "src/__tests__/labs/ViewLab.test.tsx", "diff": "-import {\n- render as rtlRender,\n- screen,\n- waitFor,\n- waitForElementToBeRemoved,\n-} from '@testing-library/react'\n+import { Toaster } from '@hospitalrun/components'\n+import { render, screen, waitFor, waitForElementToBeRemoved, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\n-import React, { ReactNode } from 'react'\n+import React from 'react'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -28,14 +24,10 @@ import { expectOneConsoleError } from '../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-type WrapperProps = {\n- // eslint-disable-next-line react/require-default-props\n- children?: ReactNode\n-}\n+const mockPatient = { fullName: 'Full Name' }\n-const render = (permissions: Permissions[], lab?: Partial<Lab>, error = {}) => {\n+const setup = (lab?: Partial<Lab>, permissions = [Permissions.ViewLab], error = {}) => {\nconst expectedDate = new Date()\n- const mockPatient = { fullName: 'test' }\nconst mockLab = {\n...{\ncode: 'L-1234',\n@@ -68,375 +60,303 @@ const render = (permissions: Permissions[], lab?: Partial<Lab>, error = {}) => {\n},\n} as any)\n- const Wrapper = ({ children }: WrapperProps) => (\n+ return {\n+ history,\n+ mockLab,\n+ expectedDate,\n+ ...render(\n<ButtonBarProvider>\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/labs/:id\">\n- <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider>\n+ <ViewLab />\n+ </titleUtil.TitleProvider>\n</Route>\n</Router>\n+ <Toaster draggable hideProgressBar />\n</Provider>\n- </ButtonBarProvider>\n- )\n-\n- const utils = rtlRender(<ViewLab />, { wrapper: Wrapper })\n-\n- return {\n- history,\n- store,\n- expectedDate,\n- expectedLab: mockLab,\n- expectedPatient: mockPatient,\n- ...utils,\n+ </ButtonBarProvider>,\n+ ),\n}\n}\ndescribe('View Lab', () => {\ndescribe('page content', () => {\nit(\"should display the patients' full name\", async () => {\n- const { expectedPatient } = render([Permissions.ViewLab])\n+ setup()\n- await waitFor(() => {\n- expect(screen.getByText('labs.lab.for')).toBeInTheDocument()\n- expect(screen.getByText(expectedPatient.fullName)).toBeInTheDocument()\n- })\n+ expect(await screen.findByRole('heading', { name: mockPatient.fullName })).toBeInTheDocument()\n})\nit('should display the lab-type', async () => {\n- const { expectedLab } = render([Permissions.ViewLab], { type: 'expected type' })\n+ const { mockLab } = setup({ type: 'expected type' })\n- await waitFor(() => {\n- expect(screen.getByRole('heading', { name: /labs.lab.type/i })).toBeInTheDocument()\n- expect(screen.getByText(expectedLab.type)).toBeInTheDocument()\n- })\n+ expect(await screen.findByRole('heading', { name: mockLab.type })).toBeInTheDocument()\n})\nit('should display the requested on date', async () => {\n- const { expectedLab } = render([Permissions.ViewLab], {\n- requestedOn: '2020-03-30T04:43:20.102Z',\n- })\n+ const { mockLab } = setup({ requestedOn: '2020-03-30T04:43:20.102Z' })\n- await waitFor(() => {\n- expect(screen.getByText('labs.lab.requestedOn')).toBeInTheDocument()\n- })\nexpect(\n- screen.getByText(format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a')),\n+ await screen.findByRole('heading', {\n+ name: format(new Date(mockLab.requestedOn), 'yyyy-MM-dd hh:mm a'),\n+ }),\n).toBeInTheDocument()\n})\nit('should not display the completed date if the lab is not completed', async () => {\nconst completedDate = new Date('2020-10-10T10:10:10.100') // We want a different date than the mocked date\n- render([Permissions.ViewLab], { completedOn: completedDate.toISOString() })\n+ setup({ completedOn: completedDate.toISOString() })\nawait waitForElementToBeRemoved(() => screen.queryByText(/loading/i))\n-\nexpect(\nscreen.queryByText(format(completedDate, 'yyyy-MM-dd HH:mm a')),\n).not.toBeInTheDocument()\n})\n- it('should not display the canceled date if the lab is not canceled', async () => {\n+ it('should not display the cancelled date if the lab is not cancelled', async () => {\nconst cancelledDate = new Date('2020-10-10T10:10:10.100') // We want a different date than the mocked date\n- render([Permissions.ViewLab], { canceledOn: cancelledDate.toISOString() })\n+ setup({ canceledOn: cancelledDate.toISOString() })\nawait waitForElementToBeRemoved(() => screen.queryByText(/loading/i))\n-\nexpect(\nscreen.queryByText(format(cancelledDate, 'yyyy-MM-dd HH:mm a')),\n).not.toBeInTheDocument()\n})\nit('should render a result text field', async () => {\n- const { expectedLab } = render([Permissions.ViewLab], { result: 'expected results' })\n+ const { mockLab } = setup({ result: 'expected results' })\n- await waitFor(() => {\nexpect(\n- screen.getByRole('textbox', {\n+ await screen.findByRole('textbox', {\nname: /labs\\.lab\\.result/i,\n}),\n- ).toHaveValue(expectedLab.result)\n- })\n+ ).toHaveValue(mockLab.result)\n})\n- it('should not display past notes if there is not', () => {\n- const { container } = render([Permissions.ViewLab], { notes: [] })\n+ it('should not display past notes if there is not', async () => {\n+ setup({ notes: [] })\n- expect(container.querySelector('.callout')).not.toBeInTheDocument()\n+ await waitForElementToBeRemoved(() => screen.queryByText(/loading/i))\n+ expect(screen.queryAllByTestId('note')).toHaveLength(0)\n})\nit('should display the past notes', async () => {\nconst expectedNotes = 'expected notes'\n- const { container } = render([Permissions.ViewLab], { notes: [expectedNotes] })\n+ setup({ notes: [expectedNotes] })\n- await waitFor(() => {\n- expect(screen.getByText(expectedNotes)).toBeInTheDocument()\n- })\n- expect(container.querySelector('.callout')).toBeInTheDocument()\n+ expect(await screen.findByTestId('note')).toHaveTextContent(expectedNotes)\n})\nit('should display the notes text field empty', async () => {\n- render([Permissions.ViewLab])\n+ setup()\n- await waitFor(() => {\n- expect(screen.getByLabelText('labs.lab.notes')).toHaveValue('')\n- })\n+ expect(await screen.findByLabelText('labs.lab.notes')).toHaveValue('')\n})\nit('should display errors', async () => {\n- render([Permissions.ViewLab, Permissions.CompleteLab], { status: 'requested' })\n-\nconst expectedError = { message: 'some message', result: 'some result feedback' } as LabError\n+ setup({ status: 'requested' }, [Permissions.ViewLab, Permissions.CompleteLab])\n+\nexpectOneConsoleError(expectedError)\njest.spyOn(validateUtil, 'validateLabComplete').mockReturnValue(expectedError)\n- await waitFor(() => {\nuserEvent.click(\n- screen.getByRole('button', {\n+ await screen.findByRole('button', {\nname: /labs\\.requests\\.complete/i,\n}),\n)\n- })\nconst alert = await screen.findByRole('alert')\nexpect(alert).toContainElement(screen.getByText(/states\\.error/i))\nexpect(alert).toContainElement(screen.getByText(/some message/i))\n-\nexpect(screen.getByLabelText(/labs\\.lab\\.result/i)).toHaveClass('is-invalid')\n})\ndescribe('requested lab request', () => {\nit('should display a warning badge if the status is requested', async () => {\n- const { expectedLab } = render([Permissions.ViewLab], { status: 'requested' })\n+ const { mockLab } = setup()\n- await waitFor(() => {\n- expect(\n- screen.getByRole('heading', {\n- name: /labs\\.lab\\.status/i,\n- }),\n- ).toBeInTheDocument()\n- expect(screen.getByText(expectedLab.status)).toBeInTheDocument()\n- })\n+ const status = await screen.findByText(mockLab.status)\n+ expect(status.closest('span')).toHaveClass('badge-warning')\n})\nit('should display a update lab, complete lab, and cancel lab button if the lab is in a requested state', async () => {\n- render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab])\n-\n- await waitFor(() => {\n- screen.getByRole('button', {\n- name: /labs\\.requests\\.update/i,\n- })\n- screen.getByRole('button', {\n- name: /labs\\.requests\\.complete/i,\n- })\n- screen.getByRole('button', {\n- name: /labs\\.requests\\.cancel/i,\n- })\n- })\n+ setup({}, [Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab])\n+\n+ expect(await screen.findAllByRole('button')).toEqual(\n+ expect.arrayContaining([\n+ screen.getByText(/labs\\.requests\\.update/i),\n+ screen.getByText(/labs\\.requests\\.complete/i),\n+ screen.getByText(/labs\\.requests\\.cancel/i),\n+ ]),\n+ )\n})\n})\ndescribe('canceled lab request', () => {\nit('should display a danger badge if the status is canceled', async () => {\n- render([Permissions.ViewLab], { status: 'canceled' })\n+ const { mockLab } = setup({ status: 'canceled' })\n- await waitFor(() => {\n- expect(\n- screen.getByRole('heading', {\n- name: /labs\\.lab\\.status/i,\n- }),\n- ).toBeInTheDocument()\n- expect(\n- screen.getByRole('heading', {\n- name: /canceled/i,\n- }),\n- ).toBeInTheDocument()\n- })\n+ const status = await screen.findByText(mockLab.status)\n+ expect(status.closest('span')).toHaveClass('badge-danger')\n})\n- it('should display the canceled on date if the lab request has been canceled', async () => {\n- const { expectedLab } = render([Permissions.ViewLab], {\n+ it('should display the cancelled on date if the lab request has been cancelled', async () => {\n+ const { mockLab } = setup({\nstatus: 'canceled',\ncanceledOn: '2020-03-30T04:45:20.102Z',\n})\n- await waitFor(() => {\n- expect(\n- screen.getByRole('heading', {\n- name: /labs\\.lab\\.canceledon/i,\n- }),\n- ).toBeInTheDocument()\nexpect(\n- screen.getByRole('heading', {\n- name: format(new Date(expectedLab.canceledOn as string), 'yyyy-MM-dd hh:mm a'),\n+ await screen.findByRole('heading', {\n+ name: format(new Date(mockLab.canceledOn as string), 'yyyy-MM-dd hh:mm a'),\n}),\n).toBeInTheDocument()\n})\n- })\nit('should not display update, complete, and cancel button if the lab is canceled', async () => {\n- render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\n+ setup(\n+ {\nstatus: 'canceled',\n- })\n+ },\n+ [Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab],\n+ )\n- await waitFor(() => {\n+ await waitForElementToBeRemoved(() => screen.queryByText(/loading/i))\nexpect(screen.queryByRole('button')).not.toBeInTheDocument()\n})\n- })\nit('should not display notes text field if the status is canceled', async () => {\n- render([Permissions.ViewLab], { status: 'canceled' })\n+ setup({ status: 'canceled' })\n- await waitFor(() => {\n- expect(screen.getByText('labs.lab.notes')).toBeInTheDocument()\n- })\n- expect(screen.queryByLabelText('labs.lab.notes')).not.toBeInTheDocument()\n+ expect(await screen.findByText(/labs\\.lab\\.notes/i)).toBeInTheDocument()\n+ expect(screen.queryByLabelText(/labs\\.lab\\.notes/i)).not.toBeInTheDocument()\n})\n})\ndescribe('completed lab request', () => {\nit('should display a primary badge if the status is completed', async () => {\n- const { expectedLab } = render([Permissions.ViewLab], { status: 'completed' })\n+ const { mockLab } = setup({ status: 'completed' })\n- await waitFor(() => {\n- expect(screen.getByRole('heading', { name: 'labs.lab.status' })).toBeInTheDocument()\n- })\n- expect(screen.getByText(expectedLab.status)).toBeInTheDocument()\n+ const status = await screen.findByText(mockLab.status)\n+ expect(status.closest('span')).toHaveClass('badge-primary')\n})\nit('should display the completed on date if the lab request has been completed', async () => {\n- const { expectedLab } = render([Permissions.ViewLab], {\n+ const { mockLab } = setup({\nstatus: 'completed',\ncompletedOn: '2020-03-30T04:44:20.102Z',\n})\n- await waitFor(() => {\n- expect(screen.getByRole('heading', { name: 'labs.lab.completedOn' })).toBeInTheDocument()\n- })\nexpect(\n- screen.getByText(\n- format(new Date(expectedLab.completedOn as string), 'yyyy-MM-dd hh:mm a'),\n+ await screen.findByText(\n+ format(new Date(mockLab.completedOn as string), 'yyyy-MM-dd hh:mm a'),\n),\n).toBeInTheDocument()\n})\nit('should not display update, complete, and cancel buttons if the lab is completed', async () => {\n- render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\n+ setup(\n+ {\nstatus: 'completed',\n- })\n+ },\n+ [Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab],\n+ )\n- await waitFor(() => {\n+ await waitForElementToBeRemoved(() => screen.queryByText(/loading/i))\nexpect(screen.queryByRole('button')).not.toBeInTheDocument()\n})\n- })\nit('should not display notes text field if the status is completed', async () => {\n- render([Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab], {\n+ setup(\n+ {\nstatus: 'completed',\n- })\n+ },\n+ [Permissions.ViewLab, Permissions.CompleteLab, Permissions.CancelLab],\n+ )\n- await waitFor(() => {\n- expect(screen.getByText('labs.lab.notes')).toBeInTheDocument()\n- })\n- expect(screen.queryByLabelText('labs.lab.notes')).not.toBeInTheDocument()\n+ expect(await screen.findByText(/labs\\.lab\\.notes/i)).toBeInTheDocument()\n+ expect(screen.queryByLabelText(/labs\\.lab\\.notes/i)).not.toBeInTheDocument()\n})\n})\n})\ndescribe('on update', () => {\nit('should update the lab with the new information', async () => {\n- const { history, expectedLab } = render([Permissions.ViewLab])\n+ const { history } = setup()\nconst expectedResult = 'expected result'\nconst newNotes = 'expected notes'\n- const resultTextField = await screen.findByLabelText('labs.lab.result')\n-\n+ const resultTextField = await screen.findByLabelText(/labs\\.lab\\.result/i)\nuserEvent.type(resultTextField, expectedResult)\nconst notesTextField = screen.getByLabelText('labs.lab.notes')\nuserEvent.type(notesTextField, newNotes)\n- const updateButton = screen.getByRole('button', {\n+ userEvent.click(\n+ screen.getByRole('button', {\nname: /labs\\.requests\\.update/i,\n- })\n- userEvent.click(updateButton)\n-\n- const expectedNotes = expectedLab.notes ? [...expectedLab.notes, newNotes] : [newNotes]\n+ }),\n+ )\nawait waitFor(() => {\n- expect(LabRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n- expect(LabRepository.saveOrUpdate).toHaveBeenCalledWith(\n- expect.objectContaining({ ...expectedLab, result: expectedResult, notes: expectedNotes }),\n- )\nexpect(history.location.pathname).toEqual('/labs/12456')\n})\n+ expect(screen.getByLabelText(/labs\\.lab\\.result/i)).toHaveTextContent(expectedResult)\n+ expect(screen.getByTestId('note')).toHaveTextContent(newNotes)\n})\n})\ndescribe('on complete', () => {\nit('should mark the status as completed and fill in the completed date with the current time', async () => {\n- const { history, expectedLab, expectedDate } = render([\n+ const { history } = setup({}, [\nPermissions.ViewLab,\nPermissions.CompleteLab,\nPermissions.CancelLab,\n])\nconst expectedResult = 'expected result'\n- const resultTextField = await screen.findByLabelText('labs.lab.result')\n-\n- userEvent.type(resultTextField, expectedResult)\n-\n- const completeButton = screen.getByRole('button', {\n- name: 'labs.requests.complete',\n- })\n-\n- userEvent.click(completeButton)\n+ userEvent.type(await screen.findByLabelText(/labs\\.lab\\.result/i), expectedResult)\n- await waitFor(() => {\n- expect(LabRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n- expect(LabRepository.saveOrUpdate).toHaveBeenCalledWith(\n- expect.objectContaining({\n- ...expectedLab,\n- result: expectedResult,\n- status: 'completed',\n- completedOn: expectedDate.toISOString(),\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /labs\\.requests\\.complete/i,\n}),\n)\n+\n+ await waitFor(() => {\nexpect(history.location.pathname).toEqual('/labs/12456')\n})\n+ expect(await screen.findByRole('alert')).toBeInTheDocument()\n+ expect(\n+ within(screen.getByRole('alert')).getByText(/labs\\.successfullyCompleted/i),\n+ ).toBeInTheDocument()\n})\n})\ndescribe('on cancel', () => {\n- it('should mark the status as canceled and fill in the cancelled on date with the current time', async () => {\n- const { history, expectedLab, expectedDate } = render([\n+ // integration test candidate; after 'cancelled' route goes to <Labs />\n+ // 'should mark the status as canceled and fill in the cancelled on date with the current time'\n+ it('should mark the status as canceled and redirect to /labs', async () => {\n+ const { history } = setup({}, [\nPermissions.ViewLab,\nPermissions.CompleteLab,\nPermissions.CancelLab,\n])\nconst expectedResult = 'expected result'\n- const resultTextField = await screen.findByLabelText('labs.lab.result')\n-\n- userEvent.type(resultTextField, expectedResult)\n-\n- const completeButton = screen.getByRole('button', {\n- name: 'labs.requests.cancel',\n- })\n-\n- userEvent.click(completeButton)\n+ userEvent.type(await screen.findByLabelText(/labs\\.lab\\.result/i), expectedResult)\n- await waitFor(() => {\n- expect(LabRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n- expect(LabRepository.saveOrUpdate).toHaveBeenCalledWith(\n- expect.objectContaining({\n- ...expectedLab,\n- result: expectedResult,\n- status: 'canceled',\n- canceledOn: expectedDate.toISOString(),\n+ userEvent.click(\n+ screen.getByRole('button', {\n+ name: /labs\\.requests\\.cancel/i,\n}),\n)\n+\n+ await waitFor(() => {\nexpect(history.location.pathname).toEqual('/labs')\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/labs/ViewLab.tsx", "new_path": "src/labs/ViewLab.tsx", "diff": "@@ -185,7 +185,7 @@ const ViewLab = () => {\nif (labToView.notes && labToView.notes[0] !== '') {\nreturn labToView.notes.map((note: string) => (\n<Callout key={uuid()} data-test=\"note\" color=\"info\">\n- <p>{note}</p>\n+ <p data-testid=\"note\">{note}</p>\n</Callout>\n))\n}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/imagings/hooks/useRequestImaging.tsx", "new_path": "src/imagings/hooks/useRequestImaging.tsx", "diff": "@@ -14,7 +14,8 @@ export interface ImagingRequest {\ntype: string\n}\n-async function requestImaging(request: ImagingRequest): Promise<void> {\n+function requestImagingWrapper(user: any) {\n+ return async function requestImaging(request: ImagingRequest): Promise<void> {\nconst error = validateImagingRequest(request)\nif (!isEmpty(error)) {\n@@ -23,13 +24,14 @@ async function requestImaging(request: ImagingRequest): Promise<void> {\nawait ImagingRepository.save({\n...request,\n- requestedBy: 'test',\n+ requestedBy: user?.fullName || '',\nrequestedOn: new Date(Date.now()).toISOString(),\n} as Imaging)\n}\n+}\n-export default function useRequestImaging() {\n- return useMutation(requestImaging, {\n+export default function useRequestImaging(user: any) {\n+ return useMutation(requestImagingWrapper(user), {\nonSuccess: async () => {\nawait queryCache.invalidateQueries('imagings')\n},\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/requests/NewImagingRequest.tsx", "new_path": "src/imagings/requests/NewImagingRequest.tsx", "diff": "import { Typeahead, Label, Button, Alert, Column, Row } from '@hospitalrun/components'\nimport format from 'date-fns/format'\nimport React, { useState, useEffect } from 'react'\n+import { useSelector } from 'react-redux'\nimport { useHistory } from 'react-router-dom'\nimport useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'\n@@ -13,17 +14,20 @@ import TextInputWithLabelFormGroup from '../../shared/components/input/TextInput\nimport PatientRepository from '../../shared/db/PatientRepository'\nimport useTranslator from '../../shared/hooks/useTranslator'\nimport Patient from '../../shared/model/Patient'\n+import { RootState } from '../../shared/store'\nimport useRequestImaging, { ImagingRequest } from '../hooks/useRequestImaging'\nimport { ImagingRequestError } from '../util/validate-imaging-request'\nconst NewImagingRequest = () => {\nconst { t } = useTranslator()\nconst history = useHistory()\n+ const { user } = useSelector((state: RootState) => state.user)\n+\nconst updateTitle = useUpdateTitle()\nuseEffect(() => {\nupdateTitle(t('imagings.requests.new'))\n})\n- const [mutate] = useRequestImaging()\n+ const [mutate] = useRequestImaging(user)\nconst [error, setError] = useState<ImagingRequestError>()\nconst [visitOption, setVisitOption] = useState([] as Option[])\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLabs.test.tsx", "new_path": "src/__tests__/labs/ViewLabs.test.tsx", "diff": "@@ -41,22 +41,21 @@ const setup = (permissions: Permissions[] = []) => {\n},\n} as any)\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ return {\n+ expectedLab,\n+ history,\n+ ...render(\n<Provider store={store}>\n<Router history={history}>\n<ButtonBarProvider.ButtonBarProvider>\n<ButtonToolbar />\n- <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider>\n+ <ViewLabs />\n+ </titleUtil.TitleProvider>\n</ButtonBarProvider.ButtonBarProvider>\n</Router>\n- </Provider>\n- )\n-\n- return {\n- expectedLab,\n- history,\n- ...render(<ViewLabs />, { wrapper: Wrapper }),\n+ </Provider>,\n+ ),\n}\n}\n@@ -69,9 +68,9 @@ describe('View Labs', () => {\nit('should display button to add new lab request', async () => {\nsetup([Permissions.ViewLab, Permissions.RequestLab])\n- await waitFor(() => {\n- expect(screen.getByRole('button', { name: /labs\\.requests\\.new/i })).toBeInTheDocument()\n- })\n+ expect(\n+ await screen.findByRole('button', { name: /labs\\.requests\\.new/i }),\n+ ).toBeInTheDocument()\n})\nit('should not display button to add new lab request if the user does not have permissions', async () => {\n@@ -85,24 +84,20 @@ describe('View Labs', () => {\nit('should render a table with data', async () => {\nconst { expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\n- expect(screen.getByRole('columnheader', { name: /labs.lab.code/i })).toBeInTheDocument()\n- expect(screen.getByRole('columnheader', { name: /labs.lab.type/i })).toBeInTheDocument()\n- expect(\n- screen.getByRole('columnheader', { name: /labs.lab.requestedOn/i }),\n- ).toBeInTheDocument()\n-\n- expect(\n- await screen.findByRole('columnheader', { name: /labs.lab.status/i }),\n- ).toBeInTheDocument()\n+ const headers = await screen.findAllByRole('columnheader')\n+ const cells = screen.getAllByRole('cell')\n+\n+ expect(headers[0]).toHaveTextContent(/labs\\.lab\\.code/i)\n+ expect(headers[1]).toHaveTextContent(/labs\\.lab\\.type/i)\n+ expect(headers[2]).toHaveTextContent(/labs\\.lab\\.requestedOn/i)\n+ expect(headers[3]).toHaveTextContent(/labs\\.lab\\.status/i)\n+ expect(cells[0]).toHaveTextContent(expectedLab.code)\n+ expect(cells[1]).toHaveTextContent(expectedLab.type)\n+ expect(cells[2]).toHaveTextContent(\n+ format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a'),\n+ )\n+ expect(cells[3]).toHaveTextContent(expectedLab.status)\nexpect(screen.getByRole('button', { name: /actions.view/i })).toBeInTheDocument()\n- expect(screen.getByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\n- expect(screen.getByRole('cell', { name: expectedLab.type })).toBeInTheDocument()\n- expect(screen.getByRole('cell', { name: expectedLab.status })).toBeInTheDocument()\n- expect(\n- screen.getByRole('cell', {\n- name: format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a'),\n- }),\n- ).toBeInTheDocument()\n})\nit('should navigate to the lab when the view button is clicked', async () => {\n@@ -125,30 +120,40 @@ describe('View Labs', () => {\nscreen.getByRole('combobox'),\n`{selectall}{backspace}${expectedStatus}{arrowdown}{enter}`,\n)\n-\n- expect(LabRepository.search).toHaveBeenCalledTimes(2)\n- expect(LabRepository.search).toHaveBeenCalledWith(\n- expect.objectContaining({ status: expectedStatus }),\n- )\n+ expect(screen.getByRole('combobox')).toHaveValue('labs.status.requested')\n})\n})\ndescribe('search functionality', () => {\nit('should search for labs after the search text has not changed for 500 milliseconds', async () => {\n+ const expectedLab2 = {\n+ code: 'L-5678',\n+ id: '5678',\n+ type: 'another type',\n+ patient: 'patientIdB',\n+ status: 'requested',\n+ requestedOn: '2020-03-30T04:43:20.102Z',\n+ } as Lab\n+ const { expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\n+ jest.spyOn(LabRepository, 'findAll').mockReset()\n+ jest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab, expectedLab2])\n+\n+ expect(await screen.findByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\njest.useFakeTimers()\n- setup([Permissions.ViewLabs])\n- const expectedSearchText = 'search text'\n+ const expectedSearchText = 'another'\nuserEvent.type(screen.getByRole('textbox', { name: /labs.search/i }), expectedSearchText)\n-\nact(() => {\njest.advanceTimersByTime(500)\n})\n- expect(LabRepository.search).toHaveBeenCalledTimes(1)\n- expect(LabRepository.search).toHaveBeenCalledWith(\n- expect.objectContaining({ text: expectedSearchText }),\n- )\n+ // expect(LabRepository.search).toHaveBeenCalledTimes(1)\n+ // expect(LabRepository.search).toHaveBeenCalledWith(\n+ // expect.objectContaining({ text: expectedSearchText }),\n+ // )\n+\n+ expect(await screen.findByRole('cell', { name: /another/i })).toBeInTheDocument()\n+ expect(screen.queryByRole('cell', { name: expectedLab.code })).not.toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLabs.test.tsx", "new_path": "src/__tests__/labs/ViewLabs.test.tsx", "diff": "@@ -134,25 +134,21 @@ describe('View Labs', () => {\nstatus: 'requested',\nrequestedOn: '2020-03-30T04:43:20.102Z',\n} as Lab\n+ const expectedSearchText = 'another'\nconst { expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\n- jest.spyOn(LabRepository, 'findAll').mockReset()\n- jest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab, expectedLab2])\n+\n+ jest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab2])\nexpect(await screen.findByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\njest.useFakeTimers()\n- const expectedSearchText = 'another'\nuserEvent.type(screen.getByRole('textbox', { name: /labs.search/i }), expectedSearchText)\n+\nact(() => {\njest.advanceTimersByTime(500)\n})\n- // expect(LabRepository.search).toHaveBeenCalledTimes(1)\n- // expect(LabRepository.search).toHaveBeenCalledWith(\n- // expect.objectContaining({ text: expectedSearchText }),\n- // )\n-\n- expect(await screen.findByRole('cell', { name: /another/i })).toBeInTheDocument()\n+ expect(await screen.findByText(/another/i)).toBeInTheDocument()\nexpect(screen.queryByRole('cell', { name: expectedLab.code })).not.toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/HospitalRun.test.tsx", "new_path": "src/__tests__/HospitalRun.test.tsx", "diff": "@@ -40,14 +40,13 @@ describe('HospitalRun', () => {\n</Provider>,\n)\n- return { ...results, store: store as any }\n+ return { ...results, store }\n}\ndescribe('routing', () => {\ndescribe('/appointments', () => {\nit('should render the appointments screen when /appointments is accessed', () => {\n- const permissions: Permissions[] = [Permissions.ReadAppointments]\n- const { store } = setup('/appointments', permissions)\n+ const { store } = setup('/appointments', [Permissions.ReadAppointments])\nexpect(\nscreen.getByRole('button', { name: /scheduling.appointments.new/i }),\n@@ -63,16 +62,16 @@ describe('HospitalRun', () => {\nit('should render the Dashboard when the user does not have read appointment privileges', () => {\nsetup('/appointments')\n- const main = screen.getByRole('main')\n- expect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n+\n+ expect(screen.getByRole('heading', { name: /dashboard/i })).toBeInTheDocument()\n+ expect(window.location.pathname).toBe('/')\n})\n})\ndescribe('/labs', () => {\nit('should render the Labs component when /labs is accessed', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\n- const permissions: Permissions[] = [Permissions.ViewLabs]\n- setup('/labs', permissions)\n+ setup('/labs', [Permissions.ViewLabs])\nconst table = screen.getByRole('table')\nexpect(within(table).getByText(/labs.lab.code/i)).toBeInTheDocument()\n@@ -85,16 +84,16 @@ describe('HospitalRun', () => {\nit('should render the dashboard if the user does not have permissions to view labs', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\nsetup('/labs')\n- const main = screen.getByRole('main')\n- expect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n+\n+ expect(screen.getByRole('heading', { name: /dashboard/i })).toBeInTheDocument()\n+ expect(window.location.pathname).toBe('/')\n})\n})\ndescribe('/medications', () => {\nit('should render the Medications component when /medications is accessed', () => {\njest.spyOn(MedicationRepository, 'search').mockResolvedValue([])\n- const permissions: Permissions[] = [Permissions.ViewMedications]\n- setup('/medications', permissions)\n+ setup('/medications', [Permissions.ViewMedications])\nconst medicationInput = screen.getByRole(/combobox/i) as HTMLInputElement\nexpect(medicationInput.value).toBe('medications.filter.all')\n@@ -105,10 +104,8 @@ describe('HospitalRun', () => {\njest.spyOn(MedicationRepository, 'findAll').mockResolvedValue([])\nsetup('/medications')\n- const main = screen.getByRole('main')\n- expect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n- expect(screen.queryByLabelText(/medications.search/i)).not.toBeInTheDocument()\n- expect(screen.queryByRole(/combobox/i)).not.toBeInTheDocument()\n+ expect(screen.getByRole('heading', { name: /dashboard/i })).toBeInTheDocument()\n+ expect(window.location.pathname).toBe('/')\n})\n})\n@@ -127,12 +124,8 @@ describe('HospitalRun', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\nsetup('/incidents')\n- const main = screen.getByRole('main')\n- expect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n- expect(screen.queryByRole(/combobox/i)).not.toBeInTheDocument()\n- expect(\n- screen.queryByRole('button', { name: /incidents.reports.new/i }),\n- ).not.toBeInTheDocument()\n+ expect(screen.getByRole('heading', { name: /dashboard/i })).toBeInTheDocument()\n+ expect(window.location.pathname).toBe('/')\n})\n})\n@@ -142,16 +135,15 @@ describe('HospitalRun', () => {\nconst permissions: Permissions[] = [Permissions.ViewImagings]\nsetup('/imaging', permissions)\n- expect(screen.getByRole('main')).toBeInTheDocument()\n- expect(screen.queryByRole('heading', { name: /example/i })).not.toBeInTheDocument()\n+ expect(screen.getByRole('heading', { name: /imagings.label/i })).toBeInTheDocument()\n})\nit('should render the dashboard if the user does not have permissions to view imagings', () => {\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([])\nsetup('/imaging')\n- const main = screen.getByRole('main')\n- expect(within(main).getByRole('heading', { name: /example/i })).toBeInTheDocument()\n+ expect(screen.getByRole('heading', { name: /dashboard/i })).toBeInTheDocument()\n+ expect(window.location.pathname).toBe('/')\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/Incidents.test.tsx", "new_path": "src/__tests__/incidents/Incidents.test.tsx", "diff": "-import { render as rtlRender, screen, waitForElementToBeRemoved } from '@testing-library/react'\n-import React, { ReactNode } from 'react'\n+import { render, screen, waitFor } from '@testing-library/react'\n+import { createMemoryHistory } from 'history'\n+import React from 'react'\nimport { Provider } from 'react-redux'\n-import { MemoryRouter } from 'react-router-dom'\n+import { Router, Route } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\nimport thunk from 'redux-thunk'\n@@ -14,12 +15,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-\n-describe('Incidents', () => {\nconst expectedIncident = {\nid: '1234',\ncode: '1234',\n@@ -28,67 +23,82 @@ describe('Incidents', () => {\nreportedBy: 'some user',\n} as Incident\n- function render(permissions: Permissions[], path: string) {\n+function setup(permissions: Permissions[], path: string) {\njest.spyOn(IncidentRepository, 'search').mockResolvedValue([])\njest.spyOn(IncidentRepository, 'find').mockResolvedValue(expectedIncident)\n+\nconst store = mockStore({\nuser: { permissions },\nbreadcrumbs: { breadcrumbs: [] },\ncomponents: { sidebarCollapsed: false },\n} as any)\n+ const history = createMemoryHistory({ initialEntries: [path] })\n- function Wrapper({ children }: WrapperProps) {\n- return (\n+ return {\n+ history,\n+ ...render(\n<Provider store={store}>\n- <MemoryRouter initialEntries={[path]}>\n- <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n- </MemoryRouter>\n- </Provider>\n- )\n+ <Router history={history}>\n+ <Route path=\"/incidents/:id\">\n+ <titleUtil.TitleProvider>\n+ <Incidents />\n+ </titleUtil.TitleProvider>\n+ </Route>\n+ </Router>\n+ </Provider>,\n+ ),\n}\n-\n- return rtlRender(<Incidents />, { wrapper: Wrapper })\n}\n+describe('Incidents', () => {\ndescribe('routing', () => {\ndescribe('/incidents/new', () => {\nit('The new incident screen when /incidents/new is accessed', () => {\n- render([Permissions.ReportIncident], '/incidents/new')\n+ setup([Permissions.ReportIncident], '/incidents/new')\n+\nexpect(screen.getByRole('form', { name: /report incident form/i })).toBeInTheDocument()\n})\n- it('should not navigate to /incidents/new if the user does not have ReportIncident permissions', () => {\n- const { container } = render([], '/incidents/new')\n- expect(container).toMatchInlineSnapshot(`<div />`)\n+ it('should not navigate to /incidents/new if the user does not have ReportIncident permissions', async () => {\n+ const { history } = setup([], '/incidents/new')\n+\n+ await waitFor(() => {\n+ expect(history.location.pathname).toBe('/')\n+ })\n})\n})\ndescribe('/incidents/visualize', () => {\nit('The incident visualize screen when /incidents/visualize is accessed', async () => {\n- const { container } = render([Permissions.ViewIncidentWidgets], '/incidents/visualize')\n- await waitForElementToBeRemoved(() => container.querySelector('.css-1jydqjy'))\n+ const { container } = setup([Permissions.ViewIncidentWidgets], '/incidents/visualize')\n+\n+ await waitFor(() => {\nexpect(container.querySelector('canvas')).toBeInTheDocument()\n})\n+ })\n+\n+ it('should not navigate to /incidents/visualize if the user does not have ViewIncidentWidgets permissions', async () => {\n+ const { history } = setup([], '/incidents/visualize')\n- it('should not navigate to /incidents/visualize if the user does not have ViewIncidentWidgets permissions', () => {\n- const { container } = render([], '/incidents/visualize')\n- expect(container).toMatchInlineSnapshot(`<div />`)\n+ await waitFor(() => {\n+ expect(history.location.pathname).toBe('/')\n+ })\n})\n})\ndescribe('/incidents/:id', () => {\nit('The view incident screen when /incidents/:id is accessed', async () => {\n- const { container } = render(\n- [Permissions.ViewIncident],\n- `/incidents/${expectedIncident.id}`,\n- )\n- await waitForElementToBeRemoved(() => container.querySelector('.css-1jydqjy'))\n- expect(screen.getByText(expectedIncident.reportedBy)).toBeInTheDocument()\n+ setup([Permissions.ViewIncident], `/incidents/${expectedIncident.id}`)\n+\n+ expect(await screen.findByText(expectedIncident.reportedBy)).toBeInTheDocument()\n})\nit('should not navigate to /incidents/:id if the user does not have ViewIncident permissions', async () => {\n- const { container } = render([], `/incidents/${expectedIncident.id}`)\n- expect(container).toMatchInlineSnapshot(`<div />`)\n+ const { history } = setup([], `/incidents/${expectedIncident.id}`)\n+\n+ await waitFor(() => {\n+ expect(history.location.pathname).toBe('/')\n+ })\n})\n})\n})\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 */\nimport { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n@@ -57,7 +56,7 @@ describe('Report Incident', () => {\n</ButtonBarProvider.ButtonBarProvider>,\n)\n}\n- test('type into department field', async () => {\n+ it('type into department field', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n@@ -68,7 +67,7 @@ describe('Report Incident', () => {\nexpect(depInput).toHaveDisplayValue('Engineering Bay')\n})\n- test('type into category field', async () => {\n+ it('type into category field', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n@@ -79,7 +78,7 @@ describe('Report Incident', () => {\nexpect(catInput).toHaveDisplayValue('Warp Engine')\n})\n- test('type into category item field', async () => {\n+ it('type into category item field', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\n@@ -90,7 +89,7 @@ describe('Report Incident', () => {\nexpect(catItemInput).toHaveDisplayValue('Warp Coil')\n})\n- test('type into description field', async () => {\n+ it('type into description field', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst inputArr = await screen.findAllByRole('textbox', { name: /required/i })\nconst descInput = inputArr[inputArr.length - 1]\n@@ -101,7 +100,8 @@ describe('Report Incident', () => {\nuserEvent.type(descInput, 'Geordi requested analysis')\nexpect(descInput).toHaveDisplayValue('Geordi requested analysis')\n})\n- test('action save after all the input fields are filled out', async () => {\n+\n+ it('action save after all the input fields are filled out', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\nconst catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n@@ -151,19 +151,14 @@ describe('Report Incident', () => {\nconst invalidInputs = container.querySelectorAll('.is-invalid')\nexpect(invalidInputs).toHaveLength(5)\n- // expect(dateInput).toBeInvalid()\nexpect(dateInput).toHaveClass('is-invalid')\n- // expect(depInput).toBeInvalid()\nexpect(depInput).toHaveClass('is-invalid')\n- // expect(catInput).toBeInvalid()\nexpect(catInput).toHaveClass('is-invalid')\n- // expect(catItemInput).toBeInvalid()\nexpect(catItemInput).toHaveClass('is-invalid')\n- // expect(descInput).toBeInvalid()\nexpect(descInput).toHaveClass('is-invalid')\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "new_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "diff": "@@ -8,17 +8,16 @@ import thunk from 'redux-thunk'\nimport ViewIncident from '../../../incidents/view/ViewIncident'\nimport * as breadcrumbUtil from '../../../page-header/breadcrumbs/useAddBreadcrumbs'\n-import * as ButtonBarProvider from '../../../page-header/button-toolbar/ButtonBarProvider'\n-import * as titleUtil from '../../../page-header/title/TitleContext'\n+import { ButtonBarProvider } from '../../../page-header/button-toolbar/ButtonBarProvider'\n+import { TitleProvider } from '../../../page-header/title/TitleContext'\nimport IncidentRepository from '../../../shared/db/IncidentRepository'\nimport Incident from '../../../shared/model/Incident'\nimport Permissions from '../../../shared/model/Permissions'\nimport { RootState } from '../../../shared/store'\n-const { TitleProvider } = titleUtil\nconst mockStore = createMockStore<RootState, any>([thunk])\n-const setup = (permissions: any[] | undefined, id: string | undefined) => {\n+const setup = (permissions: Permissions[], id: string | undefined) => {\njest.resetAllMocks()\njest.spyOn(breadcrumbUtil, 'default')\njest.spyOn(IncidentRepository, 'find').mockResolvedValue({\n@@ -27,17 +26,18 @@ const setup = (permissions: any[] | undefined, id: string | undefined) => {\ncode: 'some code',\nreportedOn: new Date().toISOString(),\n} as Incident)\n- const history = createMemoryHistory()\n- history.push(`/incidents/${id}`)\n+ const history = createMemoryHistory({ initialEntries: [`/incidents/${id}`] })\nconst store = mockStore({\nuser: {\npermissions,\n},\n} as any)\n- const renderResults = render(\n- <ButtonBarProvider.ButtonBarProvider>\n+ return {\n+ history,\n+ ...render(\n+ <ButtonBarProvider>\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/incidents/:id\">\n@@ -47,14 +47,13 @@ const setup = (permissions: any[] | undefined, id: string | undefined) => {\n</Route>\n</Router>\n</Provider>\n- </ButtonBarProvider.ButtonBarProvider>,\n- )\n-\n- return { ...renderResults, history }\n+ </ButtonBarProvider>,\n+ ),\n+ }\n}\n-it('smoke test ViewIncidentDetails no Permissions', async () => {\n- setup(undefined, '1234')\n+it('smoke tests ViewIncidentDetails when there are no Permissions', async () => {\n+ setup([], '1234')\nexpect(\nscreen.queryByRole('heading', {\n@@ -63,7 +62,7 @@ it('smoke test ViewIncidentDetails no Permissions', async () => {\n).not.toBeInTheDocument()\n})\n-it('smoke test ViewIncidentDetails no ID', async () => {\n+it('smoke tests ViewIncidentDetails when there is no ID', async () => {\nsetup([Permissions.ReportIncident, Permissions.ResolveIncident], undefined)\nexpect(\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/view/ViewIncidentDetails.test.tsx", "new_path": "src/__tests__/incidents/view/ViewIncidentDetails.test.tsx", "diff": "@@ -13,6 +13,7 @@ import Permissions from '../../../shared/model/Permissions'\ndescribe('View Incident Details', () => {\nconst expectedDate = new Date(2020, 5, 1, 19, 48)\n+ const reportedDate = new Date(2020, 5, 1, 19, 50)\nconst expectedResolveDate = new Date()\nlet incidentRepositorySaveSpy: any\nconst expectedIncidentId = '1234'\n@@ -22,10 +23,9 @@ describe('View Incident Details', () => {\ndepartment: 'some department',\ndescription: 'some description',\ncategory: 'some category',\n- categoryItem: 'some category item',\nstatus: 'reported',\nreportedBy: 'some user id',\n- reportedOn: expectedDate.toISOString(),\n+ reportedOn: reportedDate.toISOString(),\ndate: expectedDate.toISOString(),\n} as Incident\n@@ -52,6 +52,56 @@ describe('View Incident Details', () => {\nreturn { ...renderResults, history }\n}\n+ describe('view details', () => {\n+ it('should render the date of the incident', async () => {\n+ setup(expectedIncident, [Permissions.ViewIncident])\n+ expect(\n+ await screen.findByRole('heading', {\n+ name: /incidents\\.reports\\.dateofincident/i,\n+ }),\n+ ).toBeInTheDocument()\n+\n+ expect(\n+ await screen.findByRole('heading', { name: /2020-06-01 07:48 PM/i }),\n+ ).toBeInTheDocument()\n+ })\n+\n+ it('should render the status of the incident', async () => {\n+ setup(expectedIncident, [Permissions.ViewIncident])\n+\n+ expect(\n+ await screen.findByRole('heading', {\n+ name: /incidents\\.reports\\.status/i,\n+ }),\n+ ).toBeInTheDocument()\n+\n+ expect(await screen.findByRole('heading', { name: 'reported' })).toBeInTheDocument()\n+ })\n+\n+ it('should render who reported the incident', async () => {\n+ setup(expectedIncident, [Permissions.ViewIncident])\n+\n+ expect(\n+ await screen.findByRole('heading', {\n+ name: /incidents\\.reports\\.reportedby/i,\n+ }),\n+ ).toBeInTheDocument()\n+\n+ expect(await screen.findByRole('heading', { name: 'some user id' }))\n+ })\n+ it('should render the date the incident was reported', async () => {\n+ setup(expectedIncident, [Permissions.ViewIncident])\n+\n+ expect(\n+ await screen.findByRole('heading', {\n+ name: /incidents\\.reports\\.reportedon/i,\n+ }),\n+ ).toBeInTheDocument()\n+\n+ expect(\n+ await screen.findByRole('heading', { name: /2020-06-01 07:50 PM/i }),\n+ ).toBeInTheDocument()\n+ })\ntest('type into department field', async () => {\nsetup(expectedIncident, [Permissions.ViewIncident, Permissions.ResolveIncident])\n@@ -65,6 +115,7 @@ describe('View Incident Details', () => {\ntest('type into category field', async () => {\nsetup(expectedIncident, [Permissions.ViewIncident, Permissions.ResolveIncident])\n+\nexpect(\nawait screen.findByRole('textbox', {\nname: /incidents\\.reports\\.category\\b/i,\n@@ -123,3 +174,4 @@ describe('View Incident Details', () => {\n})\n})\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": "@@ -86,6 +86,7 @@ describe('Add Diagnosis Modal', () => {\ndiagnoses: [expect.objectContaining({ name: 'yellow polka dot spots' })],\n}),\n)\n+ expect(await screen.queryByRole('dialogue')).not.toBeInTheDocument()\n})\nit('should call the on close function when the cancel button is clicked', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "new_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "diff": "@@ -18,21 +18,21 @@ const mockStore = createMockStore<RootState, any>([thunk])\nconst patient = {\nid: '123',\n- prefix: 'prefix',\n- givenName: 'givenName',\n- familyName: 'familyName',\n- suffix: 'suffix',\n- fullName: 'givenName familyName suffix',\n+ prefix: 'Dr',\n+ givenName: 'Bruce',\n+ familyName: 'Banner',\n+ suffix: 'MD',\n+ fullName: 'Bruce Banner MD',\nsex: 'male',\ntype: 'charity',\n- occupation: 'occupation',\n- preferredLanguage: 'preferredLanguage',\n+ occupation: 'The Hulk',\n+ preferredLanguage: 'Hulk lingo',\nphoneNumbers: [{ value: '123456789', id: '789' }],\n- emails: [{ value: '[email protected]', id: '456' }],\n+ emails: [{ value: '[email protected]', id: '456' }],\naddresses: [{ value: 'address', id: '123' }],\ncode: 'P00001',\ndateOfBirth: subDays(new Date(), 2).toISOString(),\n- index: 'givenName familyName suffixP00001',\n+ index: 'Bruce Banner MDP00001',\n} as Patient\nconst setup = () => {\n@@ -76,6 +76,8 @@ describe('Edit Patient', () => {\nawait waitFor(() => {\nexpect(PatientRepository.find).toHaveBeenCalledWith(patient.id)\n})\n+\n+ expect(screen.getByPlaceholderText(/patient.givenName/i)).toHaveValue(patient.givenName)\n})\nit('should dispatch updatePatient when save button is clicked', async () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/view/ViewIncidentDetails.test.tsx", "new_path": "src/__tests__/incidents/view/ViewIncidentDetails.test.tsx", "diff": "@@ -23,6 +23,7 @@ describe('View Incident Details', () => {\ndepartment: 'some department',\ndescription: 'some description',\ncategory: 'some category',\n+ categoryItem: 'some categoryItem',\nstatus: 'reported',\nreportedBy: 'some user id',\nreportedOn: reportedDate.toISOString(),\n@@ -52,7 +53,8 @@ describe('View Incident Details', () => {\nreturn { ...renderResults, history }\n}\n- describe('view details', () => {\n+ describe('view incident details', () => {\n+ describe('view incident details header', () => {\nit('should render the date of the incident', async () => {\nsetup(expectedIncident, [Permissions.ViewIncident])\nexpect(\n@@ -102,47 +104,47 @@ describe('View Incident Details', () => {\nawait screen.findByRole('heading', { name: /2020-06-01 07:50 PM/i }),\n).toBeInTheDocument()\n})\n- test('type into department field', async () => {\n- setup(expectedIncident, [Permissions.ViewIncident, Permissions.ResolveIncident])\n+ })\n+ describe('form elements should not be editable', () => {\n+ it('should render the department input with label and display value', async () => {\n+ setup(expectedIncident, [Permissions.ViewIncident])\n+ expect(await screen.findByText(/incidents\\.reports\\.department/i)).toBeInTheDocument()\nexpect(\nawait screen.findByRole('textbox', { name: /incidents\\.reports\\.department/i }),\n- ).toBeInTheDocument()\n+ ).not.toBeEnabled()\n+\nexpect(\nawait screen.findByRole('textbox', { name: /incidents\\.reports\\.department/i }),\n- ).not.toBeEnabled()\n+ ).toHaveDisplayValue('some department')\n})\n- test('type into category field', async () => {\n+ it('should render the category input with label and display value', async () => {\nsetup(expectedIncident, [Permissions.ViewIncident, Permissions.ResolveIncident])\n+ expect(await screen.findByText(/incidents\\.reports\\.category$/i)).toBeInTheDocument()\nexpect(\n- await screen.findByRole('textbox', {\n- name: /incidents\\.reports\\.category\\b/i,\n- }),\n- ).toBeInTheDocument()\n- expect(\n- screen.getByRole('textbox', {\n- name: /incidents\\.reports\\.category\\b/i,\n- }),\n+ await screen.findByRole('textbox', { name: /incidents\\.reports\\.category$/i }),\n).not.toBeEnabled()\n- })\n- test('type into category item field', async () => {\n- setup(expectedIncident, [Permissions.ViewIncident, Permissions.ResolveIncident])\nexpect(\n- await screen.findByRole('textbox', {\n- name: /incidents\\.reports\\.categoryitem/i,\n- }),\n- ).toBeInTheDocument()\n+ await screen.findByRole('textbox', { name: /incidents\\.reports\\.category$/i }),\n+ ).toHaveDisplayValue('some category')\n+ })\n+ it('should render the categoryItem input with label and display value', async () => {\n+ setup(expectedIncident, [Permissions.ViewIncident, Permissions.ResolveIncident])\n+ expect(await screen.findByText(/incidents\\.reports\\.categoryItem$/i)).toBeInTheDocument()\n+\nexpect(\n- screen.getByRole('textbox', {\n- name: /incidents\\.reports\\.categoryitem/i,\n- }),\n+ await screen.findByRole('textbox', { name: /incidents\\.reports\\.categoryItem$/i }),\n).not.toBeEnabled()\n+\n+ expect(\n+ await screen.findByRole('textbox', { name: /incidents\\.reports\\.categoryItem$/i }),\n+ ).toHaveDisplayValue('some categoryItem')\n})\n- test('type into description field', async () => {\n+ it('should render the description input with label and display value', async () => {\nsetup(expectedIncident, [Permissions.ViewIncident, Permissions.ResolveIncident])\nexpect(\nawait screen.findByRole('textbox', {\n@@ -154,8 +156,12 @@ describe('View Incident Details', () => {\nname: /incidents\\.reports\\.description/i,\n}),\n).not.toBeEnabled()\n- })\n+ expect(\n+ await screen.findByRole('textbox', { name: /incidents\\.reports\\.description/i }),\n+ ).toHaveDisplayValue('some description')\n+ })\n+ })\ndescribe('on resolve', () => {\nit('should mark the status as resolved and fill in the resolved date with the current time', async () => {\nconst { history } = setup(expectedIncident, [\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/medications/requests/NewMedicationRequest.tsx", "new_path": "src/medications/requests/NewMedicationRequest.tsx", "diff": "@@ -147,7 +147,7 @@ const NewMedicationRequest = () => {\nvalue={newMedicationRequest.medication}\nonChange={onMedicationChange}\n/>\n- <div className=\"form-group\">\n+ <div className=\"form-group\" data-testid=\"status-field\">\n<SelectWithLabelFormGroup\nname=\"status\"\nlabel={t('medications.medication.status')}\n@@ -160,7 +160,7 @@ const NewMedicationRequest = () => {\nisEditable\n/>\n</div>\n- <div className=\"form-group\">\n+ <div className=\"form-group\" data-testid=\"intent-field\">\n<SelectWithLabelFormGroup\nname=\"intent\"\nlabel={t('medications.medication.intent')}\n@@ -173,7 +173,7 @@ const NewMedicationRequest = () => {\nisEditable\n/>\n</div>\n- <div className=\"form-group\">\n+ <div className=\"form-group\" data-testid=\"priority-field\">\n<SelectWithLabelFormGroup\nname=\"priority\"\nlabel={t('medications.medication.priority')}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "new_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "diff": "-import { render, screen } from '@testing-library/react'\n+import { render, screen, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -14,38 +14,39 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\nconst { TitleProvider } = titleUtil\n-describe('New Medication Request', () => {\n- let history: any\nconst setup = (store = mockStore({ medication: { status: 'loading', error: {} } } as any)) => {\n- history = createMemoryHistory()\n+ jest.resetAllMocks()\n+\n+ const history = createMemoryHistory()\nhistory.push(`/medications/new`)\n- const Wrapper: React.FC = ({ children }: any) => (\n+ return {\n+ history,\n+ ...render(\n<Provider store={store}>\n<Router history={history}>\n- <TitleProvider>{children}</TitleProvider>\n+ <TitleProvider>\n+ <NewMedicationRequest />\n+ </TitleProvider>\n</Router>\n- </Provider>\n- )\n- return render(<NewMedicationRequest />, { wrapper: Wrapper })\n+ </Provider>,\n+ ),\n+ }\n}\n+describe('New Medication Request', () => {\ndescribe('form layout', () => {\nit('should render a patient typeahead', () => {\nsetup()\n- // find label for Typeahead component\n- expect(screen.getAllByText(/medications\\.medication\\.patient/i)[0]).toBeInTheDocument()\n-\n- const medInput = screen.getByPlaceholderText(/medications\\.medication\\.patient/i)\n-\n- userEvent.type(medInput, 'Bruce Wayne')\n- expect(medInput).toHaveDisplayValue('Bruce Wayne')\n+ expect(screen.getByText(/medications\\.medication\\.patient/i)).toBeInTheDocument()\n+ expect(screen.getByPlaceholderText(/medications\\.medication\\.patient/i)).toBeInTheDocument()\n})\nit('should render a medication input box with label', async () => {\nsetup()\n+\nexpect(screen.getByText(/medications\\.medication\\.medication/i)).toBeInTheDocument()\nexpect(\nscreen.getByPlaceholderText(/medications\\.medication\\.medication/i),\n@@ -54,16 +55,16 @@ describe('New Medication Request', () => {\nit('render medication request status options', async () => {\nsetup()\n- const medStatus = screen.getAllByPlaceholderText('-- Choose --')[0]\n- expect(screen.getByText(/medications\\.medication\\.status/i)).toBeInTheDocument()\n+ const medStatus = within(screen.getByTestId('status-field')).getByRole('combobox')\n+ expect(screen.getByText(/medications\\.medication\\.status/i)).toBeInTheDocument()\nexpect(medStatus.getAttribute('aria-expanded')).toBe('false')\nselectEvent.openMenu(medStatus)\nexpect(medStatus.getAttribute('aria-expanded')).toBe('true')\nexpect(medStatus).toHaveDisplayValue(/medications\\.status\\.draft/i)\n- const statusOptions = screen\n+ const statusOptions = within(screen.getByTestId('status-field'))\n.getAllByRole('option')\n.map((option) => option.lastElementChild?.innerHTML)\n@@ -74,21 +75,21 @@ describe('New Medication Request', () => {\nit('render medication intent options', async () => {\nsetup()\n- const medicationIntent = screen.getAllByPlaceholderText('-- Choose --')[1]\n- expect(screen.getByText(/medications\\.medication\\.intent/i)).toBeInTheDocument()\n+ const medicationIntent = within(screen.getByTestId('intent-field')).getByRole('combobox')\n+ expect(screen.getByText(/medications\\.medication\\.intent/i)).toBeInTheDocument()\nexpect(medicationIntent.getAttribute('aria-expanded')).toBe('false')\nselectEvent.openMenu(medicationIntent)\nexpect(medicationIntent.getAttribute('aria-expanded')).toBe('true')\nexpect(medicationIntent).toHaveDisplayValue(/medications\\.intent\\.proposal/i)\n- const statusOptions = screen\n+ const intentOptions = within(screen.getByTestId('intent-field'))\n.getAllByRole('option')\n.map((option) => option.lastElementChild?.innerHTML)\nexpect(\n- statusOptions.includes(\n+ intentOptions.includes(\n'medications.intent.proposal' &&\n'medications.intent.plan' &&\n'medications.intent.order' &&\n@@ -103,21 +104,21 @@ describe('New Medication Request', () => {\nit('render medication priorty select options', async () => {\nsetup()\n- const medicationPriority = screen.getAllByPlaceholderText('-- Choose --')[2]\n- expect(screen.getByText(/medications\\.medication\\.status/i)).toBeInTheDocument()\n+ const medicationPriority = within(screen.getByTestId('priority-field')).getByRole('combobox')\n+ expect(screen.getByText(/medications\\.medication\\.status/i)).toBeInTheDocument()\nexpect(medicationPriority.getAttribute('aria-expanded')).toBe('false')\nselectEvent.openMenu(medicationPriority)\nexpect(medicationPriority.getAttribute('aria-expanded')).toBe('true')\nexpect(medicationPriority).toHaveDisplayValue('medications.priority.routine')\n- const statusOptions = screen\n+ const priorityOptions = within(screen.getByTestId('priority-field'))\n.getAllByRole('option')\n.map((option) => option.lastElementChild?.innerHTML)\nexpect(\n- statusOptions.includes(\n+ priorityOptions.includes(\n'medications.priority.routine' &&\n'medications.priority.urgent' &&\n'medications.priority.asap' &&\n@@ -132,10 +133,9 @@ describe('New Medication Request', () => {\nconst medicationNotes = screen.getByRole('textbox', {\nname: /medications\\.medication\\.notes/i,\n})\n- expect(screen.getByLabelText(/medications\\.medication\\.notes/i)).toBeInTheDocument()\n+ expect(screen.getByLabelText(/medications\\.medication\\.notes/i)).toBeInTheDocument()\nexpect(medicationNotes).toBeInTheDocument()\n-\nuserEvent.type(medicationNotes, 'Bruce Wayne is batman')\nexpect(medicationNotes).toHaveValue('Bruce Wayne is batman')\n})\n@@ -152,6 +152,7 @@ describe('New Medication Request', () => {\nit('should render a cancel button', () => {\nsetup()\n+\nexpect(\nscreen.getByRole('button', {\nname: /actions\\.cancel/i,\n@@ -162,21 +163,21 @@ describe('New Medication Request', () => {\ndescribe('on cancel', () => {\nit('should navigate back to /medications', async () => {\n- setup()\n- expect(history.location.pathname).toEqual('/medications/new')\n+ const { history } = setup()\n+\nconst cancelButton = screen.getByRole('button', {\nname: /actions\\.cancel/i,\n})\n+ expect(history.location.pathname).toEqual('/medications/new')\nuserEvent.click(cancelButton)\n-\nexpect(history.location.pathname).toEqual('/medications')\n})\n})\ndescribe('on save', () => {\nit('should save the medication request and navigate to \"/medications/:id\"', async () => {\n- setup()\n+ const { history } = setup()\nconst patient = screen.getByPlaceholderText(/medications\\.medication\\.patient/i)\nconst medication = screen.getByPlaceholderText(/medications\\.medication\\.medication/i)\nconst medicationNotes = screen.getByRole('textbox', {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLabs.test.tsx", "new_path": "src/__tests__/labs/ViewLabs.test.tsx", "diff": "-import { act, render, screen, waitFor } from '@testing-library/react'\n+import { 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@@ -138,13 +138,13 @@ describe('View Labs', () => {\nconst { expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab2])\n+ jest.useFakeTimers()\nexpect(await screen.findByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\n- jest.useFakeTimers()\nuserEvent.type(screen.getByRole('textbox', { name: /labs.search/i }), expectedSearchText)\n- act(() => {\n+ await waitFor(() => {\njest.advanceTimersByTime(500)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "new_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "diff": "@@ -57,18 +57,18 @@ describe('Report Incident', () => {\n</ButtonBarProvider.ButtonBarProvider>,\n)\n}\n- test('type into department field', async () => {\n+ it('renders a department form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n+ const departmentInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n- expect(depInput).toBeEnabled()\n- expect(depInput).toBeInTheDocument()\n+ expect(departmentInput).toBeEnabled()\n+ expect(departmentInput).toBeInTheDocument()\n- userEvent.type(depInput, 'Engineering Bay')\n- expect(depInput).toHaveDisplayValue('Engineering Bay')\n+ userEvent.type(departmentInput, 'Engineering Bay')\n+ expect(departmentInput).toHaveDisplayValue('Engineering Bay')\n})\n- test('type into category field', async () => {\n+ test('renders a category form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n@@ -79,7 +79,7 @@ describe('Report Incident', () => {\nexpect(catInput).toHaveDisplayValue('Warp Engine')\n})\n- test('type into category item field', async () => {\n+ test('renders a category item form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\n@@ -90,7 +90,7 @@ describe('Report Incident', () => {\nexpect(catItemInput).toHaveDisplayValue('Warp Coil')\n})\n- test('type into description field', async () => {\n+ test('renders a description formField element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst inputArr = await screen.findAllByRole('textbox', { name: /required/i })\nconst descInput = inputArr[inputArr.length - 1]\n@@ -101,7 +101,7 @@ describe('Report Incident', () => {\nuserEvent.type(descInput, 'Geordi requested analysis')\nexpect(descInput).toHaveDisplayValue('Geordi requested analysis')\n})\n- test('action save after all the input fields are filled out', async () => {\n+ test(' renders action save button after all the input fields are filled out', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\nconst catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "new_path": "src/__tests__/incidents/view/ViewIncident.test.tsx", "diff": "@@ -53,7 +53,7 @@ const setup = (permissions: any[] | undefined, id: string | undefined) => {\nreturn { ...renderResults, history }\n}\n-it('smoke test ViewIncidentDetails no Permissions', async () => {\n+it('should not render ViewIncidentDetails if there are no Permissions', async () => {\nsetup(undefined, '1234')\nexpect(\n@@ -63,7 +63,7 @@ it('smoke test ViewIncidentDetails no Permissions', async () => {\n).not.toBeInTheDocument()\n})\n-it('smoke test ViewIncidentDetails no ID', async () => {\n+it('should not ViewIncidentDetails no there is no ID', async () => {\nsetup([Permissions.ReportIncident, Permissions.ResolveIncident], undefined)\nexpect(\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/AllergiesList.test.tsx", "new_path": "src/__tests__/patients/allergies/AllergiesList.test.tsx", "diff": "@@ -36,8 +36,8 @@ describe('Allergies list', () => {\nit('should display a warning when no allergies are present', async () => {\nconst expectedAllergies: Allergy[] = []\nawait setup(expectedAllergies)\n- expect(screen.getByText('patient.allergies.warning.noAllergies')).toBeInTheDocument()\n- expect(screen.getByText('patient.allergies.addAllergyAbove')).toBeInTheDocument()\n+ expect(screen.getByRole('alert')).toHaveTextContent(/patient\\.allergies\\.warning.noAllergies/i)\n+ expect(screen.getByRole('alert')).toHaveTextContent(/patient\\.allergies\\.addAllergyAbove/i)\n})\nit('should navigate to the allergy when the allergy is clicked', async () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/Medications.test.tsx", "new_path": "src/__tests__/medications/Medications.test.tsx", "diff": "-import { render } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport { MemoryRouter } from 'react-router-dom'\n@@ -7,33 +7,13 @@ import thunk from 'redux-thunk'\nimport Medications from '../../medications/Medications'\nimport { TitleProvider } from '../../page-header/title/TitleContext'\n-import MedicationRepository from '../../shared/db/MedicationRepository'\n-import PatientRepository from '../../shared/db/PatientRepository'\nimport Medication from '../../shared/model/Medication'\n-import Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-describe('Medications', () => {\n- const setup = (route: string, permissions: Permissions[] = []) => {\n- jest.resetAllMocks()\n- jest.spyOn(MedicationRepository, 'search').mockResolvedValue([])\n- jest\n- .spyOn(MedicationRepository, 'find')\n- .mockResolvedValue({ id: '1234', requestedOn: new Date().toISOString() } as Medication)\n- jest\n- .spyOn(PatientRepository, 'find')\n- .mockResolvedValue({ id: '12345', fullName: 'test test' } as Patient)\n-\n- const store = mockStore({\n- title: 'test',\n- user: { permissions },\n- breadcrumbs: { breadcrumbs: [] },\n- components: { sidebarCollapsed: false },\n- medication: {\n- medication: ({\n+const expectedMedication = ({\nid: 'medicationId',\npatientId: 'patientId',\nrequestedOn: new Date().toISOString(),\n@@ -43,7 +23,17 @@ describe('Medications', () => {\npriority: 'routine',\nquantity: { value: 1, unit: 'unit' },\nnotes: 'medication notes',\n- } as unknown) as Medication,\n+} as unknown) as Medication\n+\n+describe('Medications', () => {\n+ const setup = (route: string, permissions: Permissions[] = []) => {\n+ const store = mockStore({\n+ title: 'test',\n+ user: { permissions },\n+ breadcrumbs: { breadcrumbs: [] },\n+ components: { sidebarCollapsed: false },\n+ medication: {\n+ medication: expectedMedication,\npatient: { id: 'patientId', fullName: 'some name' },\nerror: {},\n},\n@@ -63,29 +53,33 @@ describe('Medications', () => {\ndescribe('routing', () => {\ndescribe('/medications/new', () => {\nit('should render the new medication request screen when /medications/new is accessed', () => {\n- const { container } = setup('/medications/new', [Permissions.RequestMedication])\n+ setup('/medications/new', [Permissions.RequestMedication])\n- expect(container.querySelector('form')).toBeInTheDocument()\n+ expect(screen.getByRole('form', { name: /medication request form/i })).toBeInTheDocument()\n})\nit('should not navigate to /medications/new if the user does not have RequestMedication permissions', () => {\n- const { container } = setup('/medications/new')\n+ setup('/medications/new')\n- expect(container.querySelector('form')).not.toBeInTheDocument()\n+ expect(\n+ screen.queryByRole('form', { name: /medication request form/i }),\n+ ).not.toBeInTheDocument()\n})\n})\ndescribe('/medications/:id', () => {\nit('should render the view medication screen when /medications/:id is accessed', async () => {\n- const { container } = setup('/medications/1234', [Permissions.ViewMedication])\n+ setup('/medications/1234', [Permissions.ViewMedication])\n- expect(container).toHaveTextContent(/medications.medication.status/i)\n+ expect(screen.getByRole('heading', { name: expectedMedication.status })).toBeInTheDocument()\n})\nit('should not navigate to /medications/:id if the user does not have ViewMedication permissions', async () => {\n- const { container } = setup('/medications/1234')\n+ setup('/medications/1234')\n- expect(container).not.toHaveTextContent(/medications.medication.status/i)\n+ expect(\n+ screen.queryByRole('heading', { name: expectedMedication.status }),\n+ ).not.toBeInTheDocument()\n})\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/medications/requests/NewMedicationRequest.tsx", "new_path": "src/medications/requests/NewMedicationRequest.tsx", "diff": "@@ -124,7 +124,7 @@ const NewMedicationRequest = () => {\n{status === 'error' && (\n<Alert color=\"danger\" title={t('states.error')} message={t(error.message || '')} />\n)}\n- <form>\n+ <form aria-label=\"Medication Request form\">\n<div className=\"form-group patient-typeahead\">\n<Label htmlFor=\"patientTypeahead\" isRequired text={t('medications.medication.patient')} />\n<Typeahead\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/Medications.test.tsx", "new_path": "src/__tests__/medications/Medications.test.tsx", "diff": "@@ -7,7 +7,10 @@ import thunk from 'redux-thunk'\nimport Medications from '../../medications/Medications'\nimport { TitleProvider } from '../../page-header/title/TitleContext'\n+import MedicationRepository from '../../shared/db/MedicationRepository'\n+import PatientRepository from '../../shared/db/PatientRepository'\nimport Medication from '../../shared/model/Medication'\n+import Patient from '../../shared/model/Patient'\nimport Permissions from '../../shared/model/Permissions'\nimport { RootState } from '../../shared/store'\n@@ -27,6 +30,15 @@ const expectedMedication = ({\ndescribe('Medications', () => {\nconst setup = (route: string, permissions: Permissions[] = []) => {\n+ jest.resetAllMocks()\n+ jest.spyOn(MedicationRepository, 'search').mockResolvedValue([])\n+ jest\n+ .spyOn(MedicationRepository, 'find')\n+ .mockResolvedValue({ id: '1234', requestedOn: new Date().toISOString() } as Medication)\n+ jest\n+ .spyOn(PatientRepository, 'find')\n+ .mockResolvedValue({ id: '12345', fullName: 'test test' } as Patient)\n+\nconst store = mockStore({\ntitle: 'test',\nuser: { permissions },\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "new_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "diff": "-import { render as rtlRender, screen, within, waitFor } from '@testing-library/react'\n+import { render, screen, within, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n-import React, { ReactNode } from 'react'\n+import React from 'react'\nimport { Provider } from 'react-redux'\nimport { Router } from 'react-router-dom'\nimport createMockStore from 'redux-mock-store'\n@@ -27,11 +27,6 @@ const expectedPatient = {\nconst newAllergy = 'allergy3'\nlet store: any\n-type WrapperProps = {\n- // eslint-disable-next-line react/require-default-props\n- children?: ReactNode\n-}\n-\nconst setup = async (\npatient = expectedPatient,\npermissions = [Permissions.AddAllergy],\n@@ -43,15 +38,14 @@ const setup = async (\nstore = mockStore({ patient: { patient }, user: { permissions } } as any)\nhistory.push(route)\n- function Wrapper({ children }: WrapperProps) {\n- return (\n+ return render(\n<Router history={history}>\n- <Provider store={store}>{children}</Provider>\n- </Router>\n+ <Provider store={store}>\n+ <Allergies patient={patient} />\n+ </Provider>\n+ </Router>,\n)\n}\n- return rtlRender(<Allergies patient={patient} />, { wrapper: Wrapper })\n-}\ndescribe('Allergies', () => {\nbeforeEach(() => {\n@@ -115,7 +109,7 @@ describe('Allergies', () => {\n}),\n)\n- expect(await screen.findByText(newAllergy)).toBeInTheDocument()\n+ expect(await screen.findByRole('button', { name: newAllergy })).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/AllergiesList.test.tsx", "new_path": "src/__tests__/patients/allergies/AllergiesList.test.tsx", "diff": "-import { act, render, screen } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -10,40 +10,46 @@ import Allergy from '../../../shared/model/Allergy'\nimport Patient from '../../../shared/model/Patient'\ndescribe('Allergies list', () => {\n- const setup = async (allergies: Allergy[]) => {\n+ const setup = (allergies: Allergy[]) => {\nconst mockPatient = { id: '123', allergies } as Patient\njest.spyOn(PatientRepository, 'find').mockResolvedValueOnce(mockPatient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${mockPatient.id}/allergies`)\n- await act(async () => {\n- await render(\n+\n+ return {\n+ history,\n+ ...render(\n<Router history={history}>\n<AllergiesList patientId={mockPatient.id} />\n</Router>,\n- )\n- })\n- return { history }\n+ ),\n+ }\n}\nit('should render a list of allergies', async () => {\nconst expectedAllergies = [{ id: '456', name: 'some name' }]\n- await setup(expectedAllergies)\n- const listItems = screen.getAllByRole('button')\n+ setup(expectedAllergies)\n+\n+ const listItems = await screen.findAllByRole('button')\nexpect(listItems).toHaveLength(expectedAllergies.length)\nexpect(screen.getByText(expectedAllergies[0].name)).toBeInTheDocument()\n})\nit('should display a warning when no allergies are present', async () => {\nconst expectedAllergies: Allergy[] = []\n- await setup(expectedAllergies)\n- expect(screen.getByRole('alert')).toHaveTextContent(/patient\\.allergies\\.warning.noAllergies/i)\n+ setup(expectedAllergies)\n+\n+ expect(await screen.findByRole('alert')).toHaveTextContent(\n+ /patient\\.allergies\\.warning.noAllergies/i,\n+ )\nexpect(screen.getByRole('alert')).toHaveTextContent(/patient\\.allergies\\.addAllergyAbove/i)\n})\nit('should navigate to the allergy when the allergy is clicked', async () => {\nconst expectedAllergies = [{ id: '456', name: 'some name' }]\n- const { history } = await setup(expectedAllergies)\n- const listItems = screen.getAllByRole('button')\n+ const { history } = setup(expectedAllergies)\n+\n+ const listItems = await screen.findAllByRole('button')\nuserEvent.click(listItems[0])\nexpect(history.location.pathname).toEqual(`/patients/123/allergies/${expectedAllergies[0].id}`)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "new_path": "src/__tests__/patients/allergies/Allergies.test.tsx", "diff": "-import { render, screen, within, waitFor } from '@testing-library/react'\n+import { render, screen, within, waitFor, waitForElementToBeRemoved } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -75,7 +75,7 @@ describe('Allergies', () => {\n})\ndescribe('add new allergy modal ', () => {\n- it('should open the new allergy modal when clicked', async () => {\n+ it('should open when allergy clicked, close when cancel clicked', async () => {\nsetup(expectedPatient)\nuserEvent.click(\n@@ -83,8 +83,11 @@ describe('Allergies', () => {\nname: /patient\\.allergies\\.new/i,\n}),\n)\n-\nexpect(screen.getByRole('dialog')).toBeInTheDocument()\n+\n+ userEvent.click(screen.getByRole('button', { name: /actions\\.cancel/i }))\n+ await waitForElementToBeRemoved(() => screen.queryByRole('dialog'))\n+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()\n})\nit('should add new allergy', async () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "new_path": "src/__tests__/patients/allergies/NewAllergyModal.test.tsx", "diff": "import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\n-import { act } from 'react-dom/test-utils'\nimport NewAllergyModal from '../../../patients/allergies/NewAllergyModal'\n-import PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\nimport { expectOneConsoleError } from '../../test-utils/console.utils'\n@@ -16,15 +14,8 @@ describe('New Allergy Modal', () => {\ngivenName: 'someName',\n} as Patient\n- const setup = (onCloseSpy = jest.fn()) => {\n- jest.resetAllMocks()\n- jest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(mockPatient)\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(mockPatient)\n-\n- return render(\n- <NewAllergyModal patientId={mockPatient.id} show onCloseButtonClick={onCloseSpy} />,\n- )\n- }\n+ const setup = () =>\n+ render(<NewAllergyModal patientId={mockPatient.id} show onCloseButtonClick={jest.fn()} />)\nit('should render a modal with the correct labels', () => {\nsetup()\n@@ -60,33 +51,4 @@ describe('New Allergy Modal', () => {\nexpect(nameField).toHaveClass('is-invalid')\nexpect(nameField.nextSibling).toHaveTextContent(expectedError.nameError)\n})\n-\n- describe('cancel', () => {\n- it('should call the onCloseButtonClick function when the close button is clicked', () => {\n- const onCloseButtonClickSpy = jest.fn()\n- setup(onCloseButtonClickSpy)\n-\n- userEvent.click(screen.getByRole('button', { name: /actions.cancel/i }))\n- expect(onCloseButtonClickSpy).toHaveBeenCalledTimes(1)\n- })\n- })\n-\n- describe('save', () => {\n- it('should save the allergy for the given patient', async () => {\n- const expectedName = 'expected name'\n- setup()\n-\n- userEvent.type(screen.getByLabelText(/patient.allergies.allergyName/i), expectedName)\n- await act(async () => {\n- userEvent.click(screen.getByRole('button', { name: /patient.allergies.new/i }))\n- })\n-\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n- expect.objectContaining({\n- allergies: [expect.objectContaining({ name: expectedName })],\n- }),\n- )\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": "@@ -98,21 +98,20 @@ describe('Allergies', () => {\nname: /patient\\.allergies\\.new/i,\n}),\n)\n-\nuserEvent.type(\nscreen.getByRole('textbox', {\nname: /this is a required input/i,\n}),\nnewAllergy,\n)\n-\nuserEvent.click(\nwithin(screen.getByRole('dialog')).getByRole('button', {\nname: /patient\\.allergies\\.new/i,\n}),\n)\n- expect(await screen.findByRole('button', { name: newAllergy })).toBeInTheDocument()\n+ await waitForElementToBeRemoved(() => screen.queryByRole('dialog'))\n+ expect(screen.getByRole('button', { name: newAllergy })).toBeInTheDocument()\n})\n})\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 */\nimport { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\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-\nimport { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\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 */\nimport { render, screen, waitFor, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\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-\nimport { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/hooks/useAddPatientNote.test.ts", "new_path": "src/__tests__/patients/hooks/useAddPatientNote.test.ts", "diff": "-/* eslint-disable no-console */\n-\nimport useAddPatientNote from '../../../patients/hooks/useAddPatientNote'\nimport * as validateNote from '../../../patients/util/validate-note'\nimport PatientRepository from '../../../shared/db/PatientRepository'\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-\nimport { screen, render } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "new_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "diff": "@@ -69,49 +69,53 @@ describe('Report Incident', () => {\ntest('renders a category form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n+ const categoryInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n- expect(catInput).toBeEnabled()\n- expect(catInput).toBeInTheDocument()\n+ expect(categoryInput).toBeEnabled()\n+ expect(categoryInput).toBeInTheDocument()\n- userEvent.type(catInput, 'Warp Engine')\n- expect(catInput).toHaveDisplayValue('Warp Engine')\n+ userEvent.type(categoryInput, 'Warp Engine')\n+ expect(categoryInput).toHaveDisplayValue('Warp Engine')\n})\ntest('renders a category item form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\n+ const categoryItemInput = await screen.findByPlaceholderText(\n+ /incidents\\.reports\\.categoryitem/i,\n+ )\n- expect(catItemInput).toBeInTheDocument()\n- expect(catItemInput).toBeEnabled()\n+ expect(categoryItemInput).toBeInTheDocument()\n+ expect(categoryItemInput).toBeEnabled()\n- userEvent.type(catItemInput, 'Warp Coil')\n- expect(catItemInput).toHaveDisplayValue('Warp Coil')\n+ userEvent.type(categoryItemInput, 'Warp Coil')\n+ expect(categoryItemInput).toHaveDisplayValue('Warp Coil')\n})\ntest('renders a description formField element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\nconst inputArr = await screen.findAllByRole('textbox', { name: /required/i })\n- const descInput = inputArr[inputArr.length - 1]\n+ const descriptionInput = inputArr[inputArr.length - 1]\n- expect(descInput).toBeInTheDocument()\n- expect(descInput).toBeEnabled()\n+ expect(descriptionInput).toBeInTheDocument()\n+ expect(descriptionInput).toBeEnabled()\n- userEvent.type(descInput, 'Geordi requested analysis')\n- expect(descInput).toHaveDisplayValue('Geordi requested analysis')\n+ userEvent.type(descriptionInput, 'Geordi requested analysis')\n+ expect(descriptionInput).toHaveDisplayValue('Geordi requested analysis')\n})\ntest(' renders action save button after all the input fields are filled out', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n- const catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n- const catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\n+ const departmentInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n+ const categoryInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n+ const categoryItemInput = await screen.findByPlaceholderText(\n+ /incidents\\.reports\\.categoryitem/i,\n+ )\nconst inputArr = await screen.findAllByRole('textbox', { name: /required/i })\n- const descInput = inputArr[inputArr.length - 1]\n+ const descriptionInput = inputArr[inputArr.length - 1]\n- userEvent.type(depInput, 'Engineering Bay')\n- userEvent.type(catInput, 'Warp Engine')\n- userEvent.type(catItemInput, 'Warp Coil')\n- userEvent.type(descInput, 'Geordi requested analysis')\n+ userEvent.type(departmentInput, 'Engineering Bay')\n+ userEvent.type(categoryInput, 'Warp Engine')\n+ userEvent.type(categoryItemInput, 'Warp Coil')\n+ userEvent.type(descriptionInput, 'Geordi requested analysis')\nuserEvent.click(\nscreen.getByRole('button', {\n@@ -140,30 +144,27 @@ describe('Report Incident', () => {\n}),\n)\n- const depInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n- const catInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n- const catItemInput = await screen.findByPlaceholderText(/incidents\\.reports\\.categoryitem/i)\n+ const departmentInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n+ const categoryInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n+ const categoryItemInput = await screen.findByPlaceholderText(\n+ /incidents\\.reports\\.categoryitem/i,\n+ )\nconst inputArr = await screen.findAllByRole('textbox')\n- const descInput = inputArr[inputArr.length - 2]\n+ const descriptionInput = inputArr[inputArr.length - 2]\nconst dateInput = inputArr[0]\nconst invalidInputs = container.querySelectorAll('.is-invalid')\nexpect(invalidInputs).toHaveLength(5)\n- // expect(dateInput).toBeInvalid()\nexpect(dateInput).toHaveClass('is-invalid')\n- // expect(depInput).toBeInvalid()\n- expect(depInput).toHaveClass('is-invalid')\n+ expect(departmentInput).toHaveClass('is-invalid')\n- // expect(catInput).toBeInvalid()\n- expect(catInput).toHaveClass('is-invalid')\n+ expect(categoryInput).toHaveClass('is-invalid')\n- // expect(catItemInput).toBeInvalid()\n- expect(catItemInput).toHaveClass('is-invalid')\n+ expect(categoryItemInput).toHaveClass('is-invalid')\n- // expect(descInput).toBeInvalid()\n- expect(descInput).toHaveClass('is-invalid')\n+ expect(descriptionInput).toHaveClass('is-invalid')\n})\ndescribe('on cancel', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLabs.test.tsx", "new_path": "src/__tests__/labs/ViewLabs.test.tsx", "diff": "@@ -143,12 +143,11 @@ describe('View Labs', () => {\nexpect(await screen.findByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\nuserEvent.type(screen.getByRole('textbox', { name: /labs.search/i }), expectedSearchText)\n-\n- await waitFor(() => {\n- jest.advanceTimersByTime(500)\n- })\n-\n- expect(await screen.findByText(/another/i)).toBeInTheDocument()\n+ await Promise.resolve(() =>\n+ setTimeout(() => {\n+ expect(screen.getByText(/another/i)).toBeInTheDocument()\n+ }, 500),\n+ )\nexpect(screen.queryByRole('cell', { name: expectedLab.code })).not.toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLabs.test.tsx", "new_path": "src/__tests__/labs/ViewLabs.test.tsx", "diff": "@@ -125,7 +125,7 @@ describe('View Labs', () => {\n})\ndescribe('search functionality', () => {\n- it('should search for labs after the search text has not changed for 500 milliseconds', async () => {\n+ it('should search for labs after the search text has not changed for 500 milliseconds', async (): Promise<void> => {\nconst expectedLab2 = {\ncode: 'L-5678',\nid: '5678',\n@@ -134,21 +134,18 @@ describe('View Labs', () => {\nstatus: 'requested',\nrequestedOn: '2020-03-30T04:43:20.102Z',\n} as Lab\n- const expectedSearchText = 'another'\n+ const expectedSearchText = 'Picard'\nconst { expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\n-\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab2])\n- jest.useFakeTimers()\nexpect(await screen.findByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\nuserEvent.type(screen.getByRole('textbox', { name: /labs.search/i }), expectedSearchText)\nawait Promise.resolve(() =>\nsetTimeout(() => {\n- expect(screen.getByText(/another/i)).toBeInTheDocument()\n+ expect(screen.getByText(/picard/i)).toBeInTheDocument()\n}, 500),\n)\n- expect(screen.queryByRole('cell', { name: expectedLab.code })).not.toBeInTheDocument()\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/HospitalRun.test.tsx", "new_path": "src/__tests__/HospitalRun.test.tsx", "diff": "@@ -49,7 +49,7 @@ describe('HospitalRun', () => {\nconst { store } = setup('/appointments', [Permissions.ReadAppointments])\nexpect(\n- screen.getByRole('button', { name: /scheduling.appointments.new/i }),\n+ screen.getByRole('heading', { name: /scheduling\\.appointments\\.label/i }),\n).toBeInTheDocument()\nexpect(store.getActions()).toContainEqual(\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/ViewLabs.test.tsx", "new_path": "src/__tests__/labs/ViewLabs.test.tsx", "diff": "@@ -30,7 +30,7 @@ const setup = (permissions: Permissions[] = []) => {\n} as Lab\njest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab])\n- jest.spyOn(LabRepository, 'search')\n+ // jest.spyOn(LabRepository, 'search')\nconst history = createMemoryHistory()\n@@ -125,31 +125,25 @@ describe('View Labs', () => {\n})\ndescribe('search functionality', () => {\n- it.only('should search for labs after the search text has not changed for 500 milliseconds', async (): Promise<void> => {\n+ it('should search for labs after the search text has not changed for 500 milliseconds', async (): Promise<void> => {\nconst expectedLab2 = {\ncode: 'L-5678',\nid: '5678',\n- type: 'another type',\n+ type: 'another type 2 phaser',\npatient: 'patientIdB',\nstatus: 'requested',\nrequestedOn: '2020-03-30T04:43:20.102Z',\n} as Lab\n- const expectedSearchText = 'Picard'\nconst { expectedLab } = setup([Permissions.ViewLabs, Permissions.RequestLab])\n- jest.spyOn(LabRepository, 'findAll').mockResolvedValue([expectedLab2])\n+ jest.spyOn(LabRepository, 'search').mockResolvedValue([expectedLab2])\nexpect(await screen.findByRole('cell', { name: expectedLab.code })).toBeInTheDocument()\n- await userEvent.type(\n- screen.getByRole('textbox', { name: /labs.search/i }),\n- expectedSearchText,\n- {\n+ await userEvent.type(screen.getByRole('textbox', { name: /labs.search/i }), 'Picard', {\ndelay: 100,\n- },\n- )\n+ })\nexpect(screen.getByRole('textbox', { name: /labs.search/i })).toHaveDisplayValue(/picard/i)\n-\n- expect(screen.getByText(/another/i)).toBeInTheDocument()\n+ expect(await screen.findByText(/phaser/i)).toBeInTheDocument()\nexpect(screen.queryByRole('cell', { name: expectedLab.code })).not.toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "new_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "diff": "@@ -47,7 +47,7 @@ describe('New Imaging Request', () => {\n}\ndescribe('form layout', () => {\n- it('Patient input field w/ label', () => {\n+ it('Renders a patient input field with correct label', () => {\nsetup()\nconst imgPatientInput = screen.getByPlaceholderText(/imagings\\.imaging\\.patient/i)\n@@ -57,7 +57,7 @@ describe('New Imaging Request', () => {\nexpect(imgPatientInput).toHaveDisplayValue('Cmdr. Data')\n})\n- it('Render a dropdown list of visits', async () => {\n+ it('Renders a dropdown list of visits', async () => {\nsetup()\nconst dropdownVisits = screen.getAllByPlaceholderText('-- Choose --')[0]\nexpect(screen.getByText(/patient\\.visits\\.label/i)).toBeInTheDocument()\n@@ -68,7 +68,7 @@ describe('New Imaging Request', () => {\nexpect(dropdownVisits.getAttribute('aria-expanded')).toBe('true')\n})\n- it('Render a image type input box', async () => {\n+ it('Renders an image type input box', async () => {\nsetup()\nconst imgTypeInput = screen.getByPlaceholderText(/imagings\\.imaging\\.type/i)\nexpect(screen.getByLabelText(/imagings\\.imaging\\.type/i)).toBeInTheDocument()\n@@ -77,7 +77,7 @@ describe('New Imaging Request', () => {\nexpect(imgTypeInput).toHaveDisplayValue('tricorder imaging')\n})\n- it('Render a status types select', async () => {\n+ it('Renders a status types select input field', async () => {\nsetup()\nconst dropdownStatusTypes = screen.getAllByPlaceholderText('-- Choose --')[1]\nexpect(screen.getByText(/patient\\.visits\\.label/i)).toBeInTheDocument()\n@@ -97,7 +97,7 @@ describe('New Imaging Request', () => {\n).toBe(true)\n})\n- it('Render a notes text field', async () => {\n+ it('Renders a notes text field', async () => {\nsetup()\nconst notesInputField = screen.getByRole('textbox', {\nname: /imagings\\.imaging\\.notes/i,\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/hooks/useRequestImaging.test.tsx", "new_path": "src/__tests__/imagings/hooks/useRequestImaging.test.tsx", "diff": "@@ -5,6 +5,7 @@ import { ImagingRequestError } from '../../../imagings/util/validate-imaging-req\nimport * as imagingRequestValidator from '../../../imagings/util/validate-imaging-request'\nimport ImagingRepository from '../../../shared/db/ImagingRepository'\nimport Imaging from '../../../shared/model/Imaging'\n+import { UserState, LoginError } from '../../../user/user-slice'\nimport executeMutation from '../../test-utils/use-mutation.util'\ndescribe('useReportIncident', () => {\n@@ -13,6 +14,12 @@ describe('useReportIncident', () => {\nconsole.error = jest.fn()\n})\n+ const user = {\n+ fullName: 'test',\n+ permissions: [],\n+ loginError: {} as LoginError,\n+ } as UserState\n+\nit('should save the imaging request with correct data', async () => {\nconst expectedDate = new Date(Date.now())\nDate.now = jest.fn().mockReturnValue(expectedDate)\n@@ -32,7 +39,7 @@ describe('useReportIncident', () => {\n} as Imaging\njest.spyOn(ImagingRepository, 'save').mockResolvedValue(expectedImagingRequest)\n- await executeMutation(() => useRequestImaging(), givenImagingRequest)\n+ await executeMutation(() => useRequestImaging(user), givenImagingRequest)\nexpect(ImagingRepository.save).toHaveBeenCalledTimes(1)\nexpect(ImagingRepository.save).toBeCalledWith(expectedImagingRequest)\n})\n@@ -46,7 +53,7 @@ describe('useReportIncident', () => {\njest.spyOn(ImagingRepository, 'save').mockResolvedValue({} as Imaging)\ntry {\n- await executeMutation(() => useRequestImaging(), {})\n+ await executeMutation(() => useRequestImaging(user), {})\n} catch (e) {\nexpect(e).toEqual(expectedImagingRequestError)\nexpect(ImagingRepository.save).not.toHaveBeenCalled()\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "new_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "diff": "@@ -19,6 +19,7 @@ import ImagingRepository from '../../../shared/db/ImagingRepository'\nimport Imaging from '../../../shared/model/Imaging'\nimport Patient from '../../../shared/model/Patient'\nimport { RootState } from '../../../shared/store'\n+import { UserState, LoginError } from '../../../user/user-slice'\nconst mockStore = createMockStore<RootState, any>([thunk])\n@@ -35,7 +36,13 @@ describe('New Imaging Request', () => {\nhistory = createMemoryHistory()\nhistory.push(`/imaging/new`)\n- const store = mockStore({} as any)\n+ const store = mockStore({\n+ user: {\n+ fullName: 'test',\n+ permissions: [],\n+ loginError: {} as LoginError,\n+ } as UserState,\n+ } as any)\nlet wrapper: any\nawait act(async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/user/user-slice.ts", "new_path": "src/user/user-slice.ts", "diff": "@@ -6,13 +6,13 @@ import Permissions from '../shared/model/Permissions'\nimport User from '../shared/model/User'\nimport { AppThunk } from '../shared/store'\n-interface LoginError {\n+export interface LoginError {\nmessage?: string\nusername?: string\npassword?: string\n}\n-interface UserState {\n+export interface UserState {\npermissions: (Permissions | null)[]\nuser?: User\nloginError?: LoginError\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/allergies/ViewAllergy.test.tsx", "new_path": "src/__tests__/patients/allergies/ViewAllergy.test.tsx", "diff": "@@ -34,7 +34,7 @@ describe('ViewAllergy', () => {\nawait waitFor(() => {\nexpect(\nscreen.getByRole('textbox', { name: /patient.allergies.allergyName/i }),\n- ).toBeInTheDocument()\n+ ).toHaveDisplayValue('cats')\n})\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/shared/components/input/DatePickerWithLabelFormGroup.tsx", "new_path": "src/shared/components/input/DatePickerWithLabelFormGroup.tsx", "diff": "@@ -27,7 +27,7 @@ const DatePickerWithLabelFormGroup = (props: Props) => {\n} = props\nconst id = `${name}DatePicker`\nreturn (\n- <div className=\"form-group\">\n+ <div className=\"form-group\" data-testid={id}>\n<Label text={label} htmlFor={id} isRequired={isRequired} />\n<DateTimePicker\ndateFormat=\"MM/dd/yyyy\"\n" }, { "change_type": "MODIFY", "old_path": "src/shared/components/input/DateTimePickerWithLabelFormGroup.tsx", "new_path": "src/shared/components/input/DateTimePickerWithLabelFormGroup.tsx", "diff": "@@ -16,7 +16,7 @@ const DateTimePickerWithLabelFormGroup = (props: Props) => {\nconst { onChange, label, name, isEditable, value, isRequired, feedback, isInvalid } = props\nconst id = `${name}DateTimePicker`\nreturn (\n- <div className=\"form-group\">\n+ <div className=\"form-group\" data-testid={id}>\n<Label text={label} isRequired={isRequired} htmlFor={id} />\n<DateTimePicker\ndateFormat=\"MM/dd/yyyy h:mm aa\"\n" }, { "change_type": "MODIFY", "old_path": "src/shared/components/input/SelectWithLabelFormGroup.tsx", "new_path": "src/shared/components/input/SelectWithLabelFormGroup.tsx", "diff": "@@ -35,7 +35,7 @@ const SelectWithLabelFormGroup = (props: Props) => {\n} = props\nconst id = `${name}Select`\nreturn (\n- <div className=\"form-group\">\n+ <div className=\"form-group\" data-testid={id}>\n{label && <Label text={label} htmlFor={id} isRequired={isRequired} />}\n<Select\nid={id}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/components/input/TextFieldWithLabelFormGroup.tsx", "new_path": "src/shared/components/input/TextFieldWithLabelFormGroup.tsx", "diff": "@@ -20,7 +20,6 @@ const TextFieldWithLabelFormGroup = (props: Props) => {\n{label && <Label text={label} htmlFor={inputId} isRequired={isRequired} />}\n<TextField\nid={inputId}\n- data-testid={inputId}\nrows={4}\nvalue={value}\ndisabled={!isEditable}\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 { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\n-import { format } from 'date-fns'\n+import format from 'date-fns/format'\nimport React from 'react'\nimport CarePlanForm from '../../../patients/care-plans/CarePlanForm'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "new_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "diff": "import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\n-import { format } from 'date-fns'\n+import format from 'date-fns/format'\nimport React from 'react'\nimport DiagnosisForm from '../../../patients/diagnoses/DiagnosisForm'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "new_path": "src/__tests__/patients/search/SearchPatients.test.tsx", "diff": "import { screen, render, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\n-import { format } from 'date-fns'\n+import format from 'date-fns/format'\nimport React from 'react'\nimport SearchPatients from '../../../patients/search/SearchPatients'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/ViewVisit.test.tsx", "new_path": "src/__tests__/patients/visits/ViewVisit.test.tsx", "diff": "import { screen, render, waitFor } from '@testing-library/react'\n-import { format } from 'date-fns'\n+import format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Route, Router } from 'react-router-dom'\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "@@ -141,7 +141,7 @@ describe('New Lab Request', () => {\nconst { expectedVisits } = setup()\nconst patientTypeahead = screen.getByPlaceholderText(/labs.lab.patient/i)\n- const visitsInput = within(screen.getByTestId('visit-field')).getByRole('combobox')\n+ const visitsInput = within(screen.getByTestId('visitSelect')).getByRole('combobox')\nuserEvent.type(patientTypeahead, 'Jim Bob')\nuserEvent.click(await screen.findByText(/Jim Bob/i))\nexpect(patientTypeahead).toHaveDisplayValue(/Jim Bob/i)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "new_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "diff": "@@ -56,7 +56,7 @@ describe('New Medication Request', () => {\nit('render medication request status options', async () => {\nsetup()\n- const medStatus = within(screen.getByTestId('status-field')).getByRole('combobox')\n+ const medStatus = within(screen.getByTestId('statusSelect')).getByRole('combobox')\nexpect(screen.getByText(/medications\\.medication\\.status/i)).toBeInTheDocument()\nexpect(medStatus.getAttribute('aria-expanded')).toBe('false')\n@@ -64,7 +64,7 @@ describe('New Medication Request', () => {\nexpect(medStatus.getAttribute('aria-expanded')).toBe('true')\nexpect(medStatus).toHaveDisplayValue(/medications\\.status\\.draft/i)\n- const statusOptions = within(screen.getByTestId('status-field'))\n+ const statusOptions = within(screen.getByTestId('statusSelect'))\n.getAllByRole('option')\n.map((option) => option.lastElementChild?.innerHTML)\n@@ -76,7 +76,7 @@ describe('New Medication Request', () => {\nit('render medication intent options', async () => {\nsetup()\n- const medicationIntent = within(screen.getByTestId('intent-field')).getByRole('combobox')\n+ const medicationIntent = within(screen.getByTestId('intentSelect')).getByRole('combobox')\nexpect(screen.getByText(/medications\\.medication\\.intent/i)).toBeInTheDocument()\nexpect(medicationIntent.getAttribute('aria-expanded')).toBe('false')\n@@ -84,7 +84,7 @@ describe('New Medication Request', () => {\nexpect(medicationIntent.getAttribute('aria-expanded')).toBe('true')\nexpect(medicationIntent).toHaveDisplayValue(/medications\\.intent\\.proposal/i)\n- const intentOptions = within(screen.getByTestId('intent-field'))\n+ const intentOptions = within(screen.getByTestId('intentSelect'))\n.getAllByRole('option')\n.map((option) => option.lastElementChild?.innerHTML)\n@@ -105,7 +105,7 @@ describe('New Medication Request', () => {\nit('render medication priorty select options', async () => {\nsetup()\n- const medicationPriority = within(screen.getByTestId('priority-field')).getByRole('combobox')\n+ const medicationPriority = within(screen.getByTestId('prioritySelect')).getByRole('combobox')\nexpect(screen.getByText(/medications\\.medication\\.status/i)).toBeInTheDocument()\nexpect(medicationPriority.getAttribute('aria-expanded')).toBe('false')\n@@ -113,7 +113,7 @@ describe('New Medication Request', () => {\nexpect(medicationPriority.getAttribute('aria-expanded')).toBe('true')\nexpect(medicationPriority).toHaveDisplayValue('medications.priority.routine')\n- const priorityOptions = within(screen.getByTestId('priority-field'))\n+ const priorityOptions = within(screen.getByTestId('prioritySelect'))\n.getAllByRole('option')\n.map((option) => option.lastElementChild?.innerHTML)\n" }, { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -145,7 +145,7 @@ const NewLabRequest = () => {\n</div>\n</Column>\n<Column>\n- <div className=\"form-group\" data-testid=\"visit-field\">\n+ <div className=\"form-group\">\n<SelectWithLabelFormGroup\nname=\"visit\"\nlabel={t('patient.visit')}\n" }, { "change_type": "MODIFY", "old_path": "src/medications/requests/NewMedicationRequest.tsx", "new_path": "src/medications/requests/NewMedicationRequest.tsx", "diff": "@@ -147,7 +147,7 @@ const NewMedicationRequest = () => {\nvalue={newMedicationRequest.medication}\nonChange={onMedicationChange}\n/>\n- <div className=\"form-group\" data-testid=\"status-field\">\n+ <div className=\"form-group\">\n<SelectWithLabelFormGroup\nname=\"status\"\nlabel={t('medications.medication.status')}\n@@ -160,7 +160,7 @@ const NewMedicationRequest = () => {\nisEditable\n/>\n</div>\n- <div className=\"form-group\" data-testid=\"intent-field\">\n+ <div className=\"form-group\">\n<SelectWithLabelFormGroup\nname=\"intent\"\nlabel={t('medications.medication.intent')}\n@@ -173,7 +173,7 @@ const NewMedicationRequest = () => {\nisEditable\n/>\n</div>\n- <div className=\"form-group\" data-testid=\"priority-field\">\n+ <div className=\"form-group\">\n<SelectWithLabelFormGroup\nname=\"priority\"\nlabel={t('medications.medication.priority')}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/imagings/hooks/useRequestImaging.tsx", "new_path": "src/imagings/hooks/useRequestImaging.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport ImagingRepository from '../../shared/db/ImagingRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/incidents/hooks/useReportIncident.tsx", "new_path": "src/incidents/hooks/useReportIncident.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport shortid from 'shortid'\n" }, { "change_type": "MODIFY", "old_path": "src/labs/hooks/useCompleteLab.ts", "new_path": "src/labs/hooks/useCompleteLab.ts", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { useMutation, queryCache } from 'react-query'\nimport LabRepository from '../../shared/db/LabRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/labs/hooks/useRequestLab.ts", "new_path": "src/labs/hooks/useRequestLab.ts", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { useMutation, queryCache } from 'react-query'\nimport LabRepository from '../../shared/db/LabRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/labs/utils/validate-lab.ts", "new_path": "src/labs/utils/validate-lab.ts", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport Lab from '../../shared/model/Lab'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddAllergy.tsx", "new_path": "src/patients/hooks/useAddAllergy.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddCareGoal.tsx", "new_path": "src/patients/hooks/useAddCareGoal.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddCarePlan.tsx", "new_path": "src/patients/hooks/useAddCarePlan.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddPatientDiagnosis.tsx", "new_path": "src/patients/hooks/useAddPatientDiagnosis.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddPatientNote.tsx", "new_path": "src/patients/hooks/useAddPatientNote.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddPatientRelatedPerson.tsx", "new_path": "src/patients/hooks/useAddPatientRelatedPerson.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { useMutation, queryCache } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/hooks/useAddVisit.tsx", "new_path": "src/patients/hooks/useAddVisit.tsx", "diff": "-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport { queryCache, useMutation } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\n" }, { "change_type": "MODIFY", "old_path": "src/patients/patient-slice.ts", "new_path": "src/patients/patient-slice.ts", "diff": "import { createSlice, PayloadAction } from '@reduxjs/toolkit'\n-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport PatientRepository from '../shared/db/PatientRepository'\nimport Diagnosis from '../shared/model/Diagnosis'\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "new_path": "src/scheduling/appointments/edit/EditAppointment.tsx", "diff": "import { Spinner, Button, Toast } from '@hospitalrun/components'\n-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport React, { useEffect, useState } from 'react'\nimport { useHistory, useParams } from 'react-router-dom'\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/new/NewAppointment.tsx", "new_path": "src/scheduling/appointments/new/NewAppointment.tsx", "diff": "import { Button, Spinner, Toast } from '@hospitalrun/components'\nimport addMinutes from 'date-fns/addMinutes'\nimport roundToNearestMinutes from 'date-fns/roundToNearestMinutes'\n-import { isEmpty } from 'lodash'\n+import isEmpty from 'lodash/isEmpty'\nimport React, { useEffect, useState } from 'react'\nimport { useHistory, useLocation } from 'react-router-dom'\n" }, { "change_type": "MODIFY", "old_path": "src/shared/components/input/LanguageSelector.tsx", "new_path": "src/shared/components/input/LanguageSelector.tsx", "diff": "-import { sortBy } from 'lodash'\n+import sortBy from 'lodash/sortBy'\nimport React, { useState } from 'react'\nimport i18n, { resources } from '../../config/i18n'\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": "-import { render, screen } from '@testing-library/react'\n+import { render, screen, within } from '@testing-library/react'\nimport userEvent, { specialChars } from '@testing-library/user-event'\nimport addMonths from 'date-fns/addMonths'\nimport format from 'date-fns/format'\n@@ -73,7 +73,7 @@ describe('Care Goal Form', () => {\nsetup()\nexpect(screen.getByText(/patient.careGoal.priority.label/i)).toBeInTheDocument()\n- const priority = screen.getByDisplayValue(/patient.careGoal.priority.medium/i)\n+ const priority = within(screen.getByTestId('prioritySelect')).getByRole('combobox')\nexpect(priority).toBeInTheDocument()\nuserEvent.click(priority) // display popup with the options\n@@ -90,7 +90,7 @@ describe('Care Goal Form', () => {\nconst expectedPriority = 'high'\nconst { onCareGoalChangeSpy } = setup(false, false)\n- const priority = screen.getAllByRole('combobox')[0]\n+ const priority = within(screen.getByTestId('prioritySelect')).getByRole('combobox')\nuserEvent.type(priority, `${expectedPriority}${arrowDown}${enter}`)\nexpect(priority).toHaveDisplayValue([`patient.careGoal.priority.${expectedPriority}`])\n@@ -103,7 +103,7 @@ describe('Care Goal Form', () => {\nexpect(screen.getByText(/patient.careGoal.status/i)).toBeInTheDocument()\n- const status = screen.getByDisplayValue(careGoal.status)\n+ const status = within(screen.getByTestId('statusSelect')).getByRole('combobox')\nexpect(status).toBeInTheDocument()\nexpect(status).toHaveValue(careGoal.status)\n@@ -121,7 +121,7 @@ describe('Care Goal Form', () => {\nconst expectedStatus = CareGoalStatus.OnHold\nconst { onCareGoalChangeSpy } = setup(false, false)\n- const status = screen.getAllByRole('combobox')[1]\n+ const status = within(screen.getByTestId('statusSelect')).getByRole('combobox')\nuserEvent.type(status, `${expectedStatus}${arrowDown}${enter}`)\nexpect(onCareGoalChangeSpy).toHaveBeenCalledWith({ status: expectedStatus })\n@@ -132,7 +132,9 @@ describe('Care Goal Form', () => {\nexpect(screen.getByText(/patient.careGoal.achievementStatus/i)).toBeInTheDocument()\n- const achievementStatus = screen.getByDisplayValue(careGoal.achievementStatus)\n+ const achievementStatus = within(screen.getByTestId('achievementStatusSelect')).getByRole(\n+ 'combobox',\n+ )\nexpect(achievementStatus).toBeInTheDocument()\nexpect(achievementStatus).toHaveValue(careGoal.achievementStatus)\n})\n@@ -141,7 +143,7 @@ describe('Care Goal Form', () => {\nconst expectedAchievementStatus = CareGoalAchievementStatus.Improving\nconst { onCareGoalChangeSpy } = setup(false, false)\n- const status = screen.getAllByRole('combobox')[2]\n+ const status = within(screen.getByTestId('achievementStatusSelect')).getByRole('combobox')\nuserEvent.type(status, `${expectedAchievementStatus}${arrowDown}${enter}`)\nexpect(onCareGoalChangeSpy).toHaveBeenCalledWith({\n@@ -153,7 +155,7 @@ describe('Care Goal Form', () => {\nsetup()\nexpect(screen.getByText(/patient.careGoal.startDate/i)).toBeInTheDocument()\n- const startDatePicker = screen.getAllByRole('textbox')[4]\n+ const startDatePicker = within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')\nexpect(startDatePicker).toBeInTheDocument()\nexpect(startDatePicker).toHaveValue(format(startDate, 'MM/dd/y'))\n})\n@@ -162,17 +164,17 @@ describe('Care Goal Form', () => {\nconst { onCareGoalChangeSpy } = setup()\nconst expectedDate = '12/31/2050'\n- const dueDatePicker = screen.getAllByRole('textbox')[4]\n- userEvent.type(dueDatePicker, `{selectall}${expectedDate}{enter}`)\n+ const startDatePicker = within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')\n+ userEvent.type(startDatePicker, `{selectall}${expectedDate}{enter}`)\nexpect(onCareGoalChangeSpy).toHaveBeenCalled()\n- expect(dueDatePicker).toHaveDisplayValue(expectedDate)\n+ expect(startDatePicker).toHaveDisplayValue(expectedDate)\n})\nit('should render a due date picker', () => {\nsetup()\nexpect(screen.getByText(/patient.careGoal.dueDate/i)).toBeInTheDocument()\n- const dueDatePicker = screen.getAllByRole('textbox')[5]\n+ const dueDatePicker = within(screen.getByTestId('dueDateDatePicker')).getByRole('textbox')\nexpect(dueDatePicker).toBeInTheDocument()\nexpect(dueDatePicker).toHaveValue(format(dueDate, 'MM/dd/y'))\n})\n@@ -181,7 +183,7 @@ describe('Care Goal Form', () => {\nconst { onCareGoalChangeSpy } = setup()\nconst expectedDate = '12/31/2050'\n- const dueDatePicker = screen.getAllByRole('textbox')[5]\n+ const dueDatePicker = within(screen.getByTestId('dueDateDatePicker')).getByRole('textbox')\nuserEvent.type(dueDatePicker, `{selectall}${expectedDate}{enter}`)\nexpect(onCareGoalChangeSpy).toHaveBeenCalled()\nexpect(dueDatePicker).toHaveDisplayValue(expectedDate)\n@@ -213,11 +215,13 @@ describe('Care Goal Form', () => {\nsetup(true)\nconst descriptionInput = screen.getByLabelText(/patient\\.careGoal\\.description/i)\n- const priority = screen.getByDisplayValue(/patient.careGoal.priority.medium/i)\n- const status = screen.getAllByRole('combobox')[2]\n- const achievementStatus = screen.getByDisplayValue(careGoal.achievementStatus)\n- const startDatePicker = screen.getAllByRole('textbox')[4]\n- const dueDatePicker = screen.getAllByRole('textbox')[5]\n+ const priority = within(screen.getByTestId('prioritySelect')).getByRole('combobox')\n+ const status = within(screen.getByTestId('statusSelect')).getByRole('combobox')\n+ const achievementStatus = within(screen.getByTestId('achievementStatusSelect')).getByRole(\n+ 'combobox',\n+ )\n+ const startDatePicker = within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')\n+ const dueDatePicker = within(screen.getByTestId('dueDateDatePicker')).getByRole('textbox')\nconst noteInput = screen.getByRole('textbox', {\nname: /patient\\.caregoal\\.note/i,\n})\n@@ -249,11 +253,13 @@ describe('Care Goal Form', () => {\nconst descriptionInput = screen.getByRole('textbox', {\nname: /this is a required input/i,\n})\n- const priority = screen.getAllByRole('combobox')[0]\n- const status = screen.getAllByRole('combobox')[1]\n- const achievementStatus = screen.getAllByRole('combobox')[2]\n- const startDatePicker = screen.getAllByRole('textbox')[1]\n- const dueDatePicker = screen.getAllByRole('textbox')[2]\n+ const priority = within(screen.getByTestId('prioritySelect')).getByRole('combobox')\n+ const status = within(screen.getByTestId('statusSelect')).getByRole('combobox')\n+ const achievementStatus = within(screen.getByTestId('achievementStatusSelect')).getByRole(\n+ 'combobox',\n+ )\n+ const startDatePicker = within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')\n+ const dueDatePicker = within(screen.getByTestId('dueDateDatePicker')).getByRole('textbox')\nconst noteInput = screen.getByRole('textbox', {\nname: /patient\\.caregoal\\.note/i,\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": "@@ -90,17 +90,20 @@ describe('Care Goals Tab', () => {\nconst modal = await screen.findByRole('dialog')\n- userEvent.type(within(modal).getAllByRole('textbox')[0], expectedCareGoal.description)\nuserEvent.type(\n- within(modal).getAllByRole('combobox')[1],\n+ screen.getByLabelText(/patient\\.careGoal\\.description/i),\n+ expectedCareGoal.description,\n+ )\n+ userEvent.type(\n+ within(screen.getByTestId('statusSelect')).getByRole('combobox'),\n`${selectAll}${expectedCareGoal.status}${arrowDown}${enter}`,\n)\nuserEvent.type(\n- within(modal).getAllByRole('textbox')[4],\n+ within(screen.getByTestId('startDateDatePicker')).getByRole('textbox'),\n`${selectAll}${format(expectedCareGoal.startDate, 'MM/dd/yyyy')}${enter}`,\n)\nuserEvent.type(\n- within(modal).getAllByRole('textbox')[5],\n+ within(screen.getByTestId('dueDateDatePicker')).getByRole('textbox'),\n`${selectAll}${format(expectedCareGoal.dueDate, 'MM/dd/yyyy')}${enter}`,\n)\n@@ -115,16 +118,11 @@ describe('Care Goals Tab', () => {\n},\n)\n- expect(\n- await screen.findByRole('cell', { name: expectedCareGoal.description }),\n- ).toBeInTheDocument()\n- expect(await screen.findByRole('cell', { name: expectedCareGoal.status })).toBeInTheDocument()\n- expect(\n- await screen.findByRole('cell', { name: format(expectedCareGoal.startDate, 'yyyy-MM-dd') }),\n- ).toBeInTheDocument()\n- expect(\n- await screen.findByRole('cell', { name: format(expectedCareGoal.dueDate, 'yyyy-MM-dd') }),\n- ).toBeInTheDocument()\n+ const cells = await screen.findAllByRole('cell')\n+ expect(cells[0]).toHaveTextContent(expectedCareGoal.description)\n+ expect(cells[1]).toHaveTextContent(format(expectedCareGoal.startDate, 'yyyy-MM-dd'))\n+ expect(cells[2]).toHaveTextContent(format(expectedCareGoal.dueDate, 'yyyy-MM-dd'))\n+ expect(cells[3]).toHaveTextContent(expectedCareGoal.status)\n}, 30000)\nit('should open and close the modal when the add care goal and close buttons are clicked', async () => {\n@@ -140,16 +138,14 @@ describe('Care Goals Tab', () => {\n})\nit('should render care goal table when on patients/:id/care-goals', async () => {\n- const { container } = setup('/patients/123/care-goals', [Permissions.ReadCareGoal])\n+ setup('/patients/123/care-goals', [Permissions.ReadCareGoal])\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n})\nit('should render care goal view when on patients/:id/care-goals/:careGoalId', async () => {\nsetup('/patients/123/care-goals/456', [Permissions.ReadCareGoal], ViewWrapper)\n- expect(await screen.findByRole('form')).toBeInTheDocument()\n+ expect(await screen.findByLabelText('care-goal-form')).toBeInTheDocument()\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": "@@ -74,11 +74,11 @@ describe('Add Care Plan Modal', () => {\nsetup()\n- const condition = screen.getAllByRole('combobox')[0]\n+ const condition = within(screen.getByTestId('conditionSelect')).getByRole('combobox')\nawait selectEvent.select(condition, `too skinny`)\n- const title = screen.getByPlaceholderText(/patient\\.careplan\\.title/i)\n- const description = screen.getAllByRole('textbox')[1]\n+ const title = screen.getByLabelText(/patient\\.careplan\\.title/i)\n+ const description = screen.getByLabelText(/patient\\.careplan\\.description/i)\nuserEvent.type(title, expectedCarePlan.title)\nuserEvent.type(description, expectedCarePlan.description)\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 { render, screen } from '@testing-library/react'\n+import { render, screen, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { format } from 'date-fns'\nimport React from 'react'\n@@ -91,7 +91,7 @@ describe('Care Plan Form', () => {\nit('should call the on change handler when condition changes', async () => {\nsetup(false, false)\n- const conditionSelector = screen.getAllByRole('combobox')[0]\n+ const conditionSelector = within(screen.getByTestId('conditionSelect')).getByRole('combobox')\nuserEvent.type(conditionSelector, `${diagnosis.name}{arrowdown}{enter}`)\nexpect(onCarePlanChangeSpy).toHaveBeenCalledWith({ diagnosisId: diagnosis.id })\n})\n@@ -151,7 +151,7 @@ describe('Care Plan Form', () => {\nit('should render a start date picker', () => {\nsetup()\nconst date = format(new Date(carePlan.startDate), 'MM/dd/yyyy')\n- const startDatePicker = screen.getAllByDisplayValue(date)[0]\n+ const startDatePicker = within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')\nconst startDatePickerLabel = screen.getByText(/patient.carePlan.startDate/i)\nexpect(startDatePicker).toBeInTheDocument()\nexpect(startDatePicker).toHaveValue(date)\n@@ -161,9 +161,7 @@ describe('Care Plan Form', () => {\nit('should call the on change handler when start date changes', () => {\nsetup()\n- const startDatePicker = screen.getAllByDisplayValue(\n- format(new Date(carePlan.startDate), 'MM/dd/yyyy'),\n- )[0]\n+ const startDatePicker = within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')\nuserEvent.type(startDatePicker, '{arrowdown}{arrowleft}{enter}')\nexpect(onCarePlanChangeSpy).toHaveBeenCalledTimes(1)\n})\n@@ -171,7 +169,7 @@ describe('Care Plan Form', () => {\nit('should render an end date picker', () => {\nsetup()\nconst date = format(new Date(carePlan.endDate), 'MM/dd/yyyy')\n- const endDatePicker = screen.getAllByDisplayValue(date)[0]\n+ const endDatePicker = within(screen.getByTestId('endDateDatePicker')).getByRole('textbox')\nconst endDatePickerLabel = screen.getByText(/patient.carePlan.endDate/i)\nexpect(endDatePicker).toBeInTheDocument()\nexpect(endDatePicker).toHaveValue(date)\n@@ -181,9 +179,7 @@ describe('Care Plan Form', () => {\nit('should call the on change handler when end date changes', () => {\nsetup()\n- const endDatePicker = screen.getAllByDisplayValue(\n- format(new Date(carePlan.endDate), 'MM/dd/yyyy'),\n- )[0]\n+ const endDatePicker = within(screen.getByTestId('endDateDatePicker')).getByRole('textbox')\nuserEvent.type(endDatePicker, '{arrowdown}{arrowleft}{enter}')\nexpect(onCarePlanChangeSpy).toHaveBeenCalledTimes(1)\n})\n@@ -211,10 +207,8 @@ describe('Care Plan Form', () => {\nexpect(screen.getByDisplayValue(diagnosis.name)).toBeDisabled()\nexpect(screen.getByDisplayValue(carePlan.status)).toBeDisabled()\nexpect(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(within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')).toBeDisabled()\n+ expect(within(screen.getByTestId('endDateDatePicker')).getByRole('textbox')).toBeDisabled()\nexpect(screen.getByLabelText(/patient.carePlan.note/i)).toBeDisabled()\n})\n@@ -234,13 +228,11 @@ describe('Care Plan Form', () => {\nconst alert = screen.getByRole('alert')\nconst titleInput = screen.getByLabelText(/patient.carePlan.title/i)\nconst 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 conditionInput = within(screen.getByTestId('conditionSelect')).getByRole('combobox')\n+ const statusInput = within(screen.getByTestId('statusSelect')).getByRole('combobox')\n+ const intentInput = within(screen.getByTestId('intentSelect')).getByRole('combobox')\n+ const startDateInput = within(screen.getByTestId('startDateDatePicker')).getByRole('textbox')\n+ const endDateInput = within(screen.getByTestId('endDateDatePicker')).getByRole('textbox')\nconst noteInput = screen.getByLabelText(/patient.carePlan.note/i)\nexpect(alert).toBeInTheDocument()\nexpect(alert).toHaveTextContent(expectedError.message)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "new_path": "src/__tests__/patients/diagnoses/DiagnosisForm.test.tsx", "diff": "-import { render, screen } from '@testing-library/react'\n+import { render, screen, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { format } from 'date-fns'\nimport React from 'react'\n@@ -78,7 +78,7 @@ describe('Diagnosis Form', () => {\nit('should render a visit selector', () => {\nsetup()\n- const visitSelector = screen.getAllByRole('combobox')[0]\n+ const visitSelector = within(screen.getByTestId('visitSelect')).getByRole('combobox')\nconst visitSelectorLabel = screen.getByText(/patient.diagnoses.visit/i)\nexpect(visitSelector).toBeInTheDocument()\nexpect(visitSelector).toHaveDisplayValue('')\n@@ -102,7 +102,7 @@ describe('Diagnosis Form', () => {\nit('should render a status selector', () => {\nsetup()\n- const statusSelector = screen.getAllByRole('combobox')[1]\n+ const statusSelector = within(screen.getByTestId('statusSelect')).getByRole('combobox')\nconst statusSelectorLabel = screen.getByText(/patient.diagnoses.status/i)\nexpect(statusSelector).toBeInTheDocument()\nexpect(statusSelector).toHaveValue(diagnosis.status)\n@@ -119,7 +119,7 @@ describe('Diagnosis Form', () => {\nit('should call the on change handler when status changes', () => {\nconst expectedNewStatus = DiagnosisStatus.Active\nsetup(false, false)\n- const statusSelector = screen.getAllByRole('combobox')[1]\n+ const statusSelector = within(screen.getByTestId('statusSelect')).getByRole('combobox')\nuserEvent.click(statusSelector)\nuserEvent.click(screen.getByText(expectedNewStatus))\nexpect(onDiagnosisChangeSpy).toHaveBeenCalledWith({ status: expectedNewStatus })\n@@ -127,7 +127,9 @@ describe('Diagnosis Form', () => {\nit('should render a diagnosis date picker', () => {\nsetup()\n- const diagnosisDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[0]\n+ const diagnosisDatePicker = within(screen.getByTestId('diagnosisDateDatePicker')).getByRole(\n+ 'textbox',\n+ )\nconst diagnosisDatePickerLabel = screen.getByText(/patient.diagnoses.diagnosisDate/i)\nexpect(diagnosisDatePicker).toBeInTheDocument()\nexpect(diagnosisDatePickerLabel).toBeInTheDocument()\n@@ -136,7 +138,9 @@ describe('Diagnosis Form', () => {\nit('should call the on change handler when diagnosis date changes', () => {\nsetup(false, false)\n- const diagnosisDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[0]\n+ const diagnosisDatePicker = within(screen.getByTestId('diagnosisDateDatePicker')).getByRole(\n+ 'textbox',\n+ )\nuserEvent.click(diagnosisDatePicker)\nuserEvent.type(diagnosisDatePicker, '{backspace}1{enter}')\nexpect(onDiagnosisChangeSpy).toHaveBeenCalled()\n@@ -144,7 +148,7 @@ describe('Diagnosis Form', () => {\nit('should render a onset date picker', () => {\nsetup()\n- const onsetDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[1]\n+ const onsetDatePicker = within(screen.getByTestId('onsetDateDatePicker')).getByRole('textbox')\nconst onsetDatePickerLabel = screen.getByText(/patient.diagnoses.onsetDate/i)\nexpect(onsetDatePicker).toBeInTheDocument()\nexpect(onsetDatePickerLabel).toBeInTheDocument()\n@@ -153,7 +157,7 @@ describe('Diagnosis Form', () => {\nit('should call the on change handler when onset date changes', () => {\nsetup(false, false)\n- const onsetDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[1]\n+ const onsetDatePicker = within(screen.getByTestId('onsetDateDatePicker')).getByRole('textbox')\nuserEvent.click(onsetDatePicker)\nuserEvent.type(onsetDatePicker, '{backspace}1{enter}')\nexpect(onDiagnosisChangeSpy).toHaveBeenCalled()\n@@ -161,7 +165,9 @@ describe('Diagnosis Form', () => {\nit('should render a abatement date picker', () => {\nsetup()\n- const abatementDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[2]\n+ const abatementDatePicker = within(screen.getByTestId('abatementDateDatePicker')).getByRole(\n+ 'textbox',\n+ )\nconst abatementDatePickerLabel = screen.getByText(/patient.diagnoses.abatementDate/i)\nexpect(abatementDatePicker).toBeInTheDocument()\nexpect(abatementDatePickerLabel).toBeInTheDocument()\n@@ -170,7 +176,9 @@ describe('Diagnosis Form', () => {\nit('should call the on change handler when abatementDate date changes', () => {\nsetup(false, false)\n- const abatementDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[2]\n+ const abatementDatePicker = within(screen.getByTestId('abatementDateDatePicker')).getByRole(\n+ 'textbox',\n+ )\nuserEvent.click(abatementDatePicker)\nuserEvent.type(abatementDatePicker, '{backspace}1{enter}')\nexpect(onDiagnosisChangeSpy).toHaveBeenCalled()\n@@ -197,7 +205,9 @@ describe('Diagnosis Form', () => {\nconst statusSelector = screen.getAllByRole('combobox')[1]\nconst diagnosisDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[0]\nconst onsetDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[1]\n- const abatementDatePicker = screen.getAllByDisplayValue(format(new Date(), 'MM/dd/yyyy'))[2]\n+ const abatementDatePicker = within(screen.getByTestId('abatementDateDatePicker')).getByRole(\n+ 'textbox',\n+ )\nconst noteInput = screen.getByLabelText(/patient.diagnoses.note/i)\nexpect(nameInput).toBeDisabled()\nexpect(statusSelector).toBeDisabled()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "new_path": "src/__tests__/imagings/requests/NewImagingRequest.test.tsx", "diff": "-import { render, screen } from '@testing-library/react'\n+import { render, screen, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -59,7 +59,7 @@ describe('New Imaging Request', () => {\nit('Renders a dropdown list of visits', async () => {\nsetup()\n- const dropdownVisits = screen.getAllByPlaceholderText('-- Choose --')[0]\n+ const dropdownVisits = within(screen.getByTestId('visitSelect')).getByRole('combobox')\nexpect(screen.getByText(/patient\\.visits\\.label/i)).toBeInTheDocument()\nexpect(dropdownVisits.getAttribute('aria-expanded')).toBe('false')\n@@ -70,8 +70,8 @@ describe('New Imaging Request', () => {\nit('Renders an image type input box', async () => {\nsetup()\n- const imgTypeInput = screen.getByPlaceholderText(/imagings\\.imaging\\.type/i)\n- expect(screen.getByLabelText(/imagings\\.imaging\\.type/i)).toBeInTheDocument()\n+ const imgTypeInput = screen.getByLabelText(/imagings\\.imaging\\.type/i)\n+ expect(screen.getByText(/imagings\\.imaging\\.type/i)).toBeInTheDocument()\nuserEvent.type(imgTypeInput, 'tricorder imaging')\nexpect(imgTypeInput).toHaveDisplayValue('tricorder imaging')\n@@ -79,7 +79,7 @@ describe('New Imaging Request', () => {\nit('Renders a status types select input field', async () => {\nsetup()\n- const dropdownStatusTypes = screen.getAllByPlaceholderText('-- Choose --')[1]\n+ const dropdownStatusTypes = within(screen.getByTestId('statusSelect')).getByRole('combobox')\nexpect(screen.getByText(/patient\\.visits\\.label/i)).toBeInTheDocument()\nexpect(dropdownStatusTypes.getAttribute('aria-expanded')).toBe('false')\n@@ -127,12 +127,12 @@ describe('New Imaging Request', () => {\nexpectOneConsoleError({ patient: 'imagings.requests.error.patientRequired' })\nsetup()\nconst patient = screen.getByPlaceholderText(/imagings\\.imaging\\.patient/i)\n- const imgTypeInput = screen.getByPlaceholderText(/imagings.imaging.type/i)\n+ const imgTypeInput = screen.getByLabelText(/imagings\\.imaging\\.type/i)\nconst notesInputField = screen.getByRole('textbox', {\nname: /imagings\\.imaging\\.notes/i,\n})\n- const dropdownStatusTypes = screen.getAllByPlaceholderText('-- Choose --')[1]\n- const dropdownVisits = screen.getAllByPlaceholderText('-- Choose --')[0]\n+ const dropdownStatusTypes = within(screen.getByTestId('statusSelect')).getByRole('combobox')\n+ const dropdownVisits = within(screen.getByTestId('visitSelect')).getByRole('combobox')\nuserEvent.type(patient, 'Worf')\nuserEvent.type(imgTypeInput, 'Medical Tricorder')\nuserEvent.type(notesInputField, 'Batliff')\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "new_path": "src/__tests__/incidents/report/ReportIncident.test.tsx", "diff": "-import { render, screen } from '@testing-library/react'\n+import { render, screen, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -58,7 +58,7 @@ describe('Report Incident', () => {\n}\nit('renders a department form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const departmentInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n+ const departmentInput = screen.getByLabelText(/incidents\\.reports\\.department/i)\nexpect(departmentInput).toBeEnabled()\nexpect(departmentInput).toBeInTheDocument()\n@@ -67,9 +67,9 @@ describe('Report Incident', () => {\nexpect(departmentInput).toHaveDisplayValue('Engineering Bay')\n})\n- test('renders a category form element that allows user input', async () => {\n+ it('renders a category form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const categoryInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n+ const categoryInput = screen.getByLabelText(/incidents\\.reports\\.category\\b/i)\nexpect(categoryInput).toBeEnabled()\nexpect(categoryInput).toBeInTheDocument()\n@@ -78,11 +78,9 @@ describe('Report Incident', () => {\nexpect(categoryInput).toHaveDisplayValue('Warp Engine')\n})\n- test('renders a category item form element that allows user input', async () => {\n+ it('renders a category item form element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const categoryItemInput = await screen.findByPlaceholderText(\n- /incidents\\.reports\\.categoryitem/i,\n- )\n+ const categoryItemInput = screen.getByLabelText(/incidents\\.reports\\.categoryitem/i)\nexpect(categoryItemInput).toBeInTheDocument()\nexpect(categoryItemInput).toBeEnabled()\n@@ -91,10 +89,9 @@ describe('Report Incident', () => {\nexpect(categoryItemInput).toHaveDisplayValue('Warp Coil')\n})\n- test('renders a description formField element that allows user input', async () => {\n+ it('renders a description formField element that allows user input', async () => {\nsetup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const inputArr = await screen.findAllByRole('textbox', { name: /required/i })\n- const descriptionInput = inputArr[inputArr.length - 1]\n+ const descriptionInput = screen.getByLabelText(/incidents\\.reports\\.description/i)\nexpect(descriptionInput).toBeInTheDocument()\nexpect(descriptionInput).toBeEnabled()\n@@ -102,27 +99,28 @@ describe('Report Incident', () => {\nuserEvent.type(descriptionInput, 'Geordi requested analysis')\nexpect(descriptionInput).toHaveDisplayValue('Geordi requested analysis')\n})\n- test(' renders action save button after all the input fields are filled out', async () => {\n- setup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- const departmentInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n- const categoryInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n- const categoryItemInput = await screen.findByPlaceholderText(\n- /incidents\\.reports\\.categoryitem/i,\n- )\n- const inputArr = await screen.findAllByRole('textbox', { name: /required/i })\n- const descriptionInput = inputArr[inputArr.length - 1]\n- userEvent.type(departmentInput, 'Engineering Bay')\n- userEvent.type(categoryInput, 'Warp Engine')\n- userEvent.type(categoryItemInput, 'Warp Coil')\n- userEvent.type(descriptionInput, 'Geordi requested analysis')\n+ // ! Remove test? Save button is always rendered regardless of input values\n+ // it(' renders action save button after all the input fields are filled out', async () => {\n+ // setup([Permissions.ViewIncident, Permissions.ResolveIncident])\n- userEvent.click(\n- screen.getByRole('button', {\n- name: /incidents\\.reports\\.new/i,\n- }),\n- )\n- })\n+ // expect(screen.queryByRole('button', { name: /incidents\\.reports\\.new/i })).not.toBeInTheDocument()\n+ // const departmentInput = screen.getByLabelText(/incidents\\.reports\\.department/i)\n+ // const categoryInput = screen.getByLabelText(/incidents\\.reports\\.category\\b/i)\n+ // const categoryItemInput = screen.getByLabelText(/incidents\\.reports\\.categoryitem/i)\n+ // const descriptionInput = screen.getByLabelText(/incidents\\.reports\\.description/i)\n+\n+ // userEvent.type(departmentInput, 'Engineering Bay')\n+ // userEvent.type(categoryInput, 'Warp Engine')\n+ // userEvent.type(categoryItemInput, 'Warp Coil')\n+ // userEvent.type(descriptionInput, 'Geordi requested analysis')\n+\n+ // userEvent.click(\n+ // screen.getByRole('button', {\n+ // name: /incidents\\.reports\\.new/i,\n+ // }),\n+ // )\n+ // })\nit('should display errors if validation fails', async () => {\nconst error = {\n@@ -144,14 +142,13 @@ describe('Report Incident', () => {\n}),\n)\n- const departmentInput = await screen.findByPlaceholderText(/incidents\\.reports\\.department/i)\n- const categoryInput = await screen.findByPlaceholderText(/incidents\\.reports\\.category\\b/i)\n- const categoryItemInput = await screen.findByPlaceholderText(\n- /incidents\\.reports\\.categoryitem/i,\n+ const departmentInput = screen.getByLabelText(/incidents\\.reports\\.department/i)\n+ const categoryInput = screen.getByLabelText(/incidents\\.reports\\.category\\b/i)\n+ const categoryItemInput = screen.getByLabelText(/incidents\\.reports\\.categoryitem/i)\n+ const descriptionInput = screen.getByLabelText(/incidents\\.reports\\.description/i)\n+ const dateInput = within(await screen.findByTestId('dateOfIncidentDateTimePicker')).getByRole(\n+ 'textbox',\n)\n- const inputArr = await screen.findAllByRole('textbox')\n- const descriptionInput = inputArr[inputArr.length - 2]\n- const dateInput = inputArr[0]\nconst invalidInputs = container.querySelectorAll('.is-invalid')\nexpect(invalidInputs).toHaveLength(5)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "new_path": "src/__tests__/labs/requests/NewLabRequest.test.tsx", "diff": "@@ -117,7 +117,7 @@ describe('New Lab Request', () => {\nsetup()\nconst selectLabel = screen.getByText(/patient\\.visit/i)\n- const selectInput = screen.getByPlaceholderText('-- Choose --')\n+ const selectInput = within(screen.getByTestId('visitSelect')).getByRole('combobox')\nexpect(selectInput).toBeInTheDocument()\nexpect(selectInput).toHaveDisplayValue([''])\n@@ -196,7 +196,7 @@ describe('New Lab Request', () => {\nconst alert = await screen.findByRole('alert')\nconst patientInput = screen.getByPlaceholderText(/labs\\.lab\\.patient/i)\n- const typeInput = screen.getByPlaceholderText(/labs\\.lab\\.type/i)\n+ const typeInput = screen.getByLabelText(/labs\\.lab\\.type/i)\nexpect(within(alert).getByText(error.message)).toBeInTheDocument()\nexpect(within(alert).getByText(/states\\.error/i)).toBeInTheDocument()\n@@ -224,7 +224,7 @@ describe('New Lab Request', () => {\nuserEvent.type(screen.getByPlaceholderText(/labs.lab.patient/i), 'Jim Bob')\nexpect(await screen.findByText(/jim bob/i)).toBeVisible()\nuserEvent.click(screen.getByText(/jim bob/i))\n- userEvent.type(screen.getByPlaceholderText(/labs\\.lab\\.type/i), expectedLab.type)\n+ userEvent.type(screen.getByLabelText(/labs\\.lab\\.type/i), expectedLab.type)\nuserEvent.type(screen.getByLabelText(/labs\\.lab\\.notes/i), (expectedLab.notes as string[])[0])\nuserEvent.click(screen.getByRole('button', { name: /labs\\.requests\\.new/i }))\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "new_path": "src/__tests__/medications/requests/NewMedicationRequest.test.tsx", "diff": "@@ -48,9 +48,7 @@ describe('New Medication Request', () => {\nsetup()\nexpect(screen.getByText(/medications\\.medication\\.medication/i)).toBeInTheDocument()\n- expect(\n- screen.getByPlaceholderText(/medications\\.medication\\.medication/i),\n- ).toBeInTheDocument()\n+ expect(screen.getByLabelText(/medications\\.medication\\.medication/i)).toBeInTheDocument()\n})\nit('render medication request status options', async () => {\n@@ -179,13 +177,13 @@ describe('New Medication Request', () => {\nit('should save the medication request and navigate to \"/medications/:id\"', async () => {\nconst { history } = setup()\nconst patient = screen.getByPlaceholderText(/medications\\.medication\\.patient/i)\n- const medication = screen.getByPlaceholderText(/medications\\.medication\\.medication/i)\n+ const medication = screen.getByLabelText(/medications\\.medication\\.medication/i)\nconst medicationNotes = screen.getByRole('textbox', {\nname: /medications\\.medication\\.notes/i,\n})\n- const medStatus = screen.getAllByPlaceholderText('-- Choose --')[0]\n- const medicationIntent = screen.getAllByPlaceholderText('-- Choose --')[1]\n- const medicationPriority = screen.getAllByPlaceholderText('-- Choose --')[2]\n+ const medStatus = within(screen.getByTestId('statusSelect')).getByRole('combobox')\n+ const medicationIntent = within(screen.getByTestId('intentSelect')).getByRole('combobox')\n+ const medicationPriority = within(screen.getByTestId('prioritySelect')).getByRole('combobox')\nuserEvent.type(patient, 'Bruce Wayne')\nuserEvent.type(medication, 'Ibuprofen')\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NotesList.test.tsx", "new_path": "src/__tests__/patients/notes/NotesList.test.tsx", "diff": "@@ -33,8 +33,13 @@ describe('Notes list', () => {\ntext: 'some name',\ndate: '1947-09-09T14:48:00.000Z',\n},\n+ {\n+ id: '457',\n+ text: 'some name',\n+ date: '1947-09-10T14:48:00.000Z',\n+ },\n]\n- const { container } = setup(expectedNotes)\n+ setup(expectedNotes)\nconst dateString = new Date(expectedNotes[0].date).toLocaleString()\nawait waitFor(() => {\n@@ -45,7 +50,7 @@ describe('Notes list', () => {\n).toBeInTheDocument()\n})\n- expect(container.querySelector('.list-group')?.children).toHaveLength(1)\n+ expect(screen.getAllByRole('listitem')).toHaveLength(2)\n})\nit('should display a warning when no notes are present', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/patients/notes/NotesList.tsx", "new_path": "src/patients/notes/NotesList.tsx", "diff": "@@ -40,7 +40,9 @@ const NotesList = (props: Props) => {\nonClick={() => history.push(`/patients/${patientId}/notes/${note.id}`)}\n>\n<p className=\"ref__note-item-date\">{new Date(note.date).toLocaleString()}</p>\n- <p className=\"ref__note-item-text\">{note.text}</p>\n+ <p role=\"listitem\" className=\"ref__note-item-text\">\n+ {note.text}\n+ </p>\n</ListItem>\n))}\n</List>\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -83,20 +83,17 @@ describe('ViewPatient', () => {\n})\n})\n- it('should add a \"Edit Patient\" button to the button tool bar if has WritePatients permissions', async () => {\n+ it('should render an \"Edit Patient\" button to the button tool bar if user has WritePatients permissions', async () => {\nsetup({ permissions: [Permissions.WritePatients] })\nawait waitFor(() => {\nexpect(screen.getByText(/actions\\.edit/i)).toBeInTheDocument()\n})\n+ screen.logTestingPlaygroundURL()\n})\n- it('button toolbar empty if only has ReadPatients permission', async () => {\n- const { container } = setup()\n-\n- await waitFor(() => {\n- expect(container.querySelector('.css-0')).not.toBeInTheDocument()\n- })\n+ it('should render an empty button toolbar if the user has only ReadPatients permissions', async () => {\n+ setup()\nexpect(screen.queryByText(/actions\\.edit/i)).not.toBeInTheDocument()\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/ContactInfo.test.tsx", "new_path": "src/__tests__/patients/ContactInfo.test.tsx", "diff": "-import { screen, render } from '@testing-library/react'\n+import { screen, render, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -64,7 +64,7 @@ describe('Contact Info in its Editable mode', () => {\nexpect(screen.getAllByRole('textbox')[1]).toHaveValue(`${data[0].value}`)\n- const selectInput = screen.getAllByPlaceholderText('-- Choose --')[0]\n+ const selectInput = within(screen.getByTestId('NumberType0Select')).getByRole('combobox')\nexpect(selectInput).toHaveValue('patient.contactInfoType.options.home')\n})\n@@ -157,7 +157,11 @@ describe('Contact Info in its non-Editable mode', () => {\nit('should render an empty element if no data is present', () => {\nconst { container } = setup()\n- expect(container.querySelectorAll('div').length).toBe(1)\n+ expect(container).toMatchInlineSnapshot(`\n+ <div>\n+ <div />\n+ </div>\n+ `)\n})\nit('should render the labels if data is provided', () => {\n@@ -170,15 +174,15 @@ describe('Contact Info in its non-Editable mode', () => {\nsetup(data)\nconst inputElement = screen.getAllByRole('textbox')[1]\n- const selectInput = screen.getAllByPlaceholderText('-- Choose --')[0]\n+ const selectInput = within(screen.getByTestId('NumberType0Select')).getByRole('combobox')\nexpect(selectInput).toHaveDisplayValue('patient.contactInfoType.options.home')\nexpect(inputElement).toHaveDisplayValue(`${data[0].value}`)\n})\nit('should show inputs that are not editable', () => {\nsetup(data)\n- const selectInput = screen.getAllByPlaceholderText('-- Choose --')[0]\nconst inputElement = screen.getAllByRole('textbox')[1]\n+ const selectInput = within(screen.getByTestId('NumberType0Select')).getByRole('combobox')\nexpect(selectInput).not.toHaveFocus()\nexpect(inputElement).not.toHaveFocus()\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/GeneralInformation.test.tsx", "new_path": "src/__tests__/patients/GeneralInformation.test.tsx", "diff": "@@ -14,7 +14,7 @@ Date.now = jest.fn().mockReturnValue(new Date().valueOf())\n// most fields use TextInputWithLabelFormGroup, an uncontrolled <input /> => tests are faster without onChange\nfunction setup(patientArg: Patient, isEditable = true, error?: Record<string, unknown>) {\n- render(\n+ return render(\n<Router history={createMemoryHistory()}>\n<GeneralInformation patient={patientArg} isEditable={isEditable} error={error} />\n</Router>,\n@@ -87,7 +87,7 @@ it('should display errors', () => {\n)\nexpect(screen.getByRole(/alert/i)).toHaveTextContent(error.message)\n- expect(screen.getByPlaceholderText(/givenName/i)).toHaveClass('is-invalid')\n+ expect(screen.getByLabelText(/patient\\.givenName/i)).toHaveClass('is-invalid')\nexpect(screen.getByText(/given name Error Message/i)).toHaveClass('invalid-feedback')\nexpect(screen.getByText(/date of birth Error Message/i)).toHaveClass('text-danger')\n@@ -114,22 +114,21 @@ describe('General Information, readonly', () => {\nit('should render the given name', () => {\nsetup(patient, false)\n- typeReadonlyAssertion(screen.getByPlaceholderText(/patient\\.givenName/i), patient.givenName)\n+ typeReadonlyAssertion(screen.getByLabelText(/patient\\.givenName/i), patient.givenName)\n})\nit('should render the family name', () => {\nsetup(patient, false)\n- typeReadonlyAssertion(screen.getByPlaceholderText(/patient\\.familyName/i), patient.familyName)\n+ typeReadonlyAssertion(screen.getByLabelText(/patient\\.familyName/i), patient.familyName)\n})\nit('should render the suffix', () => {\nsetup(patient, false)\n- typeReadonlyAssertion(screen.getByPlaceholderText(/patient\\.suffix/i), patient.suffix)\n+ typeReadonlyAssertion(screen.getByLabelText(/patient\\.suffix/i), patient.suffix)\n})\nit('should render the date of the birth of the patient', () => {\nsetup(patient, false)\n-\nconst expectedDate = format(new Date(patient.dateOfBirth), 'MM/dd/yyyy')\ntypeReadonlyAssertion(screen.getByDisplayValue(expectedDate), [expectedDate])\n})\n@@ -137,18 +136,18 @@ describe('General Information, readonly', () => {\nit('should render the approximate age if patient.isApproximateDateOfBirth is true', () => {\nconst newPatient = { ...patient, isApproximateDateOfBirth: true }\nsetup(newPatient, false)\n- typeReadonlyAssertion(screen.getByPlaceholderText(/patient.approximateAge/i), '30')\n+ typeReadonlyAssertion(screen.getByLabelText(/patient.approximateAge/i), '30')\n})\nit('should render the occupation of the patient', () => {\nsetup(patient, false)\n- typeReadonlyAssertion(screen.getByPlaceholderText(/patient.occupation/i), patient.occupation)\n+ typeReadonlyAssertion(screen.getByLabelText(/patient.occupation/i), patient.occupation)\n})\nit('should render the preferred language of the patient', () => {\nsetup(patient, false)\ntypeReadonlyAssertion(\n- screen.getByPlaceholderText(/patient.preferredLanguage/i),\n+ screen.getByLabelText(/patient.preferredLanguage/i),\npatient.preferredLanguage,\n)\n})\n@@ -235,13 +234,13 @@ describe('General Information, isEditable', () => {\nit('should render the occupation of the patient', () => {\nsetup(patient)\n- typeWritableAssertion(screen.getByPlaceholderText(/patient.occupation/i), [patient.occupation])\n+ typeWritableAssertion(screen.getByLabelText(/patient.occupation/i), [patient.occupation])\n})\nit('should render the preferred language of the patient', () => {\nsetup(patient)\ntypeWritableAssertion(\n- screen.getByPlaceholderText(/patient.preferredLanguage/i),\n+ screen.getByLabelText(/patient.preferredLanguage/i),\npatient.preferredLanguage,\n)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/ViewCareGoal.test.tsx", "new_path": "src/__tests__/patients/care-goals/ViewCareGoal.test.tsx", "diff": "-import { render as rtlRender } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\n-import React, { ReactNode, ReactElement } from 'react'\n+import React from 'react'\nimport { Router, Route } from 'react-router-dom'\nimport ViewCareGoal from '../../../patients/care-goals/ViewCareGoal'\nimport PatientRepository from '../../../shared/db/PatientRepository'\nimport Patient from '../../../shared/model/Patient'\n-type WrapperProps = {\n- // eslint-disable-next-line react/require-default-props\n- children?: ReactNode\n-}\n-\ndescribe('View Care Goal', () => {\nconst patient = {\nid: '123',\n@@ -20,24 +15,23 @@ describe('View Care Goal', () => {\ncareGoals: [{ id: '123', description: 'some description' }],\n} as Patient\n- const render = () => {\n+ const setup = () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/care-goals/${patient.careGoals[0].id}`)\n- const Wrapper = ({ children }: WrapperProps): ReactElement => (\n+ return render(\n<Router history={history}>\n- <Route path=\"/patients/:id/care-goals/:careGoalId\">{children}</Route>\n- </Router>\n+ <Route path=\"/patients/:id/care-goals/:careGoalId\">\n+ <ViewCareGoal />\n+ </Route>\n+ </Router>,\n)\n-\n- const results = rtlRender(<ViewCareGoal />, { wrapper: Wrapper })\n-\n- return results\n}\n- it('should render the care goal form', () => {\n- const { container } = render()\n- expect(container.querySelectorAll('div').length).toBe(4)\n+ it('should render the care goal form', async () => {\n+ setup()\n+\n+ expect(await screen.findByLabelText('care-goal-form')).toBeInTheDocument()\n})\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/AddVisitModal.test.tsx", "new_path": "src/__tests__/patients/visits/AddVisitModal.test.tsx", "diff": "-import { screen, render as rtlRender, fireEvent, waitFor } from '@testing-library/react'\n+import { screen, render, fireEvent, waitFor, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -26,32 +26,26 @@ describe('Add Visit Modal', () => {\n} as Patient\nconst onCloseSpy = jest.fn()\n- const render = () => {\n+ const setup = () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'saveOrUpdate')\nconst history = createMemoryHistory()\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => <Router history={history}>{children}</Router>\n-\n- const results = rtlRender(\n- <AddVisitModal show onCloseButtonClick={onCloseSpy} patientId={patient.id} />,\n- {\n- wrapper: Wrapper,\n- },\n+ return render(\n+ <Router history={history}>\n+ <AddVisitModal show onCloseButtonClick={onCloseSpy} patientId={patient.id} />\n+ </Router>,\n)\n-\n- return results\n}\nit('should render a modal and within a form', () => {\n- render()\n+ setup()\nexpect(screen.getByRole('dialog').querySelector('form')).toBeInTheDocument()\n})\nit('should call the on close function when the cancel button is clicked', () => {\n- render()\n+ setup()\nuserEvent.click(\nscreen.getByRole('button', {\nname: /close/i,\n@@ -61,14 +55,16 @@ describe('Add Visit Modal', () => {\n})\nit('should save the visit when the save button is clicked', async () => {\n- render()\n+ setup()\nconst testPatient = patient.visits[0]\n- const modal = screen.getByRole('dialog')\n/* Date Pickers */\n- const modalDatePickerWrappers = modal.querySelectorAll('.react-datepicker__input-container')\n- const startDateInput = modalDatePickerWrappers[0].querySelector('input') as HTMLInputElement\n- const endDateInput = modalDatePickerWrappers[1].querySelector('input') as HTMLInputElement\n+ const startDateInput = within(screen.getByTestId('startDateTimeDateTimePicker')).getByRole(\n+ 'textbox',\n+ )\n+ const endDateInput = within(screen.getByTestId('endDateTimeDateTimePicker')).getByRole(\n+ 'textbox',\n+ )\nfireEvent.change(startDateInput, { target: { value: testPatient.startDateTime } })\nfireEvent.change(endDateInput, { target: { value: testPatient.endDateTime } })\n@@ -80,7 +76,7 @@ describe('Add Visit Modal', () => {\nconst statusInput = screen.getByRole('combobox')\nuserEvent.type(statusInput, `${testPatient.status}{arrowdown}{enter}`)\n- const textareaReason = screen.getAllByRole('textbox')[4]\n+ const textareaReason = screen.getByLabelText(/patient\\.visits\\.reason/i)\nuserEvent.type(textareaReason, testPatient.reason)\nconst locationInput = screen.getByLabelText(/patient.visits.location/i)\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/ViewMedication.test.tsx", "new_path": "src/__tests__/medications/ViewMedication.test.tsx", "diff": "@@ -60,18 +60,19 @@ describe('View Medication', () => {\n},\n} as any)\n- const Wrapper: React.FC = ({ children }: any) => (\n+ return render(\n<ButtonBarProvider.ButtonBarProvider>\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/medications/:id\">\n- <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider>\n+ <ViewMedication />\n+ </titleUtil.TitleProvider>\n</Route>\n</Router>\n</Provider>\n- </ButtonBarProvider.ButtonBarProvider>\n+ </ButtonBarProvider.ButtonBarProvider>,\n)\n- return render(<ViewMedication />, { wrapper: Wrapper })\n}\ndescribe('page content', () => {\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, waitForElementToBeRemoved, within } from '@testing-library/react'\nimport userEvent, { specialChars } from '@testing-library/user-event'\nimport format from 'date-fns/format'\n-import { createMemoryHistory, MemoryHistory } from 'history'\n+import { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\nimport { Router, Route } from 'react-router-dom'\n@@ -18,30 +18,10 @@ import { RootState } from '../../../shared/store'\nconst mockStore = createMockStore<RootState, any>([thunk])\nconst { selectAll, arrowDown, enter } = specialChars\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-\nconst setup = (\nroute: string,\npermissions: Permissions[],\n- wrapper = TabWrapper,\n+ wrapper = 'tab',\nincludeCareGoal = true,\n) => {\nconst expectedCareGoal = {\n@@ -63,8 +43,22 @@ const setup = (\njest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\nconst history = createMemoryHistory({ initialEntries: [route] })\nconst store = mockStore({ user: { permissions } } as any)\n-\n- return render(<CareGoalTab />, { wrapper: wrapper(store, history) })\n+ const path =\n+ wrapper === 'tab'\n+ ? '/patients/:id'\n+ : wrapper === 'view'\n+ ? '/patients/:id/care-goals/:careGoalId'\n+ : ''\n+\n+ return render(\n+ <Provider store={store}>\n+ <Router history={history}>\n+ <Route path={path}>\n+ <CareGoalTab />\n+ </Route>\n+ </Router>\n+ </Provider>,\n+ )\n}\ndescribe('Care Goals Tab', () => {\n@@ -84,7 +78,7 @@ describe('Care Goals Tab', () => {\ndueDate: new Date('2020-02-01'),\n}\n- setup('/patients/123/care-goals', [Permissions.AddCareGoal], TabWrapper, false)\n+ setup('/patients/123/care-goals', [Permissions.AddCareGoal], 'tab', false)\nuserEvent.click(await screen.findByRole('button', { name: /patient.careGoal.new/i }))\n@@ -148,7 +142,7 @@ describe('Care Goals Tab', () => {\n})\nit('should render care goal view when on patients/:id/care-goals/:careGoalId', async () => {\n- setup('/patients/123/care-goals/456', [Permissions.ReadCareGoal], ViewWrapper)\n+ setup('/patients/123/care-goals/456', [Permissions.ReadCareGoal], 'view')\nexpect(await screen.findByRole('form')).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": "@@ -25,14 +25,12 @@ describe('Add Care Plan Modal', () => {\njest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\njest.spyOn(PatientRepository, 'saveOrUpdate')\nconst history = createMemoryHistory()\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => <Router history={history}>{children}</Router>\n- const result = render(\n- <AddCarePlanModal patient={patient} show onCloseButtonClick={onCloseSpy} />,\n- { wrapper: Wrapper },\n+ return render(\n+ <Router history={history}>\n+ <AddCarePlanModal patient={patient} show onCloseButtonClick={onCloseSpy} />\n+ </Router>,\n)\n- return result\n}\nbeforeEach(() => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "new_path": "src/__tests__/patients/edit/EditPatient.test.tsx", "diff": "@@ -42,20 +42,19 @@ const setup = () => {\nconst history = createMemoryHistory({ initialEntries: ['/patients/edit/123'] })\nconst store = mockStore({ patient: { patient } } as any)\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ return {\n+ history,\n+ ...render(\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/patients/edit/:id\">\n- <titleUtil.TitleProvider>{children}</titleUtil.TitleProvider>\n+ <titleUtil.TitleProvider>\n+ <EditPatient />\n+ </titleUtil.TitleProvider>\n</Route>\n</Router>\n- </Provider>\n- )\n-\n- return {\n- history,\n- ...render(<EditPatient />, { wrapper: Wrapper }),\n+ </Provider>,\n+ ),\n}\n}\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NewNoteModal.test.tsx", "new_path": "src/__tests__/patients/notes/NewNoteModal.test.tsx", "diff": "-import { screen, render as rtlRender, waitFor } from '@testing-library/react'\n+import { screen, render, waitFor } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\n@@ -14,10 +14,10 @@ describe('New Note Modal', () => {\n} as Patient\nconst onCloseSpy = jest.fn()\n- const render = () => {\n+ const setup = () => {\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(mockPatient)\njest.spyOn(PatientRepository, 'find').mockResolvedValue(mockPatient)\n- const results = rtlRender(\n+ return render(\n<NewNoteModal\nshow\nonCloseButtonClick={onCloseSpy}\n@@ -25,11 +25,10 @@ describe('New Note Modal', () => {\npatientId={mockPatient.id}\n/>,\n)\n- return results\n}\nit('should render a modal with the correct labels', async () => {\n- render()\n+ setup()\nexpect(await screen.findByRole('dialog')).toBeInTheDocument()\nexpect(\n@@ -49,7 +48,7 @@ describe('New Note Modal', () => {\n})\nit('should render a notes rich text editor', () => {\n- render()\n+ setup()\nexpect(screen.getByRole('textbox')).toBeInTheDocument()\nexpect(screen.getByText('patient.note').querySelector('svg')).toHaveAttribute(\n@@ -65,7 +64,7 @@ describe('New Note Modal', () => {\n}\nexpectOneConsoleError(expectedError)\n- render()\n+ setup()\nuserEvent.click(\nscreen.getByRole('button', {\n@@ -82,7 +81,7 @@ describe('New Note Modal', () => {\ndescribe('on cancel', () => {\nit('should call the onCloseButtonCLick function when the cancel button is clicked', async () => {\n- render()\n+ setup()\nuserEvent.click(\nscreen.getByRole('button', {\n@@ -96,7 +95,7 @@ describe('New Note Modal', () => {\ndescribe('on save', () => {\nit('should dispatch add note', async () => {\nconst expectedNote = 'some note'\n- render()\n+ setup()\nconst noteTextField = screen.getByRole('textbox')\nuserEvent.type(noteTextField, expectedNote)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -54,24 +54,23 @@ describe('ViewPatient', () => {\nuser: { permissions: [Permissions.ReadPatients, ...permissions] },\n} as any)\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ return {\n+ history,\n+ store,\n+ ...render(\n<Provider store={store}>\n<ButtonBarProvider>\n<ButtonToolbar />\n<Router history={history}>\n<Route path=\"/patients/:id\">\n- <TitleProvider>{children}</TitleProvider>\n+ <TitleProvider>\n+ <ViewPatient />\n+ </TitleProvider>\n</Route>\n</Router>\n</ButtonBarProvider>\n- </Provider>\n- )\n-\n- return {\n- history,\n- store,\n- ...render(<ViewPatient />, { wrapper: Wrapper }),\n+ </Provider>,\n+ ),\n}\n}\n@@ -89,7 +88,6 @@ describe('ViewPatient', () => {\nawait waitFor(() => {\nexpect(screen.getByText(/actions\\.edit/i)).toBeInTheDocument()\n})\n- screen.logTestingPlaygroundURL()\n})\nit('should render an empty button toolbar if the user has only ReadPatients permissions', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "new_path": "src/__tests__/scheduling/appointments/edit/EditAppointment.test.tsx", "diff": "@@ -63,18 +63,17 @@ describe('Edit Appointment', () => {\nhistory.push('/appointments/edit/123')\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ return render(\n<Provider store={store}>\n<Router history={history}>\n<Route path=\"/appointments/edit/:id\">\n- <TitleProvider>{children}</TitleProvider>\n+ <TitleProvider>\n+ <EditAppointment />\n+ </TitleProvider>\n</Route>\n</Router>\n- </Provider>\n+ </Provider>,\n)\n-\n- return render(<EditAppointment />, { wrapper: Wrapper })\n}\nbeforeEach(() => {\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": "@@ -58,21 +58,21 @@ describe('New Appointment', () => {\nconst history = createMemoryHistory({ initialEntries: ['/appointments/new'] })\n- const Wrapper: React.FC = ({ children }: any) => (\n+ return {\n+ expectedAppointment,\n+ history,\n+ ...render(\n<ReactQueryConfigProvider config={noRetryConfig}>\n<Provider store={mockStore({} as any)}>\n<Router history={history}>\n- <TitleProvider>{children}</TitleProvider>\n+ <TitleProvider>\n+ <NewAppointment />\n+ </TitleProvider>\n</Router>\n<Toaster draggable hideProgressBar />\n</Provider>\n- </ReactQueryConfigProvider>\n- )\n-\n- return {\n- expectedAppointment,\n- history,\n- ...render(<NewAppointment />, { wrapper: Wrapper }),\n+ </ReactQueryConfigProvider>,\n+ ),\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": "@@ -55,26 +55,25 @@ const setup = (permissions = [Permissions.ReadAppointments], skipSpies = false)\n},\n} as any)\n- // eslint-disable-next-line react/prop-types\n- const Wrapper: React.FC = ({ children }) => (\n+ return {\n+ history,\n+ expectedAppointment,\n+ expectedPatient,\n+ ...render(\n<Provider store={store}>\n<Router history={history}>\n<ButtonBarProvider>\n<ButtonToolbar />\n<Route path=\"/appointments/:id\">\n- <TitleProvider>{children}</TitleProvider>\n+ <TitleProvider>\n+ <ViewAppointment />\n+ </TitleProvider>\n</Route>\n</ButtonBarProvider>\n<Toaster draggable hideProgressBar />\n</Router>\n- </Provider>\n- )\n-\n- return {\n- history,\n- expectedAppointment,\n- expectedPatient,\n- ...render(<ViewAppointment />, { wrapper: Wrapper }),\n+ </Provider>,\n+ ),\n}\n}\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 { render, screen, waitForElementToBeRemoved } from '@testing-library/react'\n+import { render, screen, within, waitForElementToBeRemoved } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -13,8 +13,23 @@ import Patient from '../../../shared/model/Patient'\nimport Permissions from '../../../shared/model/Permissions'\nimport RelatedPerson from '../../../shared/model/RelatedPerson'\nimport { RootState } from '../../../shared/store'\n+import { expectOneConsoleError } from '../../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\n+const patients = [\n+ {\n+ id: 'patient1',\n+ fullName: 'fullName',\n+ code: 'code1',\n+ },\n+ {\n+ id: 'patient2',\n+ fullName: 'fullName2',\n+ givenName: 'Patient',\n+ familyName: 'PatientFamily',\n+ code: 'code2',\n+ },\n+] as Patient[]\nconst setup = ({\npermissions = [Permissions.WritePatients, Permissions.ReadPatients],\n@@ -34,15 +49,19 @@ const setup = ({\nid: '123001',\n} as 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, 'find').mockImplementation(async (id: string) => {\n+ if (id === expectedRelatedPerson.id) {\n+ return expectedRelatedPerson\n+ }\n+ if (id === expectedPatient.id) {\n+ return expectedPatient\n+ }\n+ return patients[1]\n+ })\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedPatient)\njest.spyOn(PatientRepository, 'getLabs').mockResolvedValue([])\n+ jest.spyOn(PatientRepository, 'search').mockResolvedValue(patients)\n+ jest.spyOn(PatientRepository, 'count').mockResolvedValue(2)\nconst history = createMemoryHistory({ initialEntries: ['/patients/123/relatedpersons'] })\nconst store = mockStore({\n@@ -93,6 +112,87 @@ describe('Related Persons Tab', () => {\nexpect(await screen.findByRole('dialog')).toBeInTheDocument()\n})\n+\n+ it('should render a modal', async () => {\n+ setup()\n+\n+ userEvent.click(await screen.findByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\n+ const modal = await screen.findByRole('dialog')\n+\n+ expect(modal).toBeInTheDocument()\n+ expect(within(modal).getByPlaceholderText(/^patient.relatedPerson$/i)).toBeInTheDocument()\n+\n+ const relationshipTypeInput = within(modal).getByLabelText(\n+ /^patient.relatedPersons.relationshipType$/i,\n+ )\n+ expect(relationshipTypeInput).toBeInTheDocument()\n+ expect(relationshipTypeInput).not.toBeDisabled()\n+ expect(within(modal).getByRole('button', { name: /close/i })).toBeInTheDocument()\n+ expect(\n+ within(modal).getByRole('button', { name: /patient.relatedPersons.add/i }),\n+ ).toBeInTheDocument()\n+ })\n+\n+ it('should render the error when there is an error saving', async () => {\n+ setup()\n+\n+ userEvent.click(await screen.findByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\n+ const modal = await screen.findByRole('dialog')\n+ const expectedErrorMessage = 'patient.relatedPersons.error.unableToAddRelatedPerson'\n+ const expectedError = {\n+ relatedPersonError: 'patient.relatedPersons.error.relatedPersonRequired',\n+ relationshipTypeError: 'patient.relatedPersons.error.relationshipTypeRequired',\n+ }\n+ expectOneConsoleError(expectedError)\n+\n+ userEvent.click(within(modal).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+\n+ it('should call the save function with the correct data', async () => {\n+ setup()\n+\n+ userEvent.click(await screen.findByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\n+ const modal = await screen.findByRole('dialog')\n+\n+ await userEvent.type(\n+ within(modal).getByPlaceholderText(/^patient.relatedPerson$/i),\n+ patients[1].fullName as string,\n+ { delay: 50 },\n+ )\n+ userEvent.click(await within(modal).findByText(/^fullname2/i))\n+\n+ userEvent.type(\n+ within(modal).getByLabelText(/^patient.relatedPersons.relationshipType$/i),\n+ 'relationship',\n+ )\n+\n+ userEvent.click(within(modal).getByRole('button', { name: /patient.relatedPersons.add/i }))\n+\n+ expect(await screen.findByRole('cell', { name: patients[1].givenName })).toBeInTheDocument()\n+ expect(await screen.findByRole('cell', { name: patients[1].familyName })).toBeInTheDocument()\n+ expect(await screen.findByRole('cell', { name: /relationship/i })).toBeInTheDocument()\n+\n+ // expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n+ // expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n+ // expect.objectContaining({\n+ // relatedPersons: [\n+ // expect.objectContaining({\n+ // patientId: '456',\n+ // type: 'relationship',\n+ // }),\n+ // ],\n+ // }),\n+ // )\n+ }, 60000)\n})\ndescribe('Table', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/hooks/useRequestImaging.test.tsx", "new_path": "src/__tests__/imagings/hooks/useRequestImaging.test.tsx", "diff": "@@ -16,6 +16,7 @@ describe('useReportIncident', () => {\nconst user = {\nfullName: 'test',\n+ id: 'test-hospitalrun',\npermissions: [],\nloginError: {} as LoginError,\n} as UserState\n@@ -35,7 +36,8 @@ describe('useReportIncident', () => {\nconst expectedImagingRequest = {\n...givenImagingRequest,\nrequestedOn: expectedDate.toISOString(),\n- requestedBy: 'test',\n+ requestedBy: 'test-hospitalrun',\n+ requestedByFullName: 'test',\n} as Imaging\njest.spyOn(ImagingRepository, 'save').mockResolvedValue(expectedImagingRequest)\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/hooks/useRequestImaging.tsx", "new_path": "src/imagings/hooks/useRequestImaging.tsx", "diff": "@@ -24,7 +24,8 @@ function requestImagingWrapper(user: any) {\nawait ImagingRepository.save({\n...request,\n- requestedBy: user?.fullName || '',\n+ requestedBy: user?.id || '',\n+ requestedByFullName: user?.fullName || '',\nrequestedOn: new Date(Date.now()).toISOString(),\n} as Imaging)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/imagings/search/ImagingRequestTable.tsx", "new_path": "src/imagings/search/ImagingRequestTable.tsx", "diff": "@@ -37,7 +37,7 @@ const ImagingRequestTable = (props: Props) => {\n{\nlabel: t('imagings.imaging.requestedBy'),\nkey: 'requestedBy',\n- formatter: (row) => extractUsername(row.requestedBy),\n+ formatter: (row) => extractUsername(row.requestedByFullName || ''),\n},\n{ label: t('imagings.imaging.status'), key: 'status' },\n]}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/model/Imaging.ts", "new_path": "src/shared/model/Imaging.ts", "diff": "@@ -9,6 +9,7 @@ export default interface Imaging extends AbstractDBModel {\nvisitId: string\nrequestedOn: string\nrequestedBy: string // will be the currently logged in user's id\n+ requestedByFullName?: string\ncompletedOn?: string\ncanceledOn?: string\nnotes?: string\n" } ]

[ { "change_type": "DELETE", "old_path": "src/__tests__/patients/related-persons/AddRelatedPersonModal.test.tsx", "new_path": null, "diff": "-import { act, render, screen } from '@testing-library/react'\n-import userEvent from '@testing-library/user-event'\n-import React from 'react'\n-\n-import AddRelatedPersonModal from '../../../patients/related-persons/AddRelatedPersonModal'\n-import PatientRepository from '../../../shared/db/PatientRepository'\n-import Patient from '../../../shared/model/Patient'\n-import { expectOneConsoleError } from '../../test-utils/console.utils'\n-\n-describe('Add Related Person Modal', () => {\n- const patients = [\n- {\n- id: '123',\n- fullName: 'fullName',\n- code: 'code1',\n- },\n- {\n- id: '456',\n- fullName: 'fullName2',\n- code: 'code2',\n- },\n- ] as Patient[]\n-\n- const setup = () => {\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)\n-\n- return render(\n- <AddRelatedPersonModal\n- show\n- patientId={patients[0].id}\n- onCloseButtonClick={jest.fn()}\n- toggle={jest.fn()}\n- />,\n- )\n- }\n-\n- describe('layout', () => {\n- it('should render a modal', () => {\n- setup()\n-\n- expect(screen.getByRole('dialog')).toBeInTheDocument()\n- })\n-\n- it('should render a patient search typeahead', () => {\n- setup()\n-\n- expect(screen.getByPlaceholderText(/^patient.relatedPerson$/i)).toBeInTheDocument()\n- })\n-\n- it('should render a relationship type text input', () => {\n- setup()\n-\n- const relationshipTypeInput = screen.getByLabelText(\n- /^patient.relatedPersons.relationshipType$/i,\n- )\n- expect(relationshipTypeInput).toBeInTheDocument()\n- expect(relationshipTypeInput).not.toBeDisabled()\n- })\n-\n- it('should render a cancel button', () => {\n- setup()\n-\n- expect(screen.getByRole('button', { name: /close/i })).toBeInTheDocument()\n- })\n-\n- it('should render an add new related person button button', () => {\n- setup()\n-\n- expect(\n- screen.getByRole('button', { name: /patient.relatedPersons.add/i }),\n- ).toBeInTheDocument()\n- })\n-\n- it('should render the error when there is an error saving', async () => {\n- setup()\n-\n- const expectedErrorMessage = 'patient.relatedPersons.error.unableToAddRelatedPerson'\n- const expectedError = {\n- relatedPersonError: 'patient.relatedPersons.error.relatedPersonRequired',\n- relationshipTypeError: 'patient.relatedPersons.error.relationshipTypeRequired',\n- }\n- expectOneConsoleError(expectedError)\n-\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- })\n-\n- describe('save', () => {\n- it('should call the save function with the correct data', async () => {\n- setup()\n-\n- await userEvent.type(\n- screen.getByPlaceholderText(/^patient.relatedPerson$/i),\n- patients[1].fullName as string,\n- { delay: 50 },\n- )\n- userEvent.click(await screen.findByText(/^fullname2/i))\n-\n- userEvent.type(\n- screen.getByLabelText(/^patient.relatedPersons.relationshipType$/i),\n- 'relationship',\n- )\n- await act(async () => {\n- userEvent.click(screen.getByRole('button', { name: /patient.relatedPersons.add/i }))\n- })\n-\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n- expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n- expect.objectContaining({\n- relatedPersons: [\n- expect.objectContaining({\n- patientId: '456',\n- type: 'relationship',\n- }),\n- ],\n- }),\n- )\n- }, 60000)\n- })\n-})\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 { render, screen, within, waitForElementToBeRemoved } from '@testing-library/react'\n+import { render, screen, within, waitFor, waitForElementToBeRemoved } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -16,20 +16,6 @@ import { RootState } from '../../../shared/store'\nimport { expectOneConsoleError } from '../../test-utils/console.utils'\nconst mockStore = createMockStore<RootState, any>([thunk])\n-const patients = [\n- {\n- id: 'patient1',\n- fullName: 'fullName',\n- code: 'code1',\n- },\n- {\n- id: 'patient2',\n- fullName: 'fullName2',\n- givenName: 'Patient',\n- familyName: 'PatientFamily',\n- code: 'code2',\n- },\n-] as Patient[]\nconst setup = ({\npermissions = [Permissions.WritePatients, Permissions.ReadPatients],\n@@ -48,20 +34,27 @@ const setup = ({\nfamilyName: 'Patient',\nid: '123001',\n} as Patient\n+ const newRelatedPerson = {\n+ id: 'patient2',\n+ fullName: 'fullName2',\n+ givenName: 'Patient',\n+ familyName: 'PatientFamily',\n+ code: 'code2',\n+ } as Patient\njest.spyOn(PatientRepository, 'find').mockImplementation(async (id: string) => {\nif (id === expectedRelatedPerson.id) {\nreturn expectedRelatedPerson\n}\n- if (id === expectedPatient.id) {\n- return expectedPatient\n+ if (id === newRelatedPerson.id) {\n+ return newRelatedPerson\n}\n- return patients[1]\n+ return expectedPatient\n})\njest.spyOn(PatientRepository, 'saveOrUpdate').mockResolvedValue(expectedPatient)\njest.spyOn(PatientRepository, 'getLabs').mockResolvedValue([])\n- jest.spyOn(PatientRepository, 'search').mockResolvedValue(patients)\n- jest.spyOn(PatientRepository, 'count').mockResolvedValue(2)\n+ jest.spyOn(PatientRepository, 'search').mockResolvedValue([newRelatedPerson])\n+ jest.spyOn(PatientRepository, 'count').mockResolvedValue(1)\nconst history = createMemoryHistory({ initialEntries: ['/patients/123/relatedpersons'] })\nconst store = mockStore({\n@@ -74,6 +67,7 @@ const setup = ({\nreturn {\nexpectedPatient,\nexpectedRelatedPerson,\n+ newRelatedPatient: newRelatedPerson,\nhistory,\n...render(\n<Provider store={store}>\n@@ -113,7 +107,7 @@ describe('Related Persons Tab', () => {\nexpect(await screen.findByRole('dialog')).toBeInTheDocument()\n})\n- it('should render a modal', async () => {\n+ it('should render a modal with expected input fields', async () => {\nsetup()\nuserEvent.click(await screen.findByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\n@@ -157,42 +151,32 @@ describe('Related Persons Tab', () => {\nexpect(screen.getByText(expectedError.relationshipTypeError)).toBeInTheDocument()\n})\n- it('should call the save function with the correct data', async () => {\n- setup()\n+ it('should add a related person to the table with the correct data', async () => {\n+ const { newRelatedPatient } = setup()\n- userEvent.click(await screen.findByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\n+ userEvent.click(screen.getByRole('button', { name: /patient\\.relatedPersons\\.add/i }))\nconst modal = await screen.findByRole('dialog')\n- await userEvent.type(\n+ userEvent.type(\nwithin(modal).getByPlaceholderText(/^patient.relatedPerson$/i),\n- patients[1].fullName as string,\n- { delay: 50 },\n+ newRelatedPatient.fullName as string,\n)\n+\nuserEvent.click(await within(modal).findByText(/^fullname2/i))\nuserEvent.type(\nwithin(modal).getByLabelText(/^patient.relatedPersons.relationshipType$/i),\n- 'relationship',\n+ 'new relationship',\n)\nuserEvent.click(within(modal).getByRole('button', { name: /patient.relatedPersons.add/i }))\n- expect(await screen.findByRole('cell', { name: patients[1].givenName })).toBeInTheDocument()\n- expect(await screen.findByRole('cell', { name: patients[1].familyName })).toBeInTheDocument()\n- expect(await screen.findByRole('cell', { name: /relationship/i })).toBeInTheDocument()\n-\n- // expect(PatientRepository.saveOrUpdate).toHaveBeenCalledTimes(1)\n- // expect(PatientRepository.saveOrUpdate).toHaveBeenCalledWith(\n- // expect.objectContaining({\n- // relatedPersons: [\n- // expect.objectContaining({\n- // patientId: '456',\n- // type: 'relationship',\n- // }),\n- // ],\n- // }),\n- // )\n- }, 60000)\n+ await waitFor(() => {\n+ expect(screen.getByRole('cell', { name: newRelatedPatient.familyName })).toBeInTheDocument()\n+ expect(screen.getByRole('cell', { name: newRelatedPatient.givenName })).toBeInTheDocument()\n+ expect(screen.getByRole('cell', { name: /new relationship/i })).toBeInTheDocument()\n+ })\n+ })\n})\ndescribe('Table', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/imagings/search/ImagingRequestTable.test.tsx", "new_path": "src/__tests__/imagings/search/ImagingRequestTable.test.tsx", "diff": "@@ -13,10 +13,12 @@ describe('Imaging Request Table', () => {\nid: '1234',\ntype: 'imaging type',\npatient: 'patient',\n- fullName: 'full name',\n- status: 'requested',\n+ fullName: 'Jean Luc Picard',\nrequestedOn: new Date().toISOString(),\n+ status: 'requested',\nrequestedBy: 'some user',\n+ // requestedByFullName gets passed into the custom hook that spreads it into the save function\n+ requestedByFullName: 'Full Name Mock',\n} as Imaging\nconst setup = (searchRequest: ImagingSearchRequest) => {\n@@ -45,7 +47,7 @@ describe('Imaging Request Table', () => {\nformat(new Date(expectedImaging.requestedOn), 'yyyy-MM-dd hh:mm a'),\n)\nexpect(cells[3]).toHaveTextContent(expectedImaging.fullName)\n- expect(cells[4]).toHaveTextContent(expectedImaging.requestedBy)\n+ expect(cells[4]).toHaveTextContent(expectedImaging.requestedByFullName as string)\nexpect(cells[5]).toHaveTextContent(expectedImaging.status)\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 { screen, render, waitFor } from '@testing-library/react'\n+import { screen, render, waitFor, within } from '@testing-library/react'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -47,18 +47,16 @@ describe('View Visit', () => {\n})\nit('should render a visit form with the correct data', async () => {\n- const { container } = setup()\n+ setup()\n- await waitFor(() => {\n- expect(container.querySelector('form')).toBeInTheDocument()\n- })\n+ expect(await screen.findByLabelText('visit form')).toBeInTheDocument()\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 startDateTimePicker = within(screen.getByTestId('startDateTimeDateTimePicker')).getByRole(\n+ 'textbox',\n+ )\n+ const endDateTimePicker = within(screen.getByTestId('endDateTimeDateTimePicker')).getByRole(\n+ 'textbox',\n+ )\nconst typeInput = screen.getByPlaceholderText(/patient.visits.type/i)\nconst statusSelector = screen.getByPlaceholderText('-- Choose --')\nconst reasonInput = screen.getAllByRole('textbox', { hidden: false })[3]\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": "import { Toaster } from '@hospitalrun/components'\n-import { render, screen, waitFor, fireEvent } from '@testing-library/react'\n+import { render, screen, waitFor, fireEvent, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport addMinutes from 'date-fns/addMinutes'\nimport roundToNearestMinutes from 'date-fns/roundToNearestMinutes'\n@@ -78,11 +78,9 @@ describe('New Appointment', () => {\ndescribe('layout', () => {\nit('should render an Appointment Detail Component', async () => {\n- const { container } = setup()\n+ setup()\n- await waitFor(() => {\n- expect(container.querySelector('form')).toBeInTheDocument()\n- })\n+ expect(await screen.findByLabelText('new appointment form')).toBeInTheDocument()\n})\n})\n@@ -122,7 +120,7 @@ describe('New Appointment', () => {\n})\nit('should have error when error saving with end time earlier than start time', async () => {\n- const { container } = setup()\n+ setup()\nconst expectedError = {\nmessage: 'scheduling.appointment.errors.createAppointmentError',\n@@ -142,10 +140,10 @@ describe('New Appointment', () => {\nscreen.getByPlaceholderText(/scheduling\\.appointment\\.patient/i),\nexpectedAppointment.patient,\n)\n- fireEvent.change(container.querySelectorAll('.react-datepicker__input-container input')[0], {\n+ fireEvent.change(within(screen.getByTestId('startDateDateTimePicker')).getByRole('textbox'), {\ntarget: { value: expectedAppointment.startDateTime },\n})\n- fireEvent.change(container.querySelectorAll('.react-datepicker__input-container input')[1], {\n+ fireEvent.change(within(screen.getByTestId('endDateDateTimePicker')).getByRole('textbox'), {\ntarget: { value: expectedAppointment.endDateTime },\n})\nuserEvent.click(screen.getByText(/scheduling.appointments.createAppointment/i))\n@@ -154,15 +152,15 @@ describe('New Appointment', () => {\nexpect(screen.getByPlaceholderText(/scheduling\\.appointment\\.patient/i)).toHaveClass(\n'is-invalid',\n)\n- expect(container.querySelectorAll('.react-datepicker__input-container input')[0]).toHaveClass(\n- 'is-invalid',\n- )\n+ expect(\n+ within(screen.getByTestId('startDateDateTimePicker')).getByRole('textbox'),\n+ ).toHaveClass('is-invalid')\nexpect(screen.getByText(expectedError.startDateTime)).toBeInTheDocument()\nexpect(AppointmentRepository.save).toHaveBeenCalledTimes(0)\n})\nit('should call AppointmentRepo.save when save button is clicked', async () => {\n- const { container } = setup()\n+ setup()\nconst expectedAppointment = {\npatient: expectedPatient.fullName,\n@@ -184,11 +182,11 @@ describe('New Appointment', () => {\nawait screen.findByText(`${expectedPatient.fullName} (${expectedPatient.code})`),\n)\n- fireEvent.change(container.querySelectorAll('.react-datepicker__input-container input')[0], {\n+ fireEvent.change(within(screen.getByTestId('startDateDateTimePicker')).getByRole('textbox'), {\ntarget: { value: expectedAppointment.startDateTime },\n})\n- fireEvent.change(container.querySelectorAll('.react-datepicker__input-container input')[1], {\n+ fireEvent.change(within(screen.getByTestId('endDateDateTimePicker')).getByRole('textbox'), {\ntarget: { value: expectedAppointment.endDateTime },\n})\n" }, { "change_type": "MODIFY", "old_path": "src/patients/visits/VisitForm.tsx", "new_path": "src/patients/visits/VisitForm.tsx", "diff": "@@ -47,7 +47,7 @@ const VisitForm = (props: Props) => {\nObject.values(VisitStatus).map((v) => ({ label: v, value: v })) || []\nreturn (\n- <form>\n+ <form aria-label=\"visit form\">\n{visitError?.message && <Alert color=\"danger\" message={t(visitError.message)} />}\n<Row>\n<Column sm={6}>\n" }, { "change_type": "MODIFY", "old_path": "src/scheduling/appointments/new/NewAppointment.tsx", "new_path": "src/scheduling/appointments/new/NewAppointment.tsx", "diff": "@@ -102,7 +102,7 @@ const NewAppointment = () => {\nreturn (\n<div>\n- <form>\n+ <form aria-label=\"new appointment form\">\n<AppointmentDetailForm\nappointment={newAppointment as Appointment}\npatient={patient as Patient}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/shared/components/Sidebar.test.tsx", "new_path": "src/__tests__/shared/components/Sidebar.test.tsx", "diff": "@@ -50,10 +50,8 @@ describe('Sidebar', () => {\n})\nit('should be active when the current path is /', () => {\n- const { container } = setup('/')\n- const activeElement = container.querySelector('.active')\n-\n- expect(activeElement).toBeInTheDocument()\n+ setup('/')\n+ expect(screen.getByText(/dashboard\\.label/i)).toHaveClass('active')\n})\nit('should navigate to / when the dashboard link is clicked', () => {\n@@ -97,9 +95,9 @@ describe('Sidebar', () => {\n})\nit('main patients link should be active when the current path is /patients', () => {\n- const { container } = setup('/patients')\n+ setup('/patients')\n- expect(container.querySelector('.active')).toHaveTextContent(/patients.label/i)\n+ expect(screen.getByText(/patients\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /patients when the patients main link is clicked', () => {\n@@ -111,9 +109,9 @@ describe('Sidebar', () => {\n})\nit('new patient should be active when the current path is /patients/new', () => {\n- const { container } = setup('/patients/new')\n+ setup('/patients/new')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/patients.newPatient/i)\n+ expect(screen.getByText(/patients\\.newPatient/i)).toHaveClass('active')\n})\nit('should navigate to /patients/new when the patients new link is clicked', () => {\n@@ -124,9 +122,9 @@ describe('Sidebar', () => {\n})\nit('patients list link should be active when the current path is /patients', () => {\n- const { container } = setup('/patients')\n+ setup('/patients')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/patients.patientsList/i)\n+ expect(screen.getByText(/patients\\.patientsList/i)).toHaveClass('active')\n})\nit('should navigate to /patients when the patients list link is clicked', () => {\n@@ -169,9 +167,9 @@ describe('Sidebar', () => {\n})\nit('main scheduling link should be active when the current path is /appointments', () => {\n- const { container } = setup('/appointments')\n+ setup('/appointments')\n- expect(container.querySelector('.active')).toHaveTextContent(/scheduling.label/i)\n+ expect(screen.getByText(/scheduling\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /appointments when the main scheduling link is clicked', () => {\n@@ -183,9 +181,9 @@ describe('Sidebar', () => {\n})\nit('new appointment link should be active when the current path is /appointments/new', () => {\n- const { container } = setup('/appointments/new')\n+ setup('/appointments/new')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/appointments.new/i)\n+ expect(screen.getByText(/appointments\\.new/i)).toHaveClass('active')\n})\nit('should navigate to /appointments/new when the new appointment link is clicked', () => {\n@@ -196,11 +194,9 @@ describe('Sidebar', () => {\n})\nit('appointments schedule link should be active when the current path is /appointments', () => {\n- const { container } = setup('/appointments')\n+ setup('/appointments')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(\n- /scheduling.appointments.schedule/i,\n- )\n+ expect(screen.getByText(/scheduling\\.appointments\\.schedule/i)).toHaveClass('active')\n})\nit('should navigate to /appointments when the appointments schedule link is clicked', () => {\n@@ -244,9 +240,9 @@ describe('Sidebar', () => {\n})\nit('main labs link should be active when the current path is /labs', () => {\n- const { container } = setup('/labs')\n+ setup('/labs')\n- expect(container.querySelector('.active')).toHaveTextContent(/labs.label/i)\n+ expect(screen.getByText(/labs\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /labs when the main lab link is clicked', () => {\n@@ -258,9 +254,9 @@ describe('Sidebar', () => {\n})\nit('new lab request link should be active when the current path is /labs/new', () => {\n- const { container } = setup('/labs/new')\n+ setup('/labs/new')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/labs.requests.new/i)\n+ expect(screen.getByText(/labs\\.requests\\.new/i)).toHaveClass('active')\n})\nit('should navigate to /labs/new when the new labs link is clicked', () => {\n@@ -272,9 +268,9 @@ describe('Sidebar', () => {\n})\nit('labs list link should be active when the current path is /labs', () => {\n- const { container } = setup('/labs')\n+ setup('/labs')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/labs.requests.label/i)\n+ expect(screen.getByText(/labs\\.requests\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /labs when the labs list link is clicked', () => {\n@@ -336,9 +332,9 @@ describe('Sidebar', () => {\n})\nit('main incidents link should be active when the current path is /incidents', () => {\n- const { container } = setup('/incidents')\n+ setup('/incidents')\n- expect(container.querySelector('.active')).toHaveTextContent(/incidents.labe/i)\n+ expect(screen.getByText(/incidents\\.labe/i)).toHaveClass('active')\n})\nit('should navigate to /incidents when the main incident link is clicked', () => {\n@@ -350,9 +346,9 @@ describe('Sidebar', () => {\n})\nit('new incident report link should be active when the current path is /incidents/new', () => {\n- const { container } = setup('/incidents/new')\n+ setup('/incidents/new')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/incidents.reports.new/i)\n+ expect(screen.getByText(/incidents\\.reports\\.new/i)).toHaveClass('active')\n})\nit('should navigate to /incidents/new when the new incidents link is clicked', () => {\n@@ -372,9 +368,9 @@ describe('Sidebar', () => {\n})\nit('incidents list link should be active when the current path is /incidents', () => {\n- const { container } = setup('/incidents')\n+ setup('/incidents')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/incidents.reports.label/i)\n+ expect(screen.getByText(/incidents\\.reports\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /incidents/new when the incidents list link is clicked', () => {\n@@ -418,9 +414,9 @@ describe('Sidebar', () => {\n})\nit('main imagings link should be active when the current path is /imagings', () => {\n- const { container } = setup('/imagings')\n+ setup('/imagings')\n- expect(container.querySelector('.active')).toHaveTextContent(/imagings.label/i)\n+ expect(screen.getByText(/imagings\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /imaging when the main imagings link is clicked', () => {\n@@ -432,9 +428,9 @@ describe('Sidebar', () => {\n})\nit('new imaging request link should be active when the current path is /imagings/new', () => {\n- const { container } = setup('/imagings/new')\n+ setup('/imagings/new')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/imagings.requests.new/i)\n+ expect(screen.getByText(/imagings\\.requests\\.new/i)).toHaveClass('active')\n})\nit('should navigate to /imaging/new when the new imaging link is clicked', () => {\n@@ -446,9 +442,9 @@ describe('Sidebar', () => {\n})\nit('imagings list link should be active when the current path is /imagings', () => {\n- const { container } = setup('/imagings')\n+ setup('/imagings')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(/imagings.requests.label/)\n+ expect(screen.getByText(/imagings\\.requests\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /imaging when the imagings list link is clicked', () => {\n@@ -492,9 +488,9 @@ describe('Sidebar', () => {\n})\nit('main medications link should be active when the current path is /medications', () => {\n- const { container } = setup('/medications')\n+ setup('/medications')\n- expect(container.querySelector('.active')).toHaveTextContent(/medications.label/i)\n+ expect(screen.getByText(/medications\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /medications when the main lab link is clicked', () => {\n@@ -506,11 +502,9 @@ describe('Sidebar', () => {\n})\nit('new lab request link should be active when the current path is /medications/new', () => {\n- const { container } = setup('/medications/new')\n+ setup('/medications/new')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(\n- /medications.requests.new/i,\n- )\n+ expect(screen.getByText(/medications\\.requests\\.new/i)).toHaveClass('active')\n})\nit('should navigate to /medications/new when the new medications link is clicked', () => {\n@@ -521,11 +515,9 @@ describe('Sidebar', () => {\n})\nit('medications list link should be active when the current path is /medications', () => {\n- const { container } = setup('/medications')\n+ setup('/medications')\n- expect(container.querySelectorAll('.active')[1]).toHaveTextContent(\n- /medications.requests.label/i,\n- )\n+ expect(screen.getByText(/medications\\.requests\\.label/i)).toHaveClass('active')\n})\nit('should navigate to /medications when the medications list link is clicked', () => {\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/ViewMedication.test.tsx", "new_path": "src/__tests__/medications/ViewMedication.test.tsx", "diff": "@@ -116,11 +116,11 @@ describe('View Medication', () => {\n})\nit('should not display the canceled date if the medication is not canceled', async () => {\n- const { container } = setup({} as Medication, [Permissions.ViewMedication])\n+ setup({} as Medication, [Permissions.ViewMedication])\n- await waitFor(() => {\n- expect(container.querySelector('.canceled-on')).not.toBeInTheDocument()\n- })\n+ expect(\n+ screen.queryByRole('heading', { name: /medications\\.medication\\.canceledOn/i }),\n+ ).not.toBeInTheDocument()\n})\nit('should display the notes in the notes text field', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "new_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "diff": "@@ -29,13 +29,11 @@ describe('Medication Request Table', () => {\n}\nit('should render a table with the correct columns', async () => {\n- const { container } = setup()\n+ setup()\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n- const columns = container.querySelectorAll('th')\n+ const columns = screen.getAllByRole('columnheader')\nexpect(columns[0]).toHaveTextContent(/medications.medication.medication/i)\nexpect(columns[1]).toHaveTextContent(/medications.medication.priority/i)\n@@ -54,11 +52,9 @@ describe('Medication Request Table', () => {\nstatus: expectedSearchRequest.status,\n} as Medication,\n]\n- const { container } = setup(expectedSearchRequest, expectedMedicationRequests)\n+ setup(expectedSearchRequest, expectedMedicationRequests)\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\nexpect(screen.getByText(expectedSearchRequest.text)).toBeInTheDocument()\nexpect(screen.getByText(expectedSearchRequest.status)).toBeInTheDocument()\n})\n@@ -66,11 +62,10 @@ describe('Medication Request Table', () => {\nit('should navigate to the medication when the view button is clicked', async () => {\nconst expectedSearchRequest: MedicationSearchRequest = { text: 'someText', status: 'draft' }\nconst expectedMedicationRequests: Medication[] = [{ id: 'someId' } as Medication]\n- const { container, history } = setup(expectedSearchRequest, expectedMedicationRequests)\n+ const { history } = setup(expectedSearchRequest, expectedMedicationRequests)\n+\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\nuserEvent.click(screen.getByRole('button', { name: /actions.view/i }))\nexpect(history.location.pathname).toBe(`/medications/${expectedMedicationRequests[0].id}`)\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/medications/search/ViewMedications.test.tsx", "new_path": "src/__tests__/medications/search/ViewMedications.test.tsx", "diff": "@@ -79,10 +79,9 @@ describe('View Medications', () => {\ndescribe('table', () => {\nit('should render a table with data with the default search', async () => {\n- const { container } = await setup({} as Medication, [Permissions.ViewMedications])\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ setup({} as Medication, [Permissions.ViewMedications])\n+\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\nexpect(screen.getByLabelText(/medications\\.search/i)).toHaveDisplayValue('')\n})\n})\n@@ -108,15 +107,13 @@ describe('View Medications', () => {\nstatus: expectedSearchRequest.status,\n} as Medication,\n]\n- const { container } = await setup(\n+ setup(\n{ medication: expectedSearchRequest.text } as Medication,\n[],\nexpectedMedicationRequests,\n)\nuserEvent.type(screen.getByLabelText(/medications\\.search/i), expectedSearchRequest.text)\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\nexpect(screen.getByText(expectedSearchRequest.text)).toBeInTheDocument()\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": "@@ -63,10 +63,9 @@ const setup = (\ndescribe('Care Goals Tab', () => {\nit('should not render add care goal button if user does not have permissions', async () => {\n- const { container } = setup('/patients/123/care-goals', [])\n-\n- await waitForElementToBeRemoved(container.querySelector('.css-0'))\n+ setup('/patients/123/care-goals', [])\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\nexpect(screen.queryByRole('button', { name: /patient.careGoal.new/i })).not.toBeInTheDocument()\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": "@@ -47,11 +47,11 @@ describe('Care Goal Table', () => {\n}\nit('should render a table', async () => {\n- const { container } = await setup()\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n- const columns = container.querySelectorAll('th')\n+ setup()\n+\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n+\n+ const columns = screen.getAllByRole('columnheader')\nexpect(columns[0]).toHaveTextContent(/patient.careGoal.description/i)\nexpect(columns[1]).toHaveTextContent(/patient.careGoal.startDate/i)\nexpect(columns[2]).toHaveTextContent(/patient.careGoal.dueDate/i)\n@@ -67,10 +67,10 @@ describe('Care Goal Table', () => {\n})\nit('should navigate to the care goal view when the view details button is clicked', async () => {\n- const { container, history } = await setup()\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ const { history } = await setup()\n+\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n+\nuserEvent.click(screen.getByRole('button', { name: /actions.view/i }))\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}/care-goals/${careGoal.id}`)\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/care-goals/ViewCareGoals.test.tsx", "new_path": "src/__tests__/patients/care-goals/ViewCareGoals.test.tsx", "diff": "-import { render, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Route, Router } from 'react-router-dom'\n@@ -33,9 +33,8 @@ describe('View Care Goals', () => {\n}\nit('should render a care goals table', async () => {\n- const { container } = await setup()\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ setup()\n+\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\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": "@@ -96,11 +96,9 @@ describe('Care Plan Tab', () => {\n})\nit('should render the care plans table when on /patient/:id/care-plans', async () => {\n- const { container } = await setup('/patients/123/care-plans', [Permissions.ReadCarePlan])\n+ setup('/patients/123/care-plans', [Permissions.ReadCarePlan])\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n})\nit('should render the care plan view when on /patient/:id/care-plans/:carePlanId', async () => {\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": "@@ -44,18 +44,15 @@ describe('Care Plan Table', () => {\n}\nit('should render a table', async () => {\n- const { container } = await setup()\n+ setup()\nawait screen.findByRole('table')\n- const columns = container.querySelectorAll('th') as any\n+ const columns = screen.getAllByRole('columnheader')\nexpect(columns[0]).toHaveTextContent(/patient\\.carePlan\\.title/i)\n-\nexpect(columns[1]).toHaveTextContent(/patient\\.carePlan\\.startDate/i)\n-\nexpect(columns[2]).toHaveTextContent(/patient\\.carePlan\\.endDate/i)\n-\nexpect(columns[3]).toHaveTextContent(/patient\\.carePlan\\.status/i)\nawait waitFor(() => {\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, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Route, Router } from 'react-router-dom'\n@@ -35,10 +35,8 @@ describe('View Care Plan', () => {\n}\nit('should render the care plan title', async () => {\n- const { container } = await setup()\n+ setup()\n- await waitFor(() => {\n- expect(container.querySelectorAll('div').length).toBe(4)\n- })\n+ expect(await screen.findByRole('heading', { name: carePlan.title })).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 { render, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Route, Router } from 'react-router-dom'\n@@ -37,9 +37,7 @@ describe('View Care Plans', () => {\n}\nit('should render a care plans table with the patient id', async () => {\n- const { container } = await setup()\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ setup()\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/labs/Labs.test.tsx", "new_path": "src/__tests__/patients/labs/Labs.test.tsx", "diff": "-import { render, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\nimport { Provider } from 'react-redux'\n@@ -67,10 +67,8 @@ describe('Labs', () => {\ndescribe('patient labs list', () => {\nit('should render patient labs', async () => {\n- const { container } = await setup()\n- await waitFor(() => {\n- expect(container.querySelector('table')).toBeInTheDocument()\n- })\n+ setup()\n+ expect(await screen.findByRole('table')).toBeInTheDocument()\n})\n})\n})\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/notes/NewNoteModal.test.tsx", "new_path": "src/__tests__/patients/notes/NewNoteModal.test.tsx", "diff": "-import { screen, render, waitFor } from '@testing-library/react'\n+import { screen, render, waitFor, within } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport React from 'react'\n@@ -44,14 +44,14 @@ describe('New Note Modal', () => {\nexpect(cancelButton).toHaveClass('btn-danger')\nexpect(successButton).toHaveClass('btn-success')\n- expect(successButton.querySelector('svg')).toHaveAttribute('data-icon', 'plus')\n+ expect(within(successButton).getByRole('img')).toHaveAttribute('data-icon', 'plus')\n})\nit('should render a notes rich text editor', () => {\nsetup()\nexpect(screen.getByRole('textbox')).toBeInTheDocument()\n- expect(screen.getByText('patient.note').querySelector('svg')).toHaveAttribute(\n+ expect(within(screen.getByText('patient.note')).getByRole('img')).toHaveAttribute(\n'data-icon',\n'asterisk',\n)\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": "@@ -77,10 +77,9 @@ describe('Related Persons Tab', () => {\n})\nit('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-\n- await waitForElementToBeRemoved(container.querySelector(`[class^='css']`))\n+ setup({ permissions: [Permissions.ReadPatients] })\n+ expect(await screen.findByRole('alert')).toBeInTheDocument()\nexpect(\nscreen.queryByRole('button', { name: /patient\\.relatedPersons\\.add/i }),\n).not.toBeInTheDocument()\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/ViewPatientsTable.test.tsx", "new_path": "src/__tests__/patients/search/ViewPatientsTable.test.tsx", "diff": "@@ -28,9 +28,8 @@ describe('View Patients Table', () => {\n})\nit('should display no patients exist if total patient count is 0', async () => {\n- const { container } = setup({ queryString: '' }, [])\n- await waitForElementToBeRemoved(container.querySelector('.css-0'))\n- expect(screen.getByRole('heading', { name: /patients.noPatients/i })).toBeInTheDocument()\n+ setup({ queryString: '' }, [])\n+ expect(await screen.findByRole('heading', { name: /patients.noPatients/i })).toBeInTheDocument()\n})\nit('should render a table', async () => {\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/AddVisitModal.test.tsx", "new_path": "src/__tests__/patients/visits/AddVisitModal.test.tsx", "diff": "@@ -41,7 +41,7 @@ describe('Add Visit Modal', () => {\nit('should render a modal and within a form', () => {\nsetup()\n- expect(screen.getByRole('dialog').querySelector('form')).toBeInTheDocument()\n+ expect(within(screen.getByRole('dialog')).getByLabelText('visit form')).toBeInTheDocument()\n})\nit('should call the on close function when the cancel button is clicked', () => {\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": "@@ -102,11 +102,11 @@ describe('View Appointment', () => {\n})\nit('button toolbar empty if has only ReadAppointments permission', async () => {\n- const { container } = setup()\n+ setup()\n- await waitFor(() => {\n- expect(container.querySelector(`[class^='css-']`)).not.toBeInTheDocument()\n- })\n+ expect(\n+ await screen.findByPlaceholderText(/scheduling\\.appointment\\.patient/i),\n+ ).toBeInTheDocument()\nexpect(screen.queryAllByRole('button')).toHaveLength(0)\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "new_path": "src/__tests__/medications/search/MedicationRequestTable.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/medications/search/ViewMedications.test.tsx", "new_path": "src/__tests__/medications/search/ViewMedications.test.tsx", "diff": "-import { render, screen, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\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, waitForElementToBeRemoved, within } from '@testing-library/react'\n+import { render, screen, waitFor, within } from '@testing-library/react'\nimport userEvent, { specialChars } from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\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 { render, screen, waitFor } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\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 { render, screen, waitForElementToBeRemoved } from '@testing-library/react'\n+import { render, screen } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n" }, { "change_type": "MODIFY", "old_path": "src/__tests__/patients/search/ViewPatientsTable.test.tsx", "new_path": "src/__tests__/patients/search/ViewPatientsTable.test.tsx", "diff": "-import { screen, render, waitFor, waitForElementToBeRemoved } from '@testing-library/react'\n+import { screen, render, waitFor } from '@testing-library/react'\nimport format from 'date-fns/format'\nimport React from 'react'\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, within } from '@testing-library/react'\n+import { render, screen, waitFor, waitForElementToBeRemoved, within } from '@testing-library/react'\nimport userEvent, { specialChars } from '@testing-library/user-event'\nimport format from 'date-fns/format'\nimport { createMemoryHistory } from 'history'\n@@ -63,9 +63,10 @@ const setup = (\ndescribe('Care Goals Tab', () => {\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- expect(await screen.findByRole('table')).toBeInTheDocument()\n+ // wait for spinner to disappear\n+ await waitForElementToBeRemoved(container.querySelector('.css-0'))\nexpect(screen.queryByRole('button', { name: /patient.careGoal.new/i })).not.toBeInTheDocument()\n})\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 { render, screen } from '@testing-library/react'\n+import { render, screen, waitForElementToBeRemoved } from '@testing-library/react'\nimport userEvent from '@testing-library/user-event'\nimport { createMemoryHistory } from 'history'\nimport React from 'react'\n@@ -77,9 +77,11 @@ describe('Related Persons Tab', () => {\n})\nit('should not render a New Related Person button if the user does not have write privileges for a patient', async () => {\n- setup({ permissions: [Permissions.ReadPatients] })\n+ const { container } = setup({ permissions: [Permissions.ReadPatients] })\n+\n+ // wait for spinner to disappear\n+ await waitForElementToBeRemoved(container.querySelector(`[class^='css']`))\n- expect(await screen.findByRole('alert')).toBeInTheDocument()\nexpect(\nscreen.queryByRole('button', { name: /patient\\.relatedPersons\\.add/i }),\n).not.toBeInTheDocument()\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -51,7 +51,7 @@ const NewLabRequest = () => {\nconst onPatientChange = (patient: Patient) => {\nif (patient) {\n- const visits = patient.visits.map((v) => ({\n+ const visits = patient.visits?.map((v) => ({\nlabel: `${v.type} at ${format(new Date(v.startDateTime), 'yyyy-MM-dd hh:mm a')}`,\nvalue: v.id,\n})) as Option[]\n@@ -150,7 +150,7 @@ const NewLabRequest = () => {\nname=\"visit\"\nlabel={t('patient.visit')}\nisEditable={newLabRequest.patient !== undefined}\n- options={visitOptions}\n+ options={visitOptions || []}\ndefaultSelected={defaultSelectedVisitsOption()}\nonChange={(values) => {\nonVisitChange(values[0])\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/labs/requests/NewLabRequest.tsx", "new_path": "src/labs/requests/NewLabRequest.tsx", "diff": "@@ -149,6 +149,7 @@ const NewLabRequest = () => {\n<SelectWithLabelFormGroup\nname=\"visit\"\nlabel={t('patient.visit')}\n+ isRequired\nisEditable={newLabRequest.patient !== undefined}\noptions={visitOptions || []}\ndefaultSelected={defaultSelectedVisitsOption()}\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/hooks/usePatientVisits.tsx", "new_path": "src/patients/hooks/usePatientVisits.tsx", "diff": "@@ -3,10 +3,11 @@ import { useQuery } from 'react-query'\nimport PatientRepository from '../../shared/db/PatientRepository'\nimport Visit from '../../shared/model/Visit'\n-async function fetchPatientVisits(_: string, id: string): Promise<Visit[]> {\n- return (await PatientRepository.find(id)).visits\n+async function fetchPatientVisits(_: string, patientId: string): Promise<Visit[]> {\n+ const patient = await PatientRepository.find(patientId)\n+ return patient.visits || []\n}\n-export default function usePatientVisits(id: string) {\n- return useQuery(['visits', id], fetchPatientVisits)\n+export default function usePatientVisits(patientId: string) {\n+ return useQuery(['visits', patientId], fetchPatientVisits)\n}\n" }, { "change_type": "MODIFY", "old_path": "src/patients/visits/VisitTable.tsx", "new_path": "src/patients/visits/VisitTable.tsx", "diff": "@@ -16,14 +16,14 @@ const VisitTable = ({ patientId }: Props) => {\nconst { data: patientVisits, status } = usePatientVisits(patientId)\n- if (patientVisits === undefined && status === 'loading') {\n+ if (patientVisits === undefined || status === 'loading') {\nreturn <Loading />\n}\nreturn (\n<Table\ngetID={(row) => row.id}\n- data={patientVisits || []}\n+ data={patientVisits}\ncolumns={[\n{\nlabel: t('patient.visits.startDateTime'),\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/patients/visits/VisitTable.tsx", "new_path": "src/patients/visits/VisitTable.tsx", "diff": "-import { Table } from '@hospitalrun/components'\n+import { Alert, Table } from '@hospitalrun/components'\nimport format from 'date-fns/format'\nimport React from 'react'\nimport { useHistory } from 'react-router-dom'\n@@ -20,6 +20,16 @@ const VisitTable = ({ patientId }: Props) => {\nreturn <Loading />\n}\n+ if (patientVisits.length === 0) {\n+ return (\n+ <Alert\n+ color=\"warning\"\n+ title={t('patient.visits.warning.noVisits')}\n+ message={t('patient.visits.warning.addVisitAbove')}\n+ />\n+ )\n+ }\n+\nreturn (\n<Table\ngetID={(row) => row.id}\n" }, { "change_type": "MODIFY", "old_path": "src/shared/locales/enUs/translations/patient/index.ts", "new_path": "src/shared/locales/enUs/translations/patient/index.ts", "diff": "@@ -209,6 +209,10 @@ export default {\nreasonRequired: 'Reason is required.',\nlocationRequired: 'Location is required.',\n},\n+ warning: {\n+ noVisits: 'No Visits',\n+ addVisitAbove: 'Add a visit using the button above.',\n+ },\n},\ntypes: {\ncharity: 'Charity',\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/visits/VisitTable.test.tsx", "new_path": "src/__tests__/patients/visits/VisitTable.test.tsx", "diff": "@@ -25,8 +25,8 @@ const patient = {\nvisits: [visit],\n} as Patient\n-const setup = () => {\n- jest.spyOn(PatientRepository, 'find').mockResolvedValue(patient)\n+const setup = (expectedPatient = patient) => {\n+ jest.spyOn(PatientRepository, 'find').mockResolvedValue(expectedPatient)\nconst history = createMemoryHistory()\nhistory.push(`/patients/${patient.id}/visits/${patient.visits[0].id}`)\n@@ -34,7 +34,7 @@ const setup = () => {\nhistory,\n...render(\n<Router history={history}>\n- <VisitTable patientId={patient.id} />\n+ <VisitTable patientId={expectedPatient.id} />\n</Router>,\n),\n}\n@@ -85,4 +85,13 @@ describe('Visit Table', () => {\nexpect(history.location.pathname).toEqual(`/patients/${patient.id}/visits/${visit.id}`)\n})\n+\n+ it('should display a warning if there are no visits', async () => {\n+ setup({ ...patient, visits: [] })\n+ const alert = await screen.findByRole('alert')\n+ expect(alert).toBeInTheDocument()\n+ expect(alert).toHaveClass('alert-warning')\n+ expect(screen.getByText(/patient.visits.warning.noVisits/i)).toBeInTheDocument()\n+ expect(screen.getByText(/patient.visits.warning.addVisitAbove/i)).toBeInTheDocument()\n+ })\n})\n" } ]

[ { "change_type": "MODIFY", "old_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "new_path": "src/__tests__/patients/view/ViewPatient.test.tsx", "diff": "@@ -293,4 +293,20 @@ describe('ViewPatient', () => {\nexpect(screen.getByText(/patient\\.careGoals\\.warning\\.noCareGoals/i)).toBeInTheDocument()\n})\n})\n+\n+ it('should mark the visits tab as active when it is clicked and render the visit tab component when route is /patients/:id/visits', async () => {\n+ const { history } = setup()\n+\n+ await waitFor(() => {\n+ userEvent.click(screen.getByRole('button', { name: /patient\\.visits\\.label/i }))\n+ })\n+\n+ await waitFor(() => {\n+ expect(history.location.pathname).toEqual(`/patients/${testPatient.id}/visits`)\n+ })\n+ expect(screen.getByRole('button', { name: /patient\\.visits\\.label/i })).toHaveClass('active')\n+ await waitFor(() => {\n+ expect(screen.getByText(/patient\\.visits\\.warning\\.noVisits/i)).toBeInTheDocument()\n+ })\n+ })\n})\n" } ]