From 000f4dcd3d62e9a2409be7c011ca5594337f8728 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sat, 12 Sep 2015 21:43:03 +0200 Subject: [PATCH 1/3] Update eslint dev dependency --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5681cd..7e3e522 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "pr-log": "1.3.0", "istanbul": "0.3.17", "mocha": "2.2.5", - "eslint": "1.1.0", + "eslint": "1.4.1", "coveralls": "2.11.2" }, "peerDependencies": { From 75799d02380ee252951905a8420eea938dfa8a29 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sat, 12 Sep 2015 21:43:38 +0200 Subject: [PATCH 2/3] Require at least eslint 1.4.1 as peer dependency --- README.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4e13e47..53811bd 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ESLint rules for [mocha](http://mochajs.org/). ## Install and configure -This plugin requires ESLint `0.8.0` or later. +This plugin requires ESLint `1.4.1` or later. `npm install --save-dev eslint-plugin-mocha` diff --git a/package.json b/package.json index 7e3e522..ee9d0c4 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "coveralls": "2.11.2" }, "peerDependencies": { - "eslint": ">=0.8.0" + "eslint": "^1.4.1" }, "repository": { "type": "git", From a97f4b2dee359a969f4d97693b4ab0ac57e310a2 Mon Sep 17 00:00:00 2001 From: Mathias Schreck Date: Sat, 12 Sep 2015 21:45:57 +0200 Subject: [PATCH 3/3] Fix linting issues --- lib/rules/no-synchronous-tests.js | 5 +++-- test/rules/handle-done-callback.js | 7 +++---- test/rules/no-exclusive-tests.js | 10 ++++------ test/rules/no-synchronous-tests.js | 7 +++---- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/lib/rules/no-synchronous-tests.js b/lib/rules/no-synchronous-tests.js index 8b23bc1..6bf29f5 100644 --- a/lib/rules/no-synchronous-tests.js +++ b/lib/rules/no-synchronous-tests.js @@ -44,8 +44,9 @@ module.exports = function (context) { } function checkPromiseReturn(functionExpression) { - var bodyStatement = functionExpression.body; - var returnStatement = null; + var bodyStatement = functionExpression.body, + returnStatement = null; + if (bodyStatement.type === 'BlockStatement') { returnStatement = findPromiseReturnStatement(functionExpression.body.body); } else if (bodyStatement.type === 'CallExpression') { diff --git a/test/rules/handle-done-callback.js b/test/rules/handle-done-callback.js index a970d32..fb80cfd 100644 --- a/test/rules/handle-done-callback.js +++ b/test/rules/handle-done-callback.js @@ -1,9 +1,8 @@ 'use strict'; -var RuleTester = require('eslint').RuleTester; -var rules = require('../../').rules; - -var ruleTester = new RuleTester(); +var RuleTester = require('eslint').RuleTester, + rules = require('../../').rules, + ruleTester = new RuleTester(); ruleTester.run('handle-done-callback', rules['handle-done-callback'], { valid: [ diff --git a/test/rules/no-exclusive-tests.js b/test/rules/no-exclusive-tests.js index 72171d2..69e0850 100644 --- a/test/rules/no-exclusive-tests.js +++ b/test/rules/no-exclusive-tests.js @@ -1,11 +1,9 @@ 'use strict'; -var RuleTester = require('eslint').RuleTester; -var rules = require('../../').rules; - -var ruleTester = new RuleTester(); - -var expectedErrorMessage = 'Unexpected exclusive mocha test.'; +var RuleTester = require('eslint').RuleTester, + rules = require('../../').rules, + ruleTester = new RuleTester(), + expectedErrorMessage = 'Unexpected exclusive mocha test.'; ruleTester.run('no-exclusive-tests', rules['no-exclusive-tests'], { diff --git a/test/rules/no-synchronous-tests.js b/test/rules/no-synchronous-tests.js index 306a2f7..b7da14e 100644 --- a/test/rules/no-synchronous-tests.js +++ b/test/rules/no-synchronous-tests.js @@ -1,9 +1,8 @@ 'use strict'; -var RuleTester = require('eslint').RuleTester; -var rules = require('../../').rules; - -var ruleTester = new RuleTester(); +var RuleTester = require('eslint').RuleTester, + rules = require('../../').rules, + ruleTester = new RuleTester(); ruleTester.run('no-synchronous-tests', rules['no-synchronous-tests'], { valid: [