resolve merge conflicts

HospitalRun · Dec 23, 2020 · db044a5 · db044a5
2 parents ee76722 + 3fbee70
commit db044a5
Show file tree

Hide file tree

Showing 19 changed files with 789 additions and 1,247 deletions.
diff --git a/package.json b/package.json
@@ -122,7 +122,7 @@
     "update": "npx npm-check -u",
     "prepublishOnly": "npm run build",
     "test": "npm run translation:check && react-scripts test  --testPathIgnorePatterns=src/__tests__/test-utils --detectOpenHandles --env=jest-environment-jsdom-sixteen",
-    "test:ci": "cross-env CI=true react-scripts test  --testPathIgnorePatterns=src/__tests__/test-utils --passWithNoTests --env=jest-environment-jsdom-sixteen",
+    "test:ci": "cross-env CI=true react-scripts test  --testPathIgnorePatterns=src/__tests__/test-utils --passWithNoTests --env=jest-environment-jsdom-sixteen --runInBand",
     "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\" \"scripts/check-translations/**/*.{js,ts}\"",
     "lint:fix": "eslint \"src/**/*.{js,jsx,ts,tsx}\" \"scripts/check-translations/**/*.{js,ts}\" --fix",
     "lint-staged": "lint-staged",

diff --git a/src/__tests__/imagings/Imagings.test.tsx b/src/__tests__/imagings/Imagings.test.tsx
@@ -54,7 +54,7 @@ describe('Imagings', () => {
         const permissions: Permissions[] = [Permissions.RequestImaging]
         const { container } = setup(permissions, true)
 
-        expect(container).toMatchSnapshot()
+        expect(container).toBeInTheDocument()
       })
 
       it('should not navigate to /imagings/new if the user does not have RequestImaging permissions', async () => {

diff --git a/src/__tests__/imagings/__snapshots__/Imagings.test.tsx.snap b/src/__tests__/imagings/__snapshots__/Imagings.test.tsx.snap