Merge pull request #77 from kcdraidgroup/update-upstream

update upstream

package.json

@@ -18,7 +18,7 @@
     "i18next-xhr-backend": "~3.2.2",
     "json2csv": "~5.0.1",
     "lodash": "^4.17.15",
-    "node-sass": "~4.14.0",
+    "node-sass": "~5.0.0",
     "pouchdb": "~7.2.1",
     "pouchdb-adapter-memory": "~7.2.1",
     "pouchdb-authentication": "~1.1.3",
@@ -89,7 +89,7 @@
     "commitlint-config-cz": "~0.13.0",
     "cross-env": "~7.0.0",
     "cz-conventional-changelog": "~3.3.0",
-    "dateformat": "~4.3.1",
+    "dateformat": "~4.4.0",
     "enzyme": "~3.11.0",
     "enzyme-adapter-react-16": "~1.15.2",
     "eslint": "~6.8.0",
@@ -163,4 +163,4 @@
       "git add ."
     ]
   }
-}
+}

src/__tests__/imagings/requests/NewImagingRequest.test.tsx

@@ -131,7 +131,7 @@ describe('New Imaging Request', () => {
       const wrapper = await setup()
       const saveButton = wrapper.find(Button).at(0)
       expect(saveButton).toBeDefined()
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('imagings.requests.create')
     })
 
     it('should render a cancel button', async () => {
@@ -205,7 +205,7 @@ describe('New Imaging Request', () => {
 
       const saveButton = wrapper.find(Button).at(0)
       const onClick = saveButton.prop('onClick') as any
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('imagings.requests.create')
       await act(async () => {
         await onClick()
       })

src/__tests__/imagings/search/ImagingRequestTable.test.tsx

@@ -57,7 +57,6 @@ describe('Imaging Request Table', () => {
     expect(headers[3]).toHaveTextContent(/imagings.imaging.patient/i)
     expect(headers[4]).toHaveTextContent(/imagings.imaging.requestedBy/i)
     expect(headers[5]).toHaveTextContent(/imagings.imaging.status/i)
-    screen.debug(undefined, Infinity)
 
     expect(cells[0]).toHaveTextContent('I-1234')
     expect(cells[1]).toHaveTextContent('imaging type')

src/__tests__/incidents/hooks/useReportIncident.test.tsx

@@ -1,6 +1,6 @@
 /* eslint-disable no-console */
 
-import { subDays } from 'date-fns'
+import subDays from 'date-fns/subDays'
 import shortid from 'shortid'
 
 import useReportIncident from '../../../incidents/hooks/useReportIncident'

src/__tests__/incidents/hooks/useResolvedIncident.test.tsx

@@ -1,5 +1,5 @@
 import { act, renderHook } from '@testing-library/react-hooks'
-import { subDays } from 'date-fns'
+import subDays from 'date-fns/subDays'
 
 import useResolveIncident from '../../../incidents/hooks/useResolveIncident'
 import IncidentRepository from '../../../shared/db/IncidentRepository'

src/__tests__/incidents/util/validate-incident.test.ts

@@ -1,4 +1,4 @@
-import { addDays } from 'date-fns'
+import addDays from 'date-fns/addDays'
 
 import validateIncident from '../../../incidents/util/validate-incident'
 import Incident from '../../../shared/model/Incident'