Skip to content

Commit da221d2

Browse files
author
Dieter Luypaert
authored
feat: support jest v26 (#90)
1 parent 1664eef commit da221d2

File tree

4 files changed

+917
-449
lines changed

4 files changed

+917
-449
lines changed

.travis.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ env:
1414
- 'ESLINT=4 JEST=25'
1515
- 'ESLINT=5 JEST=25'
1616
- 'ESLINT=6 JEST=25'
17+
- 'ESLINT=4 JEST=26'
18+
- 'ESLINT=5 JEST=26'
19+
- 'ESLINT=6 JEST=26'
1720
matrix:
1821
exclude:
1922
# exclude eslint 6 on node 6
@@ -35,3 +38,17 @@ matrix:
3538
env: 'ESLINT=5 JEST=25'
3639
- node_js: '8'
3740
env: 'ESLINT=6 JEST=25'
41+
# exclude jest 26 on node 6
42+
- node_js: '6'
43+
env: 'ESLINT=4 JEST=26'
44+
- node_js: '6'
45+
env: 'ESLINT=5 JEST=26'
46+
- node_js: '6'
47+
env: 'ESLINT=6 JEST=26'
48+
# exclude jest 26 on node 8
49+
- node_js: '8'
50+
env: 'ESLINT=4 JEST=26'
51+
- node_js: '8'
52+
env: 'ESLINT=5 JEST=26'
53+
- node_js: '8'
54+
env: 'ESLINT=6 JEST=26'

integrationTests/runJest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const rootDir = path.join(__dirname, '..');
66

77
const normalize = output =>
88
output
9-
.replace(/\(?\d*\.?\d+m?s\)?/g, '')
9+
.replace(/\(?\d*\.?\d+ ?m?s\b\)?/g, '')
1010
.replace(/, estimated/g, '')
1111
.replace(new RegExp(rootDir, 'g'), '/mocked-path-to-jest-runner-mocha')
1212
.replace(new RegExp('.*at .*\\n', 'g'), 'mocked-stack-trace')

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@
4040
"eslint-plugin-jest": "^22.6.4",
4141
"eslint-plugin-prettier": "^3.1.0",
4242
"execa": "^1.0.0",
43-
"jest": "^21.0.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.1.0",
43+
"jest": "^21.0.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.1.0 || ^26.0.0",
4444
"jest-watch-select-projects": "^0.1.1",
4545
"jest-watch-typeahead": "^0.3.1",
4646
"prettier": "^1.14.3",
4747
"rimraf": "^2.6.2"
4848
},
4949
"peerDependencies": {
5050
"eslint": "^4.0.0 || ^5.0.0 || ^6.0.0",
51-
"jest": "^21.0.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.1.0"
51+
"jest": "^21.0.0 || ^22.0.0 || ^23.0.0 || ^24.0.0 || ^25.1.0 || ^26.0.0"
5252
},
5353
"prettier": {
5454
"proseWrap": "never",

0 commit comments

Comments
 (0)