From b9db30f7a1366ed26238b80032a93ec803a37bf7 Mon Sep 17 00:00:00 2001
From: Oliver Eyton-Williams <ojeytonwilliams@gmail.com>
Date: Mon, 12 Oct 2020 14:11:52 +0200
Subject: [PATCH] refactor(client): move jest-dom into setup file

---
 client/jest.config.js                                          | 3 ++-
 client/jest.setup.js                                           | 1 +
 client/src/client-only-routes/ShowSettings.test.js             | 1 -
 client/src/components/Footer/Footer.test.js                    | 1 -
 client/src/components/Intro/Intro.test.js                      | 2 --
 client/src/components/Map/Map.test.js                          | 1 -
 client/src/components/Map/components/Block.test.js             | 1 -
 client/src/components/Map/components/SuperBlock.test.js        | 1 -
 client/src/components/formHelpers/BlockSaveButton.test.js      | 1 -
 client/src/components/formHelpers/Form.test.js                 | 1 -
 client/src/components/helpers/Link.test.js                     | 1 -
 client/src/components/helpers/Loader.test.js                   | 1 -
 client/src/components/profile/Profile.test.js                  | 1 -
 client/src/components/profile/components/HeatMap.test.js       | 1 -
 client/src/components/search/searchBar/SearchBar.test.js       | 1 -
 client/src/components/settings/Certification.test.js           | 1 -
 .../templates/Challenges/components/CompletionModal.test.js    | 2 --
 .../Challenges/components/CompletionModalBody.test.js          | 1 -
 18 files changed, 3 insertions(+), 19 deletions(-)
 create mode 100644 client/jest.setup.js

diff --git a/client/jest.config.js b/client/jest.config.js
index 86cabeba97..058b2e4df2 100644
--- a/client/jest.config.js
+++ b/client/jest.config.js
@@ -16,5 +16,6 @@ module.exports = {
   transform: {
     '^.+\\.js$': '<rootDir>/jest.transform.js'
   },
-  transformIgnorePatterns: ['node_modules/(?!(gatsby)/)']
+  transformIgnorePatterns: ['node_modules/(?!(gatsby)/)'],
+  setupFilesAfterEnv: ['./jest.setup.js']
 };
diff --git a/client/jest.setup.js b/client/jest.setup.js
new file mode 100644
index 0000000000..666127af39
--- /dev/null
+++ b/client/jest.setup.js
@@ -0,0 +1 @@
+import '@testing-library/jest-dom/extend-expect';
diff --git a/client/src/client-only-routes/ShowSettings.test.js b/client/src/client-only-routes/ShowSettings.test.js
index 44ae71321d..91051a0c80 100644
--- a/client/src/client-only-routes/ShowSettings.test.js
+++ b/client/src/client-only-routes/ShowSettings.test.js
@@ -1,6 +1,5 @@
 /* global jest, expect */
 import React from 'react';
-import 'jest-dom/extend-expect';
 import ShallowRenderer from 'react-test-renderer/shallow';
 import { apiLocation } from '../../config/env.json';
 
diff --git a/client/src/components/Footer/Footer.test.js b/client/src/components/Footer/Footer.test.js
index 16140cdd10..4efe0d74cf 100644
--- a/client/src/components/Footer/Footer.test.js
+++ b/client/src/components/Footer/Footer.test.js
@@ -1,7 +1,6 @@
 /* global expect */
 import React from 'react';
 import renderer from 'react-test-renderer';
-import 'jest-dom/extend-expect';
 
 import Footer from './';
 
diff --git a/client/src/components/Intro/Intro.test.js b/client/src/components/Intro/Intro.test.js
index 2961eeeb0a..9f442dfc80 100644
--- a/client/src/components/Intro/Intro.test.js
+++ b/client/src/components/Intro/Intro.test.js
@@ -4,8 +4,6 @@ import renderer from 'react-test-renderer';
 import { Provider } from 'react-redux';
 import { createStore } from '../../redux/createStore';
 
-import 'jest-dom/extend-expect';
-
 import Intro from './';
 
 function rendererCreateWithRedux(ui) {
diff --git a/client/src/components/Map/Map.test.js b/client/src/components/Map/Map.test.js
index 6e9367bb8b..6c8c549e30 100644
--- a/client/src/components/Map/Map.test.js
+++ b/client/src/components/Map/Map.test.js
@@ -1,6 +1,5 @@
 /* global expect jest */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render } from '@testing-library/react';
 import { Provider } from 'react-redux';
diff --git a/client/src/components/Map/components/Block.test.js b/client/src/components/Map/components/Block.test.js
index 762f30dcc9..814558320b 100644
--- a/client/src/components/Map/components/Block.test.js
+++ b/client/src/components/Map/components/Block.test.js
@@ -1,6 +1,5 @@
 /* global jest, expect */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
 
