Merge branch 'master' into feat/progress

MailOnline · Nov 23, 2017 · 74427d8 · 74427d8
2 parents 362e81d + a2275ce
commit 74427d8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # jest-tap-reporter
 
+[![Greenkeeper badge](https://badges.greenkeeper.io/MailOnline/jest-tap-reporter.svg)](https://greenkeeper.io/)
+
 [travis-badge]: https://api.travis-ci.org/MailOnline/jest-tap-reporter.svg?branch=master
 [travis]: https://travis-ci.org/MailOnline/jest-tap-reporter
 [npm-badge]: https://img.shields.io/npm/v/jest-tap-reporter.svg

diff --git a/demo/foo.test.js b/demo/foo.test.js
@@ -15,6 +15,7 @@ test('', () => {
   throw new TypeError('Unknown error occured.');
 });
 
+// eslint-disable-next-line jest/no-disabled-tests
 test('skipped test');
 
 // eslint-disable-next-line jest/no-disabled-tests

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
   "devDependencies": {
     "commitizen": "^2.9.5",
     "eslint": "^4.2.0",
-    "eslint-config-mailonline": "^7.0.1",
+    "eslint-config-mailonline": "^9.0.0",
     "husky": "^0.14.3",
     "jest": "^21.2.1",
     "mol-conventional-changelog": "^1.2.0",