Skip to content

Commit

Permalink
Merge pull request #998 from storybooks/greenkeeper/jest-20.0.0
Browse files Browse the repository at this point in the history
Update jest to the latest version 🚀
  • Loading branch information
ndelangen authored May 8, 2017
2 parents 0582fed + 4b9053f commit 2f27e4a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 4 additions & 1 deletion .jestrc → .jestrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/__mocks__/fileMock.js",
"\\.(css|scss)$": "<rootDir>/__mocks__/styleMock.js"
},
"roots": ["packages"],
"projects": [
"<rootDir>/packages/*",
"<rootDir>/examples/*"
],
"collectCoverage": false,
"collectCoverageFrom": [
"packages/**/*.{js,jsx}",
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,5 @@ script:
- npm run lint
- npm run test -- --coverage
- npm run coverage
- npm run test-examples
git:
depth: 1
9 changes: 4 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"eslint": "^3.19.0",
"eslint-config-airbnb-base": "^11.1.3",
"eslint-plugin-import": "^2.2.0",
"eslint-plugin-jest": "^19.0.1",
"eslint-plugin-jest": "^20.0.0",
"eslint-plugin-prettier": "^2.0.1",
"jest": "^19.0.2",
"jest-enzyme": "^3.0.1",
"jest": "^20.0.0",
"jest-enzyme": "^3.1.0",
"lerna": "2.0.0-rc.4",
"prettier": "^1.1.0",
"react": "^15.5.4",
Expand All @@ -29,9 +29,8 @@
"scripts": {
"bootstrap": "lerna bootstrap",
"lint": "eslint .",
"test": "jest --config ./.jestrc",
"test": "jest --config ./.jestrc.json",
"test:watch": "npm test -- --watch",
"test-examples": "CI=true lerna run test",
"coverage": "codecov"
}
}

0 comments on commit 2f27e4a

Please sign in to comment.