Merge branch 'develop' into greenkeeper/initial

package.json

@@ -17,7 +17,8 @@
     ],
     "collectCoverage": true,
     "coveragePathIgnorePatterns": [
-      "<rootDir>/src/config/assetsTransformer.js"
+      "<rootDir>/src/config/assetsTransformer.js",
+      "<rootDir>/(build|docs|node_modules)/"
     ]
   },
   "version": "1.0.0",
@@ -65,6 +66,7 @@
     "@babel/preset-env": "^7.3.4",
     "@babel/preset-react": "^7.0.0",
     "@babel/runtime": "^7.3.4",
+    "@testing-library/jest-dom": "^4.0.0",
     "@testing-library/react": "^8.0.4",
     "autoprefixer": "^9.4.10",
     "babel-eslint": "^10.0.1",
@@ -82,7 +84,6 @@
     "html-webpack-plugin": "^3.2.0",
     "husky": "^3.0.0",
     "jest": "^24.8.0",
-    "jest-dom": "^4.0.0",
     "lint-staged": "^9.0.0",
     "mini-css-extract-plugin": "^0.7.0",
     "react-styleguidist": "^9.1.11",

src/components/UI/atoms/Divider/Divider.spec.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, cleanup } from '<src>/helpers/testUtils';
 import Divider from './Divider';
-import 'jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
 
 afterEach(cleanup);
 

src/components/UI/atoms/Image/Image.spec.js

@@ -2,7 +2,7 @@
 import React from 'react';
 import { render, cleanup } from '<src>/helpers/testUtils';
 import Image from './Image';
-import 'jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
 
 afterEach(cleanup);
 

src/components/UI/atoms/InputField/InputField.spec.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, cleanup } from '<src>/helpers/testUtils';
 import InputField from './InputField';
-import 'jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
 
 afterEach(cleanup);
 

src/components/UI/atoms/Text/Text.spec.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, cleanup } from '<src>/helpers/testUtils';
 import Text from './Text';
-import 'jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
 
 afterEach(cleanup);
 

src/components/UI/atoms/Title/Title.spec.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, cleanup } from '<src>/helpers/testUtils';
 import Title from './Title';
-import 'jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
 
 afterEach(cleanup);
 

src/components/UI/atoms/layouts/FlexContainer/FlexContainer.spec.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { render, cleanup } from '<src>/helpers/testUtils';
 import FlexContainer from './FlexContainer';
-import 'jest-dom/extend-expect';
+import '@testing-library/jest-dom/extend-expect';
 
 afterEach(cleanup);