From 6ce16290e0da3dbae049d3b8a86e023ea9fe47e3 Mon Sep 17 00:00:00 2001 From: Rogelio Guzman Date: Wed, 22 Feb 2017 10:15:08 -0800 Subject: [PATCH 1/3] Upgrade to Jest 19 --- packages/react-scripts/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index 6fad1677edc..e30e5b892ea 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -26,7 +26,7 @@ "autoprefixer": "6.7.5", "babel-core": "6.22.1", "babel-eslint": "7.1.1", - "babel-jest": "18.0.0", + "babel-jest": "19.0.0", "babel-loader": "6.3.2", "babel-preset-react-app": "^2.1.1", "babel-runtime": "^6.20.0", @@ -51,7 +51,7 @@ "gzip-size": "3.0.0", "html-webpack-plugin": "2.28.0", "http-proxy-middleware": "0.17.3", - "jest": "18.1.0", + "jest": "19.0.1", "object-assign": "4.1.1", "postcss-loader": "1.3.1", "promise": "7.1.1", From a9a8be2e4b2be76c4a54723d5cdc1cf5d53defe3 Mon Sep 17 00:00:00 2001 From: Rogelio Guzman Date: Mon, 27 Feb 2017 09:20:40 -0800 Subject: [PATCH 2/3] Use testMatch --- packages/react-scripts/utils/createJestConfig.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/utils/createJestConfig.js b/packages/react-scripts/utils/createJestConfig.js index f1c67c018f1..56576ff8734 100644 --- a/packages/react-scripts/utils/createJestConfig.js +++ b/packages/react-scripts/utils/createJestConfig.js @@ -23,8 +23,9 @@ module.exports = (resolve, rootDir, isEjecting) => { collectCoverageFrom: ['src/**/*.{js,jsx}'], setupFiles: [resolve('config/polyfills.js')], setupTestFrameworkScriptFile: setupTestsFile, - testPathIgnorePatterns: [ - '[/\\\\](build|docs|node_modules|scripts)[/\\\\]' + testMatch: [ + '/!(build|docs|node_modules|scripts)/**/__tests__/**/*.js?(x)', + '/!(build|docs|node_modules|scripts)/**/?(*.)(spec|test).js?(x)' ], testEnvironment: 'node', testURL: 'http://localhost', From 93ccb0b3a2d7a860cb5ea92250b2a49376f34d82 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Mon, 15 May 2017 14:19:19 -0400 Subject: [PATCH 3/3] Correct version --- packages/react-scripts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index a07f078cfbe..2d100ea0e6d 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -26,7 +26,7 @@ "autoprefixer": "6.7.7", "babel-core": "6.23.1", "babel-eslint": "7.1.1", - "babel-jest": "19.0.2", + "babel-jest": "19.0.0", "babel-loader": "7.0.0", "babel-preset-react-app": "^2.1.1", "babel-runtime": "^6.20.0",