Skip to content

Commit

Permalink
Update to Jest 19 (#1614)
Browse files Browse the repository at this point in the history
* Upgrade to Jest 19

* Use testMatch

* Correct version
  • Loading branch information
rogeliog authored and Timer committed May 15, 2017
1 parent f366028 commit 71e0960
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions packages/react-scripts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"autoprefixer": "6.7.7",
"babel-core": "6.23.1",
"babel-eslint": "7.1.1",
"babel-jest": "18.0.0",
"babel-jest": "19.0.0",
"babel-loader": "7.0.0",
"babel-preset-react-app": "^2.1.1",
"babel-runtime": "^6.20.0",
Expand All @@ -49,7 +49,7 @@
"html-webpack-plugin": "2.28.0",
"http-proxy-middleware": "0.17.3",
"inquirer": "3.0.6",
"jest": "18.1.0",
"jest": "19.0.2",
"object-assign": "4.1.1",
"postcss-loader": "1.3.3",
"promise": "7.1.1",
Expand Down
5 changes: 3 additions & 2 deletions packages/react-scripts/scripts/utils/createJestConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module.exports = (resolve, rootDir, isEjecting) => {
collectCoverageFrom: ['src/**/*.{js,jsx}'],
setupFiles: [resolve('config/polyfills.js')],
setupTestFrameworkScriptFile: setupTestsFile,
testPathIgnorePatterns: [
testMatch: [
// Ignore the following directories:
// build
// - the build output directory
Expand All @@ -37,7 +37,8 @@ module.exports = (resolve, rootDir, isEjecting) => {
// - ignore tests in dependencies
// scripts
// - directory generated upon eject
'<rootDir>[/\\\\](build|\\.cache|docs|node_modules|scripts)[/\\\\]',
'<rootDir>/!(build|docs|node_modules|scripts)/**/__tests__/**/*.js?(x)',
'<rootDir>/!(build|docs|node_modules|scripts)/**/?(*.)(spec|test).js?(x)',
],
testEnvironment: 'node',
testURL: 'http://localhost',
Expand Down

0 comments on commit 71e0960

Please sign in to comment.