Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Jest 19 #1614

Merged
merged 6 commits into from
May 15, 2017
Merged

Update to Jest 19 #1614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ce1629
Upgrade to Jest 19
rogeliog Feb 22, 2017
a9a8be2
Use testMatch
rogeliog Feb 27, 2017
5c9e473
Merge remote-tracking branch 'origin' into jest-19
rogeliog Apr 4, 2017
3e5fad7
Merge branch 'master' into jest-19
Timer May 15, 2017
6eb0bc0
Merge branch 'master' into jest-19
Timer May 15, 2017
93ccb0b
Correct version
Timer May 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/react-scripts/package.json
View file
Open in desktop
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
View file
Open in desktop
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