eslint-plugin-jest 23.3.0 → 23.7.0

package/CHANGELOG.md

@@ -1,3 +1,48 @@
+# [23.7.0](https://github.com/jest-community/eslint-plugin-jest/compare/v23.6.0...v23.7.0) (2020-02-07)
+
+### Bug Fixes
+
+- **expect-expect:** use `u` flag in regex
+  ([#532](https://github.com/jest-community/eslint-plugin-jest/issues/532))
+  ([c12b725](https://github.com/jest-community/eslint-plugin-jest/commit/c12b7251ef1506073d268973b93c7fc9fbcf50af))
+
+### Features
+
+- **valid-title:** support `disallowedWords` option
+  ([#522](https://github.com/jest-community/eslint-plugin-jest/issues/522))
+  ([38bbe93](https://github.com/jest-community/eslint-plugin-jest/commit/38bbe93794ed456c6e9e5d7be848b2aeb55ce0ba))
+
+# [23.6.0](https://github.com/jest-community/eslint-plugin-jest/compare/v23.5.0...v23.6.0) (2020-01-12)
+
+### Features
+
+- **no-if:** support `switch` statements
+  ([#515](https://github.com/jest-community/eslint-plugin-jest/issues/515))
+  ([be4e49d](https://github.com/jest-community/eslint-plugin-jest/commit/be4e49dcecd64711e743f5e09d1ff24e4c6e1648))
+
+# [23.5.0](https://github.com/jest-community/eslint-plugin-jest/compare/v23.4.0...v23.5.0) (2020-01-12)
+
+### Features
+
+- **expect-expect:** support glob patterns for assertFunctionNames
+  ([#509](https://github.com/jest-community/eslint-plugin-jest/issues/509))
+  ([295ca9a](https://github.com/jest-community/eslint-plugin-jest/commit/295ca9a6969c77fadaa1a42d76e89cae992520a6))
+- **valid-expect:** refactor `valid-expect` linting messages
+  ([#501](https://github.com/jest-community/eslint-plugin-jest/issues/501))
+  ([7338362](https://github.com/jest-community/eslint-plugin-jest/commit/7338362420eb4970f99be2016bb4ded5732797e3))
+
+# [23.4.0](https://github.com/jest-community/eslint-plugin-jest/compare/v23.3.0...v23.4.0) (2020-01-10)
+
+### Features
+
+- **expect-expect:** support chained function names
+  ([#471](https://github.com/jest-community/eslint-plugin-jest/issues/471))
+  ([#508](https://github.com/jest-community/eslint-plugin-jest/issues/508))
+  ([beb1aec](https://github.com/jest-community/eslint-plugin-jest/commit/beb1aececee80589c182e95bc64ef01d97eb5e78))
+- **rules:** add support for function declaration as test case
+  ([#504](https://github.com/jest-community/eslint-plugin-jest/issues/504))
+  ([ac7fa48](https://github.com/jest-community/eslint-plugin-jest/commit/ac7fa487d05705bee1b2d5264d5096f0232ae1e1))
+
 # [23.3.0](https://github.com/jest-community/eslint-plugin-jest/compare/v23.2.0...v23.3.0) (2020-01-04)
 
 ### Features

package/README.md

@@ -1,6 +1,3 @@
-[![Actions Status](https://github.com/jest-community/eslint-plugin-jest/workflows/Unit%20tests/badge.svg)](https://github.com/jest-community/eslint-plugin-jest/actions)
-[![Renovate badge](https://badges.renovateapi.com/github/jest-community/eslint-plugin-jest)](https://renovatebot.com/)
-
 <div align="center">
   <a href="https://eslint.org/">
     <img width="150" height="150" src="https://eslint.org/assets/img/logo.svg">
@@ -12,6 +9,9 @@
   <p>ESLint plugin for Jest</p>
 </div>
 
+[![Actions Status](https://github.com/jest-community/eslint-plugin-jest/workflows/Unit%20tests/badge.svg?branch=master)](https://github.com/jest-community/eslint-plugin-jest/actions)
+[![Renovate badge](https://badges.renovateapi.com/github/jest-community/eslint-plugin-jest)](https://renovatebot.com/)
+
 ## Installation
 
 ```

package/docs/rules/expect-expect.md

@@ -42,7 +42,9 @@ it('should work with callbacks/async', () => {
 
 ### `assertFunctionNames`
 
-This array option whitelists the assertion function names to look for.
+This array option whitelists the assertion function names to look for. Function
+names can use wildcards like `request.*.expect`, `request.**.expect`,
+`request.*.expect*`
 
 Examples of **incorrect** code for the `{ "assertFunctionNames": ["expect"] }`
 option:
@@ -75,3 +77,24 @@ test('returns sum', () =>
     .run();
 );
 ```
+
+Examples of **correct** code for working with the HTTP assertions library
+[SuperTest](https://www.npmjs.com/package/supertest) with the
+`{ "assertFunctionNames": ["expect", "request.*.expect"] }` option:
+
+```js
+/* eslint jest/expect-expect: ["error", { "assertFunctionNames": ["expect", "request.*.expect"] }] */
+const request = require('supertest');
+const express = require('express');
+
+const app = express();
+
+describe('GET /user', function() {
+  it('responds with json', function(done) {
+    request(app)
+      .get('/user')
+      .expect('Content-Type', /json/)
+      .expect(200, done);
+  });
+});
+```

package/docs/rules/valid-title.md

@@ -45,7 +45,7 @@ xtest('foo', () => {});
 
 Titles for test blocks should always be a string literal or expression.
 
-This is also applied to describe blocks by default, but can be turned off via
+This is also applied to `describe` blocks by default, but can be turned off via
 the `ignoreTypeOfDescribeName` option:
 
 Examples of **incorrect** code for this rule:
@@ -87,7 +87,7 @@ describe(6, function() {});
 
 **duplicatePrefix**
 
-A describe/ test block should not start with duplicatePrefix
+A `describe` / `test` block should not start with `duplicatePrefix`
 
 Examples of **incorrect** code for this rule
 
@@ -117,7 +117,7 @@ describe('foo', () => {
 
 **accidentalSpace**
 
-A describe/ test block should not contain accidentalSpace
+A `describe` / `test` block should not contain accidentalSpace
 
 Examples of **incorrect** code for this rule
 
@@ -148,3 +148,45 @@ describe('foo', () => {
   test('bar', () => {});
 });
 ```
+
+## Options
+
+```ts
+interface {
+  ignoreTypeOfDescribeName?: boolean;
+  disallowedWords?: string[];
+}
+```
+
+#### `ignoreTypeOfDescribeName`
+
+Default: `false`
+
+When enabled, the type of the first argument to `describe` blocks won't be
+checked.
+
+#### `disallowedWords`
+
+Default: `[]`
+
+A string array of words that are not allowed to be used in test titles. Matching
+is not case-sensitive, and looks for complete words:
+
+Examples of **incorrect** code using `disallowedWords`:
+
+```js
+// with disallowedWords: ['correct', 'all', 'every', 'properly']
+describe('the correct way to do things', () => {});
+it('has ALL the things', () => {});
+xdescribe('every single one of them', () => {});
+test(`that the value is set properly`, () => {});
+```
+
+Examples of **correct** code when using `disallowedWords`:
+
+```js
+// with disallowedWords: ['correct', 'all', 'every', 'properly']
+it('correctly sets the value', () => {});
+test('that everything is as it should be', () => {});
+describe('the proper way to handle things', () => {});
+```

package/lib/rules/consistent-test-it.js

@@ -9,6 +9,8 @@ var _experimentalUtils = require("@typescript-eslint/experimental-utils");
 
 var _utils = require("./utils");
 
+const buildFixer = (callee, nodeName, preferredTestKeyword) => fixer => [fixer.replaceText(callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression ? callee.object : callee, getPreferredNodeName(nodeName, preferredTestKeyword))];
+
 var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
@@ -67,13 +69,7 @@ var _default = (0, _utils.createRule)({
               testKeyword,
               oppositeTestKeyword
             },
-
-            fix(fixer) {
-              const nodeToReplace = node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression ? node.callee.object : node.callee;
-              const fixedNodeName = getPreferredNodeName(nodeName, testKeyword);
-              return [fixer.replaceText(nodeToReplace, fixedNodeName)];
-            }
-
+            fix: buildFixer(node.callee, nodeName, testKeyword)
           });
         }
 
@@ -86,13 +82,7 @@ var _default = (0, _utils.createRule)({
               testKeywordWithinDescribe,
               oppositeTestKeyword
             },
-
-            fix(fixer) {
-              const nodeToReplace = node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression ? node.callee.object : node.callee;
-              const fixedNodeName = getPreferredNodeName(nodeName, testKeywordWithinDescribe);
-              return [fixer.replaceText(nodeToReplace, fixedNodeName)];
-            }
-
+            fix: buildFixer(node.callee, nodeName, testKeywordWithinDescribe)
           });
         }
       },
@@ -111,13 +101,11 @@ var _default = (0, _utils.createRule)({
 exports.default = _default;
 
 function getPreferredNodeName(nodeName, preferredTestKeyword) {
-  switch (nodeName) {
-    case _utils.TestCaseName.fit:
-      return 'test.only';
-
-    default:
-      return nodeName.startsWith('f') || nodeName.startsWith('x') ? nodeName.charAt(0) + preferredTestKeyword : preferredTestKeyword;
+  if (nodeName === _utils.TestCaseName.fit) {
+    return 'test.only';
   }
+
+  return nodeName.startsWith('f') || nodeName.startsWith('x') ? nodeName.charAt(0) + preferredTestKeyword : preferredTestKeyword;
 }
 
 function getOppositeTestKeyword(test) {

package/lib/rules/expect-expect.js

@@ -13,6 +13,21 @@ var _utils = require("./utils");
  * This implementation is adapted from eslint-plugin-jasmine.
  * MIT license, Remco Haszing.
  */
+
+/**
+ * Checks if node names returned by getNodeName matches any of the given star patterns
+ * Pattern examples:
+ *   request.*.expect
+ *   request.**.expect
+ *   request.**.expect*
+ */
+function matchesAssertFunctionName(nodeName, patterns) {
+  return patterns.some(p => new RegExp(`^${p.split('.').map(x => {
+    if (x === '**') return '[a-z\\.]*';
+    return x.replace(/\*/gu, '[a-z]*');
+  }).join('\\.')}(\\.|$)`, 'ui').test(nodeName));
+}
+
 var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
@@ -46,22 +61,33 @@ var _default = (0, _utils.createRule)({
     assertFunctionNames = ['expect']
   }]) {
     const unchecked = [];
+
+    function checkCallExpressionUsed(nodes) {
+      for (const node of nodes) {
+        const index = node.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? unchecked.indexOf(node) : -1;
+
+        if (node.type === _experimentalUtils.AST_NODE_TYPES.FunctionDeclaration) {
+          const declaredVariables = context.getDeclaredVariables(node);
+          const testCallExpressions = (0, _utils.getTestCallExpressionsFromDeclaredVariables)(declaredVariables);
+          checkCallExpressionUsed(testCallExpressions);
+        }
+
+        if (index !== -1) {
+          unchecked.splice(index, 1);
+          break;
+        }
+      }
+    }
+
     return {
       CallExpression(node) {
         const name = (0, _utils.getNodeName)(node.callee);
 
         if (name === _utils.TestCaseName.it || name === _utils.TestCaseName.test) {
           unchecked.push(node);
-        } else if (name && assertFunctionNames.includes(name)) {
+        } else if (name && matchesAssertFunctionName(name, assertFunctionNames)) {
           // Return early in case of nested `it` statements.
-          for (const ancestor of context.getAncestors()) {
-            const index = ancestor.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? unchecked.indexOf(ancestor) : -1;
-
-            if (index !== -1) {
-              unchecked.splice(index, 1);
-              break;
-            }
-          }
+          checkCallExpressionUsed(context.getAncestors());
         }
       },
 

package/lib/rules/lowercase-name.js

@@ -9,44 +9,24 @@ var _experimentalUtils = require("@typescript-eslint/experimental-utils");
 
 var _utils = require("./utils");
 
-const hasStringAsFirstArgument = node => node.arguments && node.arguments[0] && (node.arguments[0].type === _experimentalUtils.AST_NODE_TYPES.Literal || node.arguments[0].type === _experimentalUtils.AST_NODE_TYPES.TemplateLiteral);
+const hasStringAsFirstArgument = node => node.arguments[0] && (0, _utils.isStringNode)(node.arguments[0]);
 
 const isJestFunctionWithLiteralArg = node => ((0, _utils.isTestCase)(node) || (0, _utils.isDescribe)(node)) && node.callee.type === _experimentalUtils.AST_NODE_TYPES.Identifier && hasStringAsFirstArgument(node);
 
-const testDescription = argument => {
-  if (argument.type === _experimentalUtils.AST_NODE_TYPES.Literal) {
-    const {
-      value
-    } = argument;
-
-    if (typeof value === 'string') {
-      return value;
-    }
-
-    return null;
-  }
-
-  return argument.quasis[0].value.raw;
-};
-
 const jestFunctionName = (node, allowedPrefixes) => {
-  const description = testDescription(node.arguments[0]);
+  const description = (0, _utils.getStringValue)(node.arguments[0]);
 
-  if (description === null || allowedPrefixes.some(name => description.startsWith(name))) {
+  if (allowedPrefixes.some(name => description.startsWith(name))) {
     return null;
   }
 
   const firstCharacter = description.charAt(0);
 
-  if (!firstCharacter) {
+  if (!firstCharacter || firstCharacter === firstCharacter.toLowerCase()) {
     return null;
   }
 
-  if (firstCharacter !== firstCharacter.toLowerCase()) {
-    return node.callee.name;
-  }
-
-  return null;
+  return node.callee.name;
 };
 
 var _default = (0, _utils.createRule)({
@@ -103,15 +83,14 @@ var _default = (0, _utils.createRule)({
         if (erroneousMethod && !ignore.includes(node.callee.name)) {
           context.report({
             messageId: 'unexpectedLowercase',
+            node: node.arguments[0],
             data: {
               method: erroneousMethod
             },
-            node,
 
             fix(fixer) {
-              const [firstArg] = node.arguments; // guaranteed by jestFunctionName
-
-              const description = testDescription(firstArg);
+              const [firstArg] = node.arguments;
+              const description = (0, _utils.getStringValue)(firstArg);
               const rangeIgnoringQuotes = [firstArg.range[0] + 1, firstArg.range[1] - 1];
               const newDescription = description.substring(0, 1).toLowerCase() + description.substring(1);
               return [fixer.replaceTextRange(rangeIgnoringQuotes, newDescription)];

package/lib/rules/no-commented-out-tests.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _utils = require("./utils");
 
 function hasTests(node) {
-  return /^\s*[xf]?(test|it|describe)(\.\w+|\[['"]\w+['"]\])?\s*\(/m.test(node.value);
+  return /^\s*[xf]?(test|it|describe)(\.\w+|\[['"]\w+['"]\])?\s*\(/mu.test(node.value);
 }
 
 var _default = (0, _utils.createRule)({

package/lib/rules/no-expect-resolves.js

@@ -5,18 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _experimentalUtils = require("@typescript-eslint/experimental-utils");
-
 var _utils = require("./utils");
 
-function isIdentifierResolves(node) {
-  return node.property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && node.property.name === 'resolves';
-}
-
-function isExpectResolves(node) {
-  return (0, _utils.isExpectCall)(node.object) && isIdentifierResolves(node);
-}
-
 var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
@@ -34,7 +24,7 @@ var _default = (0, _utils.createRule)({
   defaultOptions: [],
   create: context => ({
     MemberExpression(node) {
-      if (isExpectResolves(node)) {
+      if ((0, _utils.isExpectCall)(node.object) && (0, _utils.isSupportedAccessor)(node.property, _utils.ModifierName.resolves)) {
         context.report({
           node: node.property,
           messageId: 'expectResolves'

package/lib/rules/no-export.js

@@ -63,7 +63,7 @@ var _default = (0, _utils.createRule)({
           } = object);
         }
 
-        if ('name' in object && object.name === 'module' && property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && /^exports?$/.test(property.name)) {
+        if ('name' in object && object.name === 'module' && property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && /^exports?$/u.test(property.name)) {
           exportNodes.push(node);
         }
       }

package/lib/rules/no-if.js

@@ -5,14 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _utils = require("./utils");
-
 var _experimentalUtils = require("@typescript-eslint/experimental-utils");
 
+var _utils = require("./utils");
+
 const testCaseNames = new Set([...Object.keys(_utils.TestCaseName), 'it.only', 'it.concurrent.only', 'it.skip', 'it.concurrent.skip', 'test.only', 'test.concurrent.only', 'test.skip', 'test.concurrent.skip', 'fit.concurrent']);
 
 const isTestArrowFunction = node => node.parent !== undefined && node.parent.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && testCaseNames.has((0, _utils.getNodeName)(node.parent.callee));
 
+const conditionName = {
+  [_experimentalUtils.AST_NODE_TYPES.ConditionalExpression]: 'conditional',
+  [_experimentalUtils.AST_NODE_TYPES.SwitchStatement]: 'switch',
+  [_experimentalUtils.AST_NODE_TYPES.IfStatement]: 'if'
+};
+
 var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
@@ -22,8 +28,7 @@ var _default = (0, _utils.createRule)({
       recommended: false
     },
     messages: {
-      noIf: 'Tests should not contain if statements.',
-      noConditional: 'Tests should not contain conditional statements.'
+      noConditionalExpect: 'Test should not contain { condition } statements.'
     },
     schema: [],
     type: 'suggestion'
@@ -36,13 +41,15 @@ var _default = (0, _utils.createRule)({
     function validate(node) {
       const lastElementInStack = stack[stack.length - 1];
 
-      if (stack.length === 0 || lastElementInStack === false) {
+      if (stack.length === 0 || !lastElementInStack) {
         return;
       }
 
-      const messageId = node.type === _experimentalUtils.AST_NODE_TYPES.ConditionalExpression ? 'noConditional' : 'noIf';
       context.report({
-        messageId,
+        data: {
+          condition: conditionName[node.type]
+        },
+        messageId: 'noConditionalExpect',
         node
       });
     }
@@ -56,8 +63,10 @@ var _default = (0, _utils.createRule)({
         stack.push(false);
       },
 
-      FunctionDeclaration() {
-        stack.push(false);
+      FunctionDeclaration(node) {
+        const declaredVariables = context.getDeclaredVariables(node);
+        const testCallExpressions = (0, _utils.getTestCallExpressionsFromDeclaredVariables)(declaredVariables);
+        stack.push(testCallExpressions.length > 0);
       },
 
       ArrowFunctionExpression(node) {
@@ -65,6 +74,7 @@ var _default = (0, _utils.createRule)({
       },
 
       IfStatement: validate,
+      SwitchStatement: validate,
       ConditionalExpression: validate,
 
       'CallExpression:exit'() {

package/lib/rules/no-jasmine-globals.js

@@ -127,14 +127,14 @@ var _default = (0, _utils.createRule)({
       },
 
       MemberExpression(node) {
-        if ('name' in node.object && node.object.name === 'jasmine') {
+        if ((0, _utils.isSupportedAccessor)(node.object, 'jasmine')) {
           const {
             parent,
             property
           } = node;
 
           if (parent && parent.type === _experimentalUtils.AST_NODE_TYPES.AssignmentExpression) {
-            if ('name' in property && property.name === 'DEFAULT_TIMEOUT_INTERVAL') {
+            if ((0, _utils.isSupportedAccessor)(property, 'DEFAULT_TIMEOUT_INTERVAL')) {
               const {
                 right
               } = parent;

package/lib/rules/no-large-snapshots.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _experimentalUtils = require("@typescript-eslint/experimental-utils");
-
 var _path = require("path");
 
+var _experimentalUtils = require("@typescript-eslint/experimental-utils");
+
 var _utils = require("./utils");
 
 const reportOnViolation = (context, node, {

package/lib/rules/no-standalone-expect.js

@@ -38,13 +38,7 @@ const getBlockType = stmt => {
   return null;
 };
 
-const isEach = node => {
-  if (node && node.callee && node.callee.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && node.callee.callee && node.callee.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.callee.property && node.callee.callee.property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && node.callee.callee.property.name === 'each' && node.callee.callee.object && node.callee.callee.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && _utils.TestCaseName.hasOwnProperty(node.callee.callee.object.name)) {
-    return true;
-  }
-
-  return false;
-};
+const isEach = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && node.callee.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.callee.property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && node.callee.callee.property.name === 'each' && node.callee.callee.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && _utils.TestCaseName.hasOwnProperty(node.callee.callee.object.name);
 
 var _default = (0, _utils.createRule)({
   name: __filename,

package/lib/rules/no-test-callback.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _experimentalUtils = require("@typescript-eslint/experimental-utils");
+
 var _utils = require("./utils");
 
 var _default = (0, _utils.createRule)({
@@ -90,7 +92,7 @@ var _default = (0, _utils.createRule)({
             let afterReplacement = ')';
             let replaceBefore = true;
 
-            if (body.type === 'BlockStatement') {
+            if (body.type === _experimentalUtils.AST_NODE_TYPES.BlockStatement) {
               const keyword = 'return';
               beforeReplacement = `${keyword} ${beforeReplacement}{`;
               afterReplacement += '}';

package/lib/rules/no-test-return-statement.js

@@ -5,15 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _utils = require("./utils");
+var _experimentalUtils = require("@typescript-eslint/experimental-utils");
 
-const RETURN_STATEMENT = 'ReturnStatement';
-const BLOCK_STATEMENT = 'BlockStatement';
+var _utils = require("./utils");
 
 const getBody = args => {
   const [, secondArg] = args;
 
-  if (secondArg && (0, _utils.isFunction)(secondArg) && secondArg.body && secondArg.body.type === BLOCK_STATEMENT) {
+  if (secondArg && (0, _utils.isFunction)(secondArg) && secondArg.body && secondArg.body.type === _experimentalUtils.AST_NODE_TYPES.BlockStatement) {
     return secondArg.body.body;
   }
 
@@ -41,7 +40,19 @@ var _default = (0, _utils.createRule)({
       CallExpression(node) {
         if (!(0, _utils.isTestCase)(node)) return;
         const body = getBody(node.arguments);
-        const returnStmt = body.find(t => t.type === RETURN_STATEMENT);
+        const returnStmt = body.find(t => t.type === _experimentalUtils.AST_NODE_TYPES.ReturnStatement);
+        if (!returnStmt) return;
+        context.report({
+          messageId: 'noReturnValue',
+          node: returnStmt
+        });
+      },
+
+      FunctionDeclaration(node) {
+        const declaredVariables = context.getDeclaredVariables(node);
+        const testCallExpressions = (0, _utils.getTestCallExpressionsFromDeclaredVariables)(declaredVariables);
+        if (testCallExpressions.length === 0) return;
+        const returnStmt = node.body.body.find(t => t.type === _experimentalUtils.AST_NODE_TYPES.ReturnStatement);
         if (!returnStmt) return;
         context.report({
           messageId: 'noReturnValue',

package/lib/rules/no-truthy-falsy.js

@@ -17,7 +17,7 @@ var _default = (0, _utils.createRule)({
       recommended: false
     },
     messages: {
-      avoidMessage: 'Avoid {{ methodName }}'
+      avoidMatcher: 'Avoid {{ matcherName }}'
     },
     type: 'suggestion',
     schema: []
@@ -40,13 +40,11 @@ var _default = (0, _utils.createRule)({
         }
 
         context.report({
+          messageId: 'avoidMatcher',
+          node: matcher.node.property,
           data: {
-            methodName: matcher.name
-          },
-          // todo: rename to 'matcherName'
-          messageId: 'avoidMessage',
-          // todo: rename to 'avoidMatcher'
-          node: matcher.node.property
+            matcherName: matcher.name
+          }
         });
       }
 

package/lib/rules/no-try-expect.js

@@ -43,6 +43,15 @@ var _default = (0, _utils.createRule)({
         }
       },
 
+      FunctionDeclaration(node) {
+        const declaredVariables = context.getDeclaredVariables(node);
+        const testCallExpressions = (0, _utils.getTestCallExpressionsFromDeclaredVariables)(declaredVariables);
+
+        if (testCallExpressions.length > 0) {
+          isTest = true;
+        }
+      },
+
       CatchClause() {
         if (isTest) {
           ++catchDepth;
@@ -59,6 +68,15 @@ var _default = (0, _utils.createRule)({
         if ((0, _utils.isTestCase)(node)) {
           isTest = false;
         }
+      },
+
+      'FunctionDeclaration:exit'(node) {
+        const declaredVariables = context.getDeclaredVariables(node);
+        const testCallExpressions = (0, _utils.getTestCallExpressionsFromDeclaredVariables)(declaredVariables);
+
+        if (testCallExpressions.length > 0) {
+          isTest = false;
+        }
       }
 
     };

package/lib/rules/prefer-expect-assertions.js

@@ -21,7 +21,7 @@ const isExpectAssertionsOrHasAssertionsCall = expression => {
   }
 
   const [arg] = expression.arguments;
-  return expression.arguments && expression.arguments.length === 1 && arg.type === _experimentalUtils.AST_NODE_TYPES.Literal && typeof arg.value === 'number' && Number.isInteger(arg.value);
+  return (0, _utils.hasOnlyOneArgument)(expression) && arg.type === _experimentalUtils.AST_NODE_TYPES.Literal && typeof arg.value === 'number' && Number.isInteger(arg.value);
 };
 
 const getFunctionFirstLine = functionBody => functionBody[0] && functionBody[0].expression;

package/lib/rules/prefer-todo.js

@@ -9,8 +9,13 @@ var _experimentalUtils = require("@typescript-eslint/experimental-utils");
 
 var _utils = require("./utils");
 
-function isFunctionBodyEmpty(node) {
+function isEmptyFunction(node) {
+  if (!(0, _utils.isFunction)(node)) {
+    return false;
+  }
   /* istanbul ignore if https://github.com/typescript-eslint/typescript-eslint/issues/734 */
+
+
   if (!node.body) {
     throw new Error(`Unexpected null while performing prefer-todo - please file a github issue at https://github.com/jest-community/eslint-plugin-jest`);
   }
@@ -18,12 +23,7 @@ function isFunctionBodyEmpty(node) {
   return node.body.type === _experimentalUtils.AST_NODE_TYPES.BlockStatement && node.body.body && !node.body.body.length;
 }
 
-function isTestBodyEmpty(node) {
-  const [, fn] = node.arguments;
-  return fn && (0, _utils.isFunction)(fn) && isFunctionBodyEmpty(fn);
-}
-
-function addTodo(node, fixer) {
+function createTodoFixer(node, fixer) {
   const testName = (0, _utils.getNodeName)(node.callee).split('.').shift();
   return fixer.replaceText(node.callee, `${testName}.todo`);
 }
@@ -39,8 +39,8 @@ var _default = (0, _utils.createRule)({
       recommended: false
     },
     messages: {
-      todoOverEmpty: 'Prefer todo test case over empty test case',
-      todoOverUnimplemented: 'Prefer todo test case over unimplemented test case'
+      emptyTest: 'Prefer todo test case over empty test case',
+      unimplementedTest: 'Prefer todo test case over unimplemented test case'
     },
     fixable: 'code',
     schema: [],
@@ -51,25 +51,25 @@ var _default = (0, _utils.createRule)({
   create(context) {
     return {
       CallExpression(node) {
-        const [firstArg, secondArg] = node.arguments;
+        const [title, callback] = node.arguments;
 
-        if (!firstArg || !isTargetedTestCase(node) || !(0, _utils.isStringNode)(firstArg)) {
+        if (!title || !isTargetedTestCase(node) || !(0, _utils.isStringNode)(title)) {
           return;
         }
 
-        if (isTestBodyEmpty(node)) {
+        if (callback && isEmptyFunction(callback)) {
           context.report({
-            messageId: 'todoOverEmpty',
+            messageId: 'emptyTest',
             node,
-            fix: fixer => [fixer.removeRange([firstArg.range[1], secondArg.range[1]]), addTodo(node, fixer)]
+            fix: fixer => [fixer.removeRange([title.range[1], callback.range[1]]), createTodoFixer(node, fixer)]
           });
         }
 
         if ((0, _utils.hasOnlyOneArgument)(node)) {
           context.report({
-            messageId: 'todoOverUnimplemented',
+            messageId: 'unimplementedTest',
             node,
-            fix: fixer => [addTodo(node, fixer)]
+            fix: fixer => [createTodoFixer(node, fixer)]
           });
         }
       }

package/lib/rules/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getNodeName = getNodeName;
-exports.scopeHasLocalReference = exports.getJestFunctionArguments = exports.isDescribeEach = exports.isDescribe = exports.isTestCase = exports.isHook = exports.isFunction = exports.TestCaseProperty = exports.DescribeProperty = exports.HookName = exports.TestCaseName = exports.DescribeAlias = exports.parseExpectCall = exports.isParsedEqualityMatcherCall = exports.EqualityMatcher = exports.ModifierName = exports.isExpectMember = exports.isExpectCall = exports.getAccessorValue = exports.isSupportedAccessor = exports.hasOnlyOneArgument = exports.getStringValue = exports.isStringNode = exports.followTypeAssertionChain = exports.createRule = void 0;
+exports.scopeHasLocalReference = exports.getJestFunctionArguments = exports.isDescribeEach = exports.isDescribe = exports.isTestCase = exports.getTestCallExpressionsFromDeclaredVariables = exports.isHook = exports.isFunction = exports.TestCaseProperty = exports.DescribeProperty = exports.HookName = exports.TestCaseName = exports.DescribeAlias = exports.parseExpectCall = exports.isParsedEqualityMatcherCall = exports.EqualityMatcher = exports.ModifierName = exports.isExpectMember = exports.isExpectCall = exports.getAccessorValue = exports.isSupportedAccessor = exports.hasOnlyOneArgument = exports.getStringValue = exports.isStringNode = exports.followTypeAssertionChain = exports.createRule = void 0;
 
 var _path = require("path");
 
@@ -378,6 +378,12 @@ function getNodeName(node) {
 
     case _experimentalUtils.AST_NODE_TYPES.MemberExpression:
       return joinNames(getNodeName(node.object), getNodeName(node.property));
+
+    case _experimentalUtils.AST_NODE_TYPES.NewExpression:
+      return getNodeName(node.callee);
+
+    case _experimentalUtils.AST_NODE_TYPES.CallExpression:
+      return getNodeName(node.callee);
   }
 
   return null;
@@ -391,6 +397,16 @@ const isHook = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.Id
 
 exports.isHook = isHook;
 
+const getTestCallExpressionsFromDeclaredVariables = declaredVaiables => {
+  return declaredVaiables.reduce((acc, {
+    references
+  }) => acc.concat(references.map(({
+    identifier
+  }) => identifier.parent).filter(node => !!node && node.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && isTestCase(node))), []);
+};
+
+exports.getTestCallExpressionsFromDeclaredVariables = getTestCallExpressionsFromDeclaredVariables;
+
 const isTestCase = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.Identifier && TestCaseName.hasOwnProperty(node.callee.name) || node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && TestCaseProperty.hasOwnProperty(node.callee.property.name) && (node.callee.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && TestCaseName.hasOwnProperty(node.callee.object.name) || node.callee.object.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.object.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && TestCaseName.hasOwnProperty(node.callee.object.object.name));
 
 exports.isTestCase = isTestCase;

package/lib/rules/valid-expect.js

@@ -64,12 +64,10 @@ var _default = (0, _utils.createRule)({
       recommended: 'error'
     },
     messages: {
-      multipleArgs: 'More than one argument was passed to expect().',
-      noArgs: 'No arguments were passed to expect().',
-      noAssertions: 'No assertion was called on expect().',
-      invalidProperty: '"{{ propertyName }}" is not a valid property of expect.',
-      propertyWithoutMatcher: '"{{ propertyName }}" needs to call a matcher.',
-      matcherOnPropertyNotCalled: '"{{ propertyName }}" was not called.',
+      incorrectNumberOfArguments: 'Expect takes one and only one argument.',
+      modifierUnknown: 'Expect has no modifier named "{{ modifierName }}".',
+      matcherNotFound: 'Expect must have a corresponding matcher call.',
+      matcherNotCalled: 'Matchers must be called to assert.',
       asyncMustBeAwaited: 'Async assertions must be awaited{{ orReturned }}.',
       promisesWithAsyncAssertionsMustBeAwaited: 'Promises which return async assertions must be awaited{{ orReturned }}.'
     },
@@ -119,35 +117,39 @@ var _default = (0, _utils.createRule)({
           matcher
         } = (0, _utils.parseExpectCall)(node);
 
-        if (expect.arguments.length > 1) {
-          const secondArgumentLocStart = expect.arguments[1].loc.start;
-          const lastArgumentLocEnd = expect.arguments[node.arguments.length - 1].loc.end;
-          context.report({
-            loc: {
-              end: {
-                column: lastArgumentLocEnd.column - 1,
-                line: lastArgumentLocEnd.line
-              },
-              start: secondArgumentLocStart
-            },
-            messageId: 'multipleArgs',
-            node
-          });
-        } else if (expect.arguments.length === 0) {
+        if (expect.arguments.length !== 1) {
           const expectLength = (0, _utils.getAccessorValue)(expect.callee).length;
-          context.report({
-            loc: {
+          let loc = {
+            start: {
+              column: node.loc.start.column + expectLength,
+              line: node.loc.start.line
+            },
+            end: {
+              column: node.loc.start.column + expectLength + 1,
+              line: node.loc.start.line
+            }
+          };
+
+          if (expect.arguments.length !== 0) {
+            const {
+              start
+            } = expect.arguments[1].loc;
+            const {
+              end
+            } = expect.arguments[node.arguments.length - 1].loc;
+            loc = {
+              start,
               end: {
-                column: node.loc.start.column + expectLength + 1,
-                line: node.loc.start.line
-              },
-              start: {
-                column: node.loc.start.column + expectLength,
-                line: node.loc.start.line
+                column: end.column - 1,
+                line: end.line
               }
-            },
-            messageId: 'noArgs',
-            node
+            };
+          }
+
+          context.report({
+            messageId: 'incorrectNumberOfArguments',
+            node,
+            loc
           });
         } // something was called on `expect()`
 
@@ -155,12 +157,7 @@ var _default = (0, _utils.createRule)({
         if (!matcher) {
           if (modifier) {
             context.report({
-              data: {
-                propertyName: modifier.name
-              },
-              // todo: rename to 'modifierName'
-              messageId: 'propertyWithoutMatcher',
-              // todo: rename to 'modifierWithoutMatcher'
+              messageId: 'matcherNotFound',
               node: modifier.node.property
             });
           }
@@ -170,12 +167,10 @@ var _default = (0, _utils.createRule)({
 
         if (matcher.node.parent && (0, _utils.isExpectMember)(matcher.node.parent)) {
           context.report({
-            messageId: 'invalidProperty',
-            // todo: rename to 'invalidModifier'
+            messageId: 'modifierUnknown',
             data: {
-              propertyName: matcher.name
+              modifierName: matcher.name
             },
-            // todo: rename to 'matcherName' (or modifierName?)
             node: matcher.node.property
           });
           return;
@@ -183,12 +178,7 @@ var _default = (0, _utils.createRule)({
 
         if (!matcher.arguments) {
           context.report({
-            data: {
-              propertyName: matcher.name
-            },
-            // todo: rename to 'matcherName'
-            messageId: 'matcherOnPropertyNotCalled',
-            // todo: rename to 'matcherNotCalled'
+            messageId: 'matcherNotCalled',
             node: matcher.node.property
           });
         }
@@ -237,7 +227,7 @@ var _default = (0, _utils.createRule)({
       'CallExpression:exit'(node) {
         if ((0, _utils.isExpectCall)(node) && isNoAssertionsParentNode(node.parent)) {
           context.report({
-            messageId: 'noAssertions',
+            messageId: 'matcherNotFound',
             node
           });
         }

package/lib/rules/valid-title.js

@@ -23,6 +23,8 @@ const doesBinaryExpressionContainStringNode = binaryExp => {
   return (0, _utils.isStringNode)(binaryExp.left);
 };
 
+const quoteStringValue = node => node.type === _experimentalUtils.AST_NODE_TYPES.TemplateLiteral ? `\`${node.quasis[0].value.raw}\`` : node.raw;
+
 var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
@@ -35,7 +37,8 @@ var _default = (0, _utils.createRule)({
       titleMustBeString: 'Title must be a string',
       emptyTitle: '{{ jestFunctionName }} should not have an empty title',
       duplicatePrefix: 'should not have duplicate prefix',
-      accidentalSpace: 'should not have leading or trailing spaces'
+      accidentalSpace: 'should not have leading or trailing spaces',
+      disallowedWord: '"{{ word }}" is not allowed in test titles.'
     },
     type: 'suggestion',
     schema: [{
@@ -44,6 +47,13 @@ var _default = (0, _utils.createRule)({
         ignoreTypeOfDescribeName: {
           type: 'boolean',
           default: false
+        },
+        disallowedWords: {
+          type: 'array',
+          items: {
+            type: 'string'
+          },
+          default: []
         }
       },
       additionalProperties: false
@@ -51,12 +61,15 @@ var _default = (0, _utils.createRule)({
     fixable: 'code'
   },
   defaultOptions: [{
-    ignoreTypeOfDescribeName: false
+    ignoreTypeOfDescribeName: false,
+    disallowedWords: []
   }],
 
   create(context, [{
-    ignoreTypeOfDescribeName
+    ignoreTypeOfDescribeName,
+    disallowedWords
   }]) {
+    const disallowedWordsRegexp = new RegExp(`\\b(${disallowedWords.join('|')})\\b`, 'iu');
     return {
       CallExpression(node) {
         if (!((0, _utils.isDescribe)(node) || (0, _utils.isTestCase)(node)) || !node.arguments.length) {
@@ -93,16 +106,26 @@ var _default = (0, _utils.createRule)({
           return;
         }
 
+        if (disallowedWords.length > 0) {
+          const disallowedMatch = disallowedWordsRegexp.exec(title);
+
+          if (disallowedMatch) {
+            context.report({
+              data: {
+                word: disallowedMatch[1]
+              },
+              messageId: 'disallowedWord',
+              node: argument
+            });
+            return;
+          }
+        }
+
         if (title.trim().length !== title.length) {
           context.report({
             messageId: 'accidentalSpace',
             node: argument,
-
-            fix(fixer) {
-              const stringValue = argument.type === _experimentalUtils.AST_NODE_TYPES.TemplateLiteral ? `\`${argument.quasis[0].value.raw}\`` : argument.raw;
-              return [fixer.replaceTextRange(argument.range, stringValue.replace(/^([`'"]) +?/, '$1').replace(/ +?([`'"])$/, '$1'))];
-            }
-
+            fix: fixer => [fixer.replaceTextRange(argument.range, quoteStringValue(argument).replace(/^([`'"]) +?/u, '$1').replace(/ +?([`'"])$/u, '$1'))]
           });
         }
 
@@ -113,12 +136,7 @@ var _default = (0, _utils.createRule)({
           context.report({
             messageId: 'duplicatePrefix',
             node: argument,
-
-            fix(fixer) {
-              const stringValue = argument.type === _experimentalUtils.AST_NODE_TYPES.TemplateLiteral ? `\`${argument.quasis[0].value.raw}\`` : argument.raw;
-              return [fixer.replaceTextRange(argument.range, stringValue.replace(/^([`'"]).+? /, '$1'))];
-            }
-
+            fix: fixer => [fixer.replaceTextRange(argument.range, quoteStringValue(argument).replace(/^([`'"]).+? /u, '$1'))]
           });
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "23.3.0",
+  "version": "23.7.0",
   "description": "Eslint rules for Jest",
   "repository": "jest-community/eslint-plugin-jest",
   "license": "MIT",
@@ -60,7 +60,7 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-eslint-plugin": "^2.0.0",
     "eslint-plugin-import": "^2.18.0",
-    "eslint-plugin-node": "^10.0.0",
+    "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.0.0",
     "husky": "^3.0.9",
     "jest": "^24.9.0",