Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Meta
create-react-app
Commits
71e09604
Commit
71e09604
authored
7 years ago
by
Rogelio Guzman
Committed by
Joe Haddad
7 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Update to Jest 19 (#1614)
* Upgrade to Jest 19 * Use testMatch * Correct version
parent
f3660280
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
packages/react-scripts/package.json
+2
-2
packages/react-scripts/package.json
packages/react-scripts/scripts/utils/createJestConfig.js
+3
-2
packages/react-scripts/scripts/utils/createJestConfig.js
with
5 additions
and
4 deletions
+5
-4
packages/react-scripts/package.json
+
2
-
2
View file @
71e09604
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
"autoprefixer"
:
"6.7.7"
,
"autoprefixer"
:
"6.7.7"
,
"babel-core"
:
"6.23.1"
,
"babel-core"
:
"6.23.1"
,
"babel-eslint"
:
"7.1.1"
,
"babel-eslint"
:
"7.1.1"
,
"babel-jest"
:
"1
8
.0.0"
,
"babel-jest"
:
"1
9
.0.0"
,
"babel-loader"
:
"7.0.0"
,
"babel-loader"
:
"7.0.0"
,
"babel-preset-react-app"
:
"^2.1.1"
,
"babel-preset-react-app"
:
"^2.1.1"
,
"babel-runtime"
:
"^6.20.0"
,
"babel-runtime"
:
"^6.20.0"
,
...
@@ -49,7 +49,7 @@
...
@@ -49,7 +49,7 @@
"html-webpack-plugin"
:
"2.28.0"
,
"html-webpack-plugin"
:
"2.28.0"
,
"http-proxy-middleware"
:
"0.17.3"
,
"http-proxy-middleware"
:
"0.17.3"
,
"inquirer"
:
"3.0.6"
,
"inquirer"
:
"3.0.6"
,
"jest"
:
"1
8.1.0
"
,
"jest"
:
"1
9.0.2
"
,
"object-assign"
:
"4.1.1"
,
"object-assign"
:
"4.1.1"
,
"postcss-loader"
:
"1.3.3"
,
"postcss-loader"
:
"1.3.3"
,
"promise"
:
"7.1.1"
,
"promise"
:
"7.1.1"
,
...
...
This diff is collapsed.
Click to expand it.
packages/react-scripts/scripts/utils/createJestConfig.js
+
3
-
2
View file @
71e09604
...
@@ -25,7 +25,7 @@ module.exports = (resolve, rootDir, isEjecting) => {
...
@@ -25,7 +25,7 @@ module.exports = (resolve, rootDir, isEjecting) => {
collectCoverageFrom
:
[
'
src/**/*.{js,jsx}
'
],
collectCoverageFrom
:
[
'
src/**/*.{js,jsx}
'
],
setupFiles
:
[
resolve
(
'
config/polyfills.js
'
)],
setupFiles
:
[
resolve
(
'
config/polyfills.js
'
)],
setupTestFrameworkScriptFile
:
setupTestsFile
,
setupTestFrameworkScriptFile
:
setupTestsFile
,
test
P
ath
IgnorePatterns
:
[
test
M
at
c
h
:
[
// Ignore the following directories:
// Ignore the following directories:
// build
// build
// - the build output directory
// - the build output directory
...
@@ -37,7 +37,8 @@ module.exports = (resolve, rootDir, isEjecting) => {
...
@@ -37,7 +37,8 @@ module.exports = (resolve, rootDir, isEjecting) => {
// - ignore tests in dependencies
// - ignore tests in dependencies
// scripts
// scripts
// - directory generated upon eject
// - 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
'
,
testEnvironment
:
'
node
'
,
testURL
:
'
http://localhost
'
,
testURL
:
'
http://localhost
'
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment