Skip to content

Commit

Permalink
feat: support jest v24 (#196)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: v4.x is only compatible with Jest v24, use v3.x with Jest v23.
  • Loading branch information
xiaoyuhen authored and gregberge committed Feb 13, 2019
1 parent db731a3 commit dbcc9d0
Show file tree
Hide file tree
Showing 6 changed files with 611 additions and 840 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ language: node_js

node_js:
- 8
- 9
- 10

before_install:
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
[![Dependencies](https://img.shields.io/david/smooth-code/jest-puppeteer.svg?path=packages%2Fjest-puppeteer)](https://david-dm.org/smooth-code/jest-puppeteer?path=packages/jest-puppeteer)
[![DevDependencies](https://img.shields.io/david/dev/smooth-code/jest-puppeteer.svg)](https://david-dm.org/smooth-code/jest-puppeteer?type=dev)

```
```bash
# for jest 22~23
npm install --save-dev jest-puppeteer@3.9.0 puppeteer jest
# for jest 24+
npm install --save-dev jest-puppeteer puppeteer jest
```

Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,8 @@
"@babel/cli": "^7.2.0",
"@babel/core": "^7.2.0",
"@babel/preset-env": "^7.2.0",
"babel-core": "7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "^23.6.0",
"babel-jest": "^24.1.0",
"conventional-github-releaser": "^3.1.2",
"cross-env": "^5.2.0",
"eslint": "^5.10.0",
Expand All @@ -39,7 +38,7 @@
"eslint-plugin-import": "^2.14.0",
"express": "^4.16.4",
"husky": "^1.3.1",
"jest": "^23.6.0",
"jest": "^24.1.0",
"lerna": "^3.6.0",
"lint-staged": "^8.1.0",
"prettier": "^1.15.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/jest-puppeteer-preset/jest-preset.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"globalSetup": "jest-environment-puppeteer/setup",
"globalTeardown": "jest-environment-puppeteer/teardown",
"testEnvironment": "jest-environment-puppeteer",
"setupTestFrameworkScriptFile": "expect-puppeteer"
"setupFilesAfterEnv": ["expect-puppeteer"]
}
2 changes: 1 addition & 1 deletion packages/jest-puppeteer/jest-preset.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"globalSetup": "jest-environment-puppeteer/setup",
"globalTeardown": "jest-environment-puppeteer/teardown",
"testEnvironment": "jest-environment-puppeteer",
"setupTestFrameworkScriptFile": "expect-puppeteer"
"setupFilesAfterEnv": ["expect-puppeteer"]
}
Loading

0 comments on commit dbcc9d0

Please sign in to comment.