Merge branch 'master' of git://github.com/facebook/jest into danger

Author: orta

.flowconfig

@@ -4,6 +4,7 @@
 .*/vendor/jsonlint/.*
 .*/examples/.*
 .*/website/.*
+dangerfile.js
 
 [options]
 module.name_mapper='^types/\(.*\)$' -> '<PROJECT_ROOT>/types/\1.js'

.travis.yml

@@ -5,22 +5,18 @@ node_js:
   - "6"
   - "7"
 
-sudo: required
+sudo: false
 
 cache:
+  yarn: true
   directories:
     - ".eslintcache"
     - "node_modules"
-    - $HOME/.yarn-cache
 
 before_install:
-  # Repo for Yarn
-  - sudo apt-key adv --keyserver pgp.mit.edu --recv D101F7899D41F3C3
-  - echo "deb http://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
-  - sudo apt-get update -qq
-  - sudo apt-get install -y -qq yarn
-  - yarn global add npm@latest
+  - npm install npm@latest
 
-install: yarn
-
-script: yarn run test-ci
+script:
+  - (cd packages/eslint-plugin-jest && yarn link)
+  - yarn link eslint-plugin-jest
+  - yarn run test-ci

package.json

@@ -15,7 +15,6 @@
     "eslint-plugin-babel": "^4.0.0",
     "eslint-plugin-flow-vars": "^0.5.0",
     "eslint-plugin-flowtype": "^2.28.2",
-    "eslint-plugin-jest": "file:packages/eslint-plugin-jest",
     "eslint-plugin-react": "^6.7.1",
     "flow-bin": "^0.37.0",
     "glob": "^7.1.1",
@@ -46,7 +45,7 @@
     "postinstall": "node ./scripts/postinstall.js && node ./scripts/build.js",
     "publish": "yarn run build-clean && yarn run build && lerna publish",
     "test": "yarn run typecheck && yarn run lint && yarn run build && yarn run jest && yarn run test-examples",
-    "test-ci": "yarn run danger",
+    "test-ci": "yarn run typecheck && yarn run lint && yarn run build && yarn run jest-coverage -- -i && yarn run test-examples && node scripts/mapCoverage.js && codecov && yarn run danger",
     "test-examples": "node scripts/test_examples.js",
     "typecheck": "flow check",
     "watch": "yarn run build; node ./scripts/watch.js"

packages/babel-jest/package.json

@@ -9,7 +9,7 @@
   "main": "build/index.js",
   "dependencies": {
     "babel-core": "^6.0.0",
-    "babel-plugin-istanbul": "^3.0.0",
+    "babel-plugin-istanbul": "^3.1.2",
     "babel-preset-jest": "^18.0.0"
   }
 }

yarn.lock

@@ -35,8 +35,8 @@ ajv-keywords@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.0.tgz#c11e6859eafff83e0dafc416929472eca946aa2c"
 
 ajv@^4.7.0:
-  version "4.10.3"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.3.tgz#3e4fea9675b157de7888b80dd0ed735b83f28e11"
+  version "4.10.4"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.10.4.tgz#c0974dd00b3464984892d6010aa9c2c945933254"
   dependencies:
     co "^4.6.0"
     json-stable-stringify "^1.0.1"