fix(labs): Cleanup small issues with lab section

src/__tests__/components/Sidebar.test.tsx

@@ -35,7 +35,12 @@ describe('Sidebar', () => {
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(1).text().trim()).toEqual('dashboard.label')
+      expect(
+        listItems
+          .at(1)
+          .text()
+          .trim(),
+      ).toEqual('dashboard.label')
     })
 
     it('should be active when the current path is /', () => {
@@ -66,23 +71,38 @@ describe('Sidebar', () => {
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(2).text().trim()).toEqual('patients.label')
+      expect(
+        listItems
+          .at(2)
+          .text()
+          .trim(),
+      ).toEqual('patients.label')
     })
 
     it('should render the new_patient link', () => {
       const wrapper = setup('/patients')
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(3).text().trim()).toEqual('patients.newPatient')
+      expect(
+        listItems
+          .at(3)
+          .text()
+          .trim(),
+      ).toEqual('patients.newPatient')
     })
 
     it('should render the patients_list link', () => {
       const wrapper = setup('/patients')
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(4).text().trim()).toEqual('patients.patientsList')
+      expect(
+        listItems
+          .at(4)
+          .text()
+          .trim(),
+      ).toEqual('patients.patientsList')
     })
 
     it('main patients link should be active when the current path is /patients', () => {
@@ -155,23 +175,38 @@ describe('Sidebar', () => {
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(3).text().trim()).toEqual('scheduling.label')
+      expect(
+        listItems
+          .at(3)
+          .text()
+          .trim(),
+      ).toEqual('scheduling.label')
     })
 
     it('should render the new appointment link', () => {
       const wrapper = setup('/appointments/new')
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(4).text().trim()).toEqual('scheduling.appointments.new')
+      expect(
+        listItems
+          .at(4)
+          .text()
+          .trim(),
+      ).toEqual('scheduling.appointments.new')
     })
 
     it('should render the appointments schedule link', () => {
       const wrapper = setup('/appointments')
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(5).text().trim()).toEqual('scheduling.appointments.schedule')
+      expect(
+        listItems
+          .at(5)
+          .text()
+          .trim(),
+      ).toEqual('scheduling.appointments.schedule')
     })
 
     it('main scheduling link should be active when the current path is /appointments', () => {
@@ -244,23 +279,38 @@ describe('Sidebar', () => {
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(4).text().trim()).toEqual('labs.label')
+      expect(
+        listItems
+          .at(4)
+          .text()
+          .trim(),
+      ).toEqual('labs.label')
     })
 
     it('should render the new labs request link', () => {
       const wrapper = setup('/labs')
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(5).text().trim()).toEqual('labs.requests.new')
+      expect(
+        listItems
+          .at(5)
+          .text()
+          .trim(),
+      ).toEqual('labs.requests.new')
     })
 
     it('should render the labs list link', () => {
       const wrapper = setup('/labs')
 
       const listItems = wrapper.find(ListItem)
 
-      expect(listItems.at(6).text().trim()).toEqual('labs.requests.label')
+      expect(
+        listItems
+          .at(6)
+          .text()
+          .trim(),
+      ).toEqual('labs.requests.label')
     })
 
     it('main labs link should be active when the current path is /labs', () => {

src/__tests__/labs/ViewLab.test.tsx

@@ -91,29 +91,57 @@ describe('View Labs', () => {
       const expectedLab = { ...mockLab } as Lab
       const wrapper = await setup(expectedLab, [Permissions.ViewLab])
       const forPatientDiv = wrapper.find('.for-patient')
-      expect(forPatientDiv.find('h4').text().trim()).toEqual('labs.lab.for')
-
-      expect(forPatientDiv.find('h5').text().trim()).toEqual(mockPatient.fullName)
+      expect(
+        forPatientDiv
+          .find('h4')
+          .text()
+          .trim(),
+      ).toEqual('labs.lab.for')
+
+      expect(
+        forPatientDiv
+          .find('h5')
+          .text()
+          .trim(),
+      ).toEqual(mockPatient.fullName)
     })
 
     it('should display the lab type for type', async () => {
       const expectedLab = { ...mockLab, type: 'expected type' } as Lab
       const wrapper = await setup(expectedLab, [Permissions.ViewLab])
       const labTypeDiv = wrapper.find('.lab-type')
-      expect(labTypeDiv.find('h4').text().trim()).toEqual('labs.lab.type')
-
-      expect(labTypeDiv.find('h5').text().trim()).toEqual(expectedLab.type)
+      expect(
+        labTypeDiv
+          .find('h4')
+          .text()
+          .trim(),
+      ).toEqual('labs.lab.type')
+
+      expect(
+        labTypeDiv
+          .find('h5')
+          .text()
+          .trim(),
+      ).toEqual(expectedLab.type)
     })
 
     it('should display the requested on date', async () => {
       const expectedLab = { ...mockLab, requestedOn: '2020-03-30T04:43:20.102Z' } as Lab
       const wrapper = await setup(expectedLab, [Permissions.ViewLab])
       const requestedOnDiv = wrapper.find('.requested-on')
-      expect(requestedOnDiv.find('h4').text().trim()).toEqual('labs.lab.requestedOn')
-
-      expect(requestedOnDiv.find('h5').text().trim()).toEqual(
-        format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a'),
-      )
+      expect(
+        requestedOnDiv
+          .find('h4')
+          .text()
+          .trim(),
+      ).toEqual('labs.lab.requestedOn')
+
+      expect(
+        requestedOnDiv
+          .find('h5')
+          .text()
+          .trim(),
+      ).toEqual(format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a'))
     })
 
     it('should not display the completed date if the lab is not completed', async () => {
@@ -177,7 +205,12 @@ describe('View Labs', () => {
         const wrapper = await setup(expectedLab, [Permissions.ViewLab])
         const labStatusDiv = wrapper.find('.lab-status')
         const badge = labStatusDiv.find(Badge)
-        expect(labStatusDiv.find('h4').text().trim()).toEqual('labs.lab.status')
+        expect(
+          labStatusDiv
+            .find('h4')
+            .text()
+            .trim(),
+        ).toEqual('labs.lab.status')
 
         expect(badge.prop('color')).toEqual('warning')
         expect(badge.text().trim()).toEqual(expectedLab.status)
@@ -193,11 +226,26 @@ describe('View Labs', () => {
         ])
 
         const buttons = wrapper.find(Button)
-        expect(buttons.at(0).text().trim()).toEqual('actions.update')
-
-        expect(buttons.at(1).text().trim()).toEqual('labs.requests.complete')
-
-        expect(buttons.at(2).text().trim()).toEqual('labs.requests.cancel')
+        expect(
+          buttons
+            .at(0)
+            .text()
+            .trim(),
+        ).toEqual('actions.update')
+
+        expect(
+          buttons
+            .at(1)
+            .text()
+            .trim(),
+        ).toEqual('labs.requests.complete')
+
+        expect(
+          buttons
+            .at(2)
+            .text()
+            .trim(),
+        ).toEqual('labs.requests.cancel')
       })
     })
 
@@ -208,7 +256,12 @@ describe('View Labs', () => {
 
         const labStatusDiv = wrapper.find('.lab-status')
         const badge = labStatusDiv.find(Badge)
-        expect(labStatusDiv.find('h4').text().trim()).toEqual('labs.lab.status')
+        expect(
+          labStatusDiv
+            .find('h4')
+            .text()
+            .trim(),
+        ).toEqual('labs.lab.status')
 
         expect(badge.prop('color')).toEqual('danger')
         expect(badge.text().trim()).toEqual(expectedLab.status)
@@ -223,11 +276,19 @@ describe('View Labs', () => {
         const wrapper = await setup(expectedLab, [Permissions.ViewLab])
         const canceledOnDiv = wrapper.find('.canceled-on')
 
-        expect(canceledOnDiv.find('h4').text().trim()).toEqual('labs.lab.canceledOn')
-
-        expect(canceledOnDiv.find('h5').text().trim()).toEqual(
-          format(new Date(expectedLab.canceledOn as string), 'yyyy-MM-dd hh:mm a'),
-        )
+        expect(
+          canceledOnDiv
+            .find('h4')
+            .text()
+            .trim(),
+        ).toEqual('labs.lab.canceledOn')
+
+        expect(
+          canceledOnDiv
+            .find('h5')
+            .text()
+            .trim(),
+        ).toEqual(format(new Date(expectedLab.canceledOn as string), 'yyyy-MM-dd hh:mm a'))
       })
 
       it('should not display update, complete, and cancel button if the lab is canceled', async () => {
@@ -259,7 +320,12 @@ describe('View Labs', () => {
         const wrapper = await setup(expectedLab, [Permissions.ViewLab])
         const labStatusDiv = wrapper.find('.lab-status')
         const badge = labStatusDiv.find(Badge)
-        expect(labStatusDiv.find('h4').text().trim()).toEqual('labs.lab.status')
+        expect(
+          labStatusDiv
+            .find('h4')
+            .text()
+            .trim(),
+        ).toEqual('labs.lab.status')
 
         expect(badge.prop('color')).toEqual('primary')
         expect(badge.text().trim()).toEqual(expectedLab.status)
@@ -274,11 +340,19 @@ describe('View Labs', () => {
         const wrapper = await setup(expectedLab, [Permissions.ViewLab])
         const completedOnDiv = wrapper.find('.completed-on')
 
-        expect(completedOnDiv.find('h4').text().trim()).toEqual('labs.lab.completedOn')
-
-        expect(completedOnDiv.find('h5').text().trim()).toEqual(
-          format(new Date(expectedLab.completedOn as string), 'yyyy-MM-dd hh:mm a'),
-        )
+        expect(
+          completedOnDiv
+            .find('h4')
+            .text()
+            .trim(),
+        ).toEqual('labs.lab.completedOn')
+
+        expect(
+          completedOnDiv
+            .find('h5')
+            .text()
+            .trim(),
+        ).toEqual(format(new Date(expectedLab.completedOn as string), 'yyyy-MM-dd hh:mm a'))
       })
 
       it('should not display update, complete, and cancel buttons if the lab is completed', async () => {

src/__tests__/labs/ViewLabs.test.tsx

@@ -133,19 +133,47 @@ describe('View Labs', () => {
       expect(table).toBeDefined()
       expect(tableHeader).toBeDefined()
       expect(tableBody).toBeDefined()
-      expect(tableColumnHeaders.at(0).text().trim()).toEqual('labs.lab.type')
-
-      expect(tableColumnHeaders.at(1).text().trim()).toEqual('labs.lab.requestedOn')
-
-      expect(tableColumnHeaders.at(2).text().trim()).toEqual('labs.lab.status')
-
-      expect(tableDataColumns.at(0).text().trim()).toEqual(expectedLab.type)
-
-      expect(tableDataColumns.at(1).text().trim()).toEqual(
-        format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a'),
-      )
-
-      expect(tableDataColumns.at(2).text().trim()).toEqual(expectedLab.status)
+      expect(
+        tableColumnHeaders
+          .at(0)
+          .text()
+          .trim(),
+      ).toEqual('labs.lab.type')
+
+      expect(
+        tableColumnHeaders
+          .at(1)
+          .text()
+          .trim(),
+      ).toEqual('labs.lab.requestedOn')
+
+      expect(
+        tableColumnHeaders
+          .at(2)
+          .text()
+          .trim(),
+      ).toEqual('labs.lab.status')
+
+      expect(
+        tableDataColumns
+          .at(0)
+          .text()
+          .trim(),
+      ).toEqual(expectedLab.type)
+
+      expect(
+        tableDataColumns
+          .at(1)
+          .text()
+          .trim(),
+      ).toEqual(format(new Date(expectedLab.requestedOn), 'yyyy-MM-dd hh:mm a'))
+
+      expect(
+        tableDataColumns
+          .at(2)
+          .text()
+          .trim(),
+      ).toEqual(expectedLab.status)
     })
 
     it('should navigate to the lab when the row is clicked', () => {