diff --git a/client/src/components/Map/components/SuperBlock.test.js b/client/src/components/Map/components/SuperBlock.test.js
index e602bcc282..6cecea7493 100644
--- a/client/src/components/Map/components/SuperBlock.test.js
+++ b/client/src/components/Map/components/SuperBlock.test.js
@@ -1,6 +1,5 @@
 /* global jest, expect */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
 import { Provider } from 'react-redux';
diff --git a/client/src/components/formHelpers/BlockSaveButton.test.js b/client/src/components/formHelpers/BlockSaveButton.test.js
index ddbdb3a9f5..8471282bb0 100644
--- a/client/src/components/formHelpers/BlockSaveButton.test.js
+++ b/client/src/components/formHelpers/BlockSaveButton.test.js
@@ -1,6 +1,5 @@
 /* global expect */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render } from '@testing-library/react';
 
diff --git a/client/src/components/formHelpers/Form.test.js b/client/src/components/formHelpers/Form.test.js
index 573a6b4c0d..be0af7fa7c 100644
--- a/client/src/components/formHelpers/Form.test.js
+++ b/client/src/components/formHelpers/Form.test.js
@@ -1,5 +1,4 @@
 /* global jest, expect */
-import '@testing-library/jest-dom/extend-expect';
 
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react';
diff --git a/client/src/components/helpers/Link.test.js b/client/src/components/helpers/Link.test.js
index 7e72292e3a..d1e051653a 100644
--- a/client/src/components/helpers/Link.test.js
+++ b/client/src/components/helpers/Link.test.js
@@ -1,7 +1,6 @@
 /* global expect */
 import React from 'react';
 import renderer from 'react-test-renderer';
-import 'jest-dom/extend-expect';
 
 import Link from './Link';
 
diff --git a/client/src/components/helpers/Loader.test.js b/client/src/components/helpers/Loader.test.js
index 24048554e9..614f19d375 100644
--- a/client/src/components/helpers/Loader.test.js
+++ b/client/src/components/helpers/Loader.test.js
@@ -1,7 +1,6 @@
 /* global expect */
 import React from 'react';
 import { render, cleanup } from '@testing-library/react';
-import 'jest-dom/extend-expect';
 
 import Loader from './Loader';
 
diff --git a/client/src/components/profile/Profile.test.js b/client/src/components/profile/Profile.test.js
index a2e41fa058..dacd122e64 100644
--- a/client/src/components/profile/Profile.test.js
+++ b/client/src/components/profile/Profile.test.js
@@ -1,6 +1,5 @@
 /* global expect */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render } from '@testing-library/react';
 
diff --git a/client/src/components/profile/components/HeatMap.test.js b/client/src/components/profile/components/HeatMap.test.js
index c509af24bc..dede4c9008 100644
--- a/client/src/components/profile/components/HeatMap.test.js
+++ b/client/src/components/profile/components/HeatMap.test.js
@@ -1,6 +1,5 @@
 /* global expect jest */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render } from '@testing-library/react';
 
diff --git a/client/src/components/search/searchBar/SearchBar.test.js b/client/src/components/search/searchBar/SearchBar.test.js
index 4559c52fd5..3752a78cfb 100644
--- a/client/src/components/search/searchBar/SearchBar.test.js
+++ b/client/src/components/search/searchBar/SearchBar.test.js
@@ -1,6 +1,5 @@
 /* global jest, expect */
 import React from 'react';
-import 'jest-dom/extend-expect';
 import ShallowRenderer from 'react-test-renderer/shallow';
 
 import { SearchBar } from './SearchBar';
diff --git a/client/src/components/settings/Certification.test.js b/client/src/components/settings/Certification.test.js
index 6237d57415..7d5bfbec4f 100644
--- a/client/src/components/settings/Certification.test.js
+++ b/client/src/components/settings/Certification.test.js
@@ -1,6 +1,5 @@
 /* global expect */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render } from '@testing-library/react';
 import { Provider } from 'react-redux';
diff --git a/client/src/templates/Challenges/components/CompletionModal.test.js b/client/src/templates/Challenges/components/CompletionModal.test.js
index e10bc20ff3..c4755af863 100644
--- a/client/src/templates/Challenges/components/CompletionModal.test.js
+++ b/client/src/templates/Challenges/components/CompletionModal.test.js
@@ -1,7 +1,5 @@
 /* global expect */
 
-import '@testing-library/jest-dom/extend-expect';
-
 import { getCompletedPercent } from './CompletionModal';
 
 const completedChallengesIds = ['1', '3', '5'],
diff --git a/client/src/templates/Challenges/components/CompletionModalBody.test.js b/client/src/templates/Challenges/components/CompletionModalBody.test.js
index 1159ab362d..8e25e12e92 100644
--- a/client/src/templates/Challenges/components/CompletionModalBody.test.js
+++ b/client/src/templates/Challenges/components/CompletionModalBody.test.js
@@ -1,6 +1,5 @@
 /* global jest, expect */
 
-import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
 import { render, fireEvent } from '@testing-library/react';