eslint-plugin-jest 24.3.2 → 24.3.6

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## [24.3.6](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.5...v24.3.6) (2021-04-26)
+
+
+### Bug Fixes
+
+* **no-conditional-expect:** check for expects in `catch`s on promises ([#819](https://github.com/jest-community/eslint-plugin-jest/issues/819)) ([1fee973](https://github.com/jest-community/eslint-plugin-jest/commit/1fee973429a74c60b14eead6a335623b4349b5f2))
+* **valid-expect:** support async `expect` in ternary statements ([#833](https://github.com/jest-community/eslint-plugin-jest/issues/833)) ([7b7a396](https://github.com/jest-community/eslint-plugin-jest/commit/7b7a396e12c46d3087b467227887ed64854480c0))
+* improve handling of `.each` calls and with tagged literals ([#814](https://github.com/jest-community/eslint-plugin-jest/issues/814)) ([040c605](https://github.com/jest-community/eslint-plugin-jest/commit/040c605cf7929a00980b3fa58331cd78ac6274f6))
+
+## [24.3.5](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.4...v24.3.5) (2021-04-10)
+
+
+### Bug Fixes
+
+* **valid-describe:** support using `each` with modifiers ([#820](https://github.com/jest-community/eslint-plugin-jest/issues/820)) ([cbdbcef](https://github.com/jest-community/eslint-plugin-jest/commit/cbdbcef47984eb01509493bd5b2423f518a2663d))
+
+## [24.3.4](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.3...v24.3.4) (2021-04-05)
+
+
+### Bug Fixes
+
+* support all variations of `describe`, `it`, & `test` ([#792](https://github.com/jest-community/eslint-plugin-jest/issues/792)) ([0968b55](https://github.com/jest-community/eslint-plugin-jest/commit/0968b557dd9cdb5cfcaf8a0d84e8a456825e6b25))
+
+## [24.3.3](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.2...v24.3.3) (2021-04-02)
+
+
+### Bug Fixes
+
+* **no-duplicate-hooks:** support `describe.each` ([#797](https://github.com/jest-community/eslint-plugin-jest/issues/797)) ([243cb4f](https://github.com/jest-community/eslint-plugin-jest/commit/243cb4f970e40aa195a3bffa0528dbdbfef7c4f5)), closes [#642](https://github.com/jest-community/eslint-plugin-jest/issues/642)
+* **prefer-expect-assertions:** support `.each` ([#798](https://github.com/jest-community/eslint-plugin-jest/issues/798)) ([f758243](https://github.com/jest-community/eslint-plugin-jest/commit/f75824359f2242f53997c59c238d83a59badeea3)), closes [#676](https://github.com/jest-community/eslint-plugin-jest/issues/676)
+
 ## [24.3.2](https://github.com/jest-community/eslint-plugin-jest/compare/v24.3.1...v24.3.2) (2021-03-16)
 
 

package/README.md

@@ -214,6 +214,13 @@ ensure consistency and readability in jest test suites.
 
 https://github.com/dangreenisrael/eslint-plugin-jest-formatting
 
+### eslint-plugin-istanbul
+
+A set of rules to enforce good practices for Istanbul, one of the code coverage
+tools used by Jest.
+
+https://github.com/istanbuljs/eslint-plugin-istanbul
+
 [recommended]: https://img.shields.io/badge/-recommended-lightgrey.svg
 [suggest]: https://img.shields.io/badge/-suggest-yellow.svg
 [fixable]: https://img.shields.io/badge/-fixable-green.svg

package/docs/rules/expect-expect.md

@@ -87,10 +87,10 @@ it('is money-like', () => {
 
 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:
+`{ "assertFunctionNames": ["expect", "request.**.expect"] }` option:
 
 ```js
-/* eslint jest/expect-expect: ["error", { "assertFunctionNames": ["expect", "request.*.expect"] }] */
+/* eslint jest/expect-expect: ["error", { "assertFunctionNames": ["expect", "request.**.expect"] }] */
 const request = require('supertest');
 const express = require('express');
 

package/docs/rules/no-conditional-expect.md

@@ -3,6 +3,9 @@
 This rule prevents the use of `expect` in conditional blocks, such as `if`s &
 `catch`s.
 
+This includes using `expect` in callbacks to functions named `catch`, which are
+assumed to be promises.
+
 ## Rule Details
 
 Jest considered a test to have failed if it throws an error, rather than on if
@@ -37,6 +40,10 @@ it('baz', async () => {
     expect(err).toMatchObject({ code: 'MODULE_NOT_FOUND' });
   }
 });
+
+it('throws an error', async () => {
+  await foo().catch(error => expect(error).toBeInstanceOf(error));
+});
 ```
 
 The following patterns are not warnings:
@@ -67,4 +74,8 @@ it('validates the request', () => {
     expect(validRequest).toHaveBeenCalledWith(request);
   }
 });
+
+it('throws an error', async () => {
+  await expect(foo).rejects.toThrow(Error);
+});
 ```

package/docs/rules/no-focused-tests.md

@@ -12,7 +12,7 @@ whenever you are using the exclusivity feature.
 ## Rule Details
 
 This rule looks for every `describe.only`, `it.only`, `test.only`, `fdescribe`,
-`fit` and `ftest` occurrences within the source code. Of course there are some
+and `fit` occurrences within the source code. Of course there are some
 edge-cases which can’t be detected by this rule e.g.:
 
 ```js
@@ -31,13 +31,9 @@ test.only('foo', () => {});
 test['only']('bar', () => {});
 fdescribe('foo', () => {});
 fit('foo', () => {});
-ftest('bar', () => {});
 fit.each`
   table
 `();
-ftest.each`
-  table
-`();
 ```
 
 These patterns would not be considered warnings:

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

@@ -56,13 +56,13 @@ var _default = (0, _utils.createRule)({
           return;
         }
 
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           describeNestingLevel++;
         }
 
-        const funcNode = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee;
+        const funcNode = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? node.callee.callee : node.callee;
 
-        if ((0, _utils.isTestCase)(node) && describeNestingLevel === 0 && !nodeName.includes(testKeyword)) {
+        if ((0, _utils.isTestCaseCall)(node) && describeNestingLevel === 0 && !nodeName.includes(testKeyword)) {
           const oppositeTestKeyword = getOppositeTestKeyword(testKeyword);
           context.report({
             messageId: 'consistentMethod',
@@ -75,7 +75,7 @@ var _default = (0, _utils.createRule)({
           });
         }
 
-        if ((0, _utils.isTestCase)(node) && describeNestingLevel > 0 && !nodeName.includes(testKeywordWithinDescribe)) {
+        if ((0, _utils.isTestCaseCall)(node) && describeNestingLevel > 0 && !nodeName.includes(testKeywordWithinDescribe)) {
           const oppositeTestKeyword = getOppositeTestKeyword(testKeywordWithinDescribe);
           context.report({
             messageId: 'consistentMethodWithinDescribe',
@@ -90,7 +90,7 @@ var _default = (0, _utils.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isDescribe)(node) && !(0, _utils.isEachCall)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           describeNestingLevel--;
         }
       }

package/lib/rules/lowercase-name.js

@@ -5,32 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _experimentalUtils = require("@typescript-eslint/experimental-utils");
-
 var _utils = require("./utils");
 
 const hasStringAsFirstArgument = node => node.arguments[0] && (0, _utils.isStringNode)(node.arguments[0]);
 
 const findNodeNameAndArgument = node => {
-  if (!((0, _utils.isTestCase)(node) || (0, _utils.isDescribe)(node))) {
-    return null;
-  }
-
-  if ((0, _utils.isEachCall)(node)) {
-    var _node$parent;
-
-    if (((_node$parent = node.parent) === null || _node$parent === void 0 ? void 0 : _node$parent.type) === _experimentalUtils.AST_NODE_TYPES.CallExpression && hasStringAsFirstArgument(node.parent)) {
-      return [node.callee.object.name, node.parent.arguments[0]];
-    }
-
+  if (!((0, _utils.isTestCaseCall)(node) || (0, _utils.isDescribeCall)(node))) {
     return null;
   }
 
-  if (node.callee.type !== _experimentalUtils.AST_NODE_TYPES.Identifier || !hasStringAsFirstArgument(node)) {
+  if (!hasStringAsFirstArgument(node)) {
     return null;
   }
 
-  return [node.callee.name, node.arguments[0]];
+  return [(0, _utils.getNodeName)(node).split('.')[0], node.arguments[0]];
 };
 
 var _default = (0, _utils.createRule)({
@@ -85,7 +73,7 @@ var _default = (0, _utils.createRule)({
     let numberOfDescribeBlocks = 0;
     return {
       CallExpression(node) {
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           numberOfDescribeBlocks++;
 
           if (ignoreTopLevelDescribe && numberOfDescribeBlocks === 1) {
@@ -130,7 +118,7 @@ var _default = (0, _utils.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           numberOfDescribeBlocks--;
         }
       }

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

@@ -5,8 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _experimentalUtils = require("@typescript-eslint/experimental-utils");
+
 var _utils = require("./utils");
 
+const isCatchCall = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && (0, _utils.isSupportedAccessor)(node.callee.property, 'catch');
+
 var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
@@ -26,6 +30,7 @@ var _default = (0, _utils.createRule)({
   create(context) {
     let conditionalDepth = 0;
     let inTestCase = false;
+    let inPromiseCatch = false;
 
     const increaseConditionalDepth = () => inTestCase && conditionalDepth++;
 
@@ -42,22 +47,37 @@ var _default = (0, _utils.createRule)({
       },
 
       CallExpression(node) {
-        if ((0, _utils.isTestCase)(node)) {
+        if ((0, _utils.isTestCaseCall)(node)) {
           inTestCase = true;
         }
 
+        if (isCatchCall(node)) {
+          inPromiseCatch = true;
+        }
+
         if (inTestCase && (0, _utils.isExpectCall)(node) && conditionalDepth > 0) {
           context.report({
             messageId: 'conditionalExpect',
             node
           });
         }
+
+        if (inPromiseCatch && (0, _utils.isExpectCall)(node)) {
+          context.report({
+            messageId: 'conditionalExpect',
+            node
+          });
+        }
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isTestCase)(node)) {
+        if ((0, _utils.isTestCaseCall)(node)) {
           inTestCase = false;
         }
+
+        if (isCatchCall(node)) {
+          inPromiseCatch = false;
+        }
       },
 
       CatchClause: increaseConditionalDepth,

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

@@ -18,7 +18,7 @@ const findCallbackArg = (node, isJestEach) => {
     return node.arguments[0];
   }
 
-  if ((0, _utils.isTestCase)(node) && node.arguments.length >= 2) {
+  if ((0, _utils.isTestCaseCall)(node) && node.arguments.length >= 2) {
     return node.arguments[1];
   }
 

package/lib/rules/no-duplicate-hooks.js

@@ -34,7 +34,7 @@ var _default = (0, _utils.createRule)({
     const hookContexts = [newHookContext()];
     return {
       CallExpression(node) {
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           hookContexts.push(newHookContext());
         }
 
@@ -55,7 +55,7 @@ var _default = (0, _utils.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           hookContexts.pop();
         }
       }

package/lib/rules/no-export.js

@@ -41,7 +41,7 @@ var _default = (0, _utils.createRule)({
       },
 
       CallExpression(node) {
-        if ((0, _utils.isTestCase)(node)) {
+        if ((0, _utils.isTestCaseCall)(node)) {
           hasTestCase = true;
         }
       },

package/lib/rules/no-focused-tests.js

@@ -9,16 +9,23 @@ var _experimentalUtils = require("@typescript-eslint/experimental-utils");
 
 var _utils = require("./utils");
 
-const validTestCaseNames = [_utils.TestCaseName.test, _utils.TestCaseName.it];
-const testFunctions = new Set([_utils.DescribeAlias.describe, ...validTestCaseNames]);
+const findOnlyNode = node => {
+  const callee = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? node.callee.callee : node.callee;
 
-const isConcurrentExpression = expression => (0, _utils.isSupportedAccessor)(expression.property, _utils.TestCaseProperty.concurrent) && !!expression.parent && expression.parent.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression;
-
-const matchesTestFunction = object => 'name' in object && typeof object.name === 'string' && (object.name in _utils.TestCaseName || object.name in _utils.DescribeAlias);
+  if (callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression) {
+    if (callee.object.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression) {
+      if ((0, _utils.isSupportedAccessor)(callee.object.property, 'only')) {
+        return callee.object.property;
+      }
+    }
 
-const isCallToFocusedTestFunction = object => object.name.startsWith('f') && testFunctions.has(object.name.substring(1));
+    if ((0, _utils.isSupportedAccessor)(callee.property, 'only')) {
+      return callee.property;
+    }
+  }
 
-const isCallToTestOnlyFunction = callee => matchesTestFunction(callee.object) && (0, _utils.isSupportedAccessor)(isConcurrentExpression(callee) ? callee.parent.property : callee.property, 'only');
+  return null;
+};
 
 var _default = (0, _utils.createRule)({
   name: __filename,
@@ -39,78 +46,36 @@ var _default = (0, _utils.createRule)({
   defaultOptions: [],
   create: context => ({
     CallExpression(node) {
-      const callee = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee;
-
-      if (callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression) {
-        const calleeObject = callee.object;
-
-        if (calleeObject.type === _experimentalUtils.AST_NODE_TYPES.Identifier && isCallToFocusedTestFunction(calleeObject)) {
-          context.report({
-            messageId: 'focusedTest',
-            node: calleeObject,
-            suggest: [{
-              messageId: 'suggestRemoveFocus',
-
-              fix(fixer) {
-                return fixer.removeRange([calleeObject.range[0], calleeObject.range[0] + 1]);
-              }
-
-            }]
-          });
-          return;
-        }
-
-        if (calleeObject.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && isCallToTestOnlyFunction(calleeObject)) {
-          context.report({
-            messageId: 'focusedTest',
-            node: isConcurrentExpression(calleeObject) ? callee.property : calleeObject.property,
-            suggest: [{
-              messageId: 'suggestRemoveFocus',
-
-              fix(fixer) {
-                if (calleeObject.property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && calleeObject.property.name === 'only') {
-                  return fixer.removeRange([calleeObject.object.range[1], calleeObject.range[1]]);
-                }
-
-                return fixer.removeRange([calleeObject.range[1], callee.range[1]]);
-              }
-
-            }]
-          });
-          return;
-        }
-
-        if (isCallToTestOnlyFunction(callee)) {
-          context.report({
-            messageId: 'focusedTest',
-            node: callee.property,
-            suggest: [{
-              messageId: 'suggestRemoveFocus',
-
-              fix(fixer) {
-                return fixer.removeRange([calleeObject.range[1], callee.range[1]]);
-              }
-
-            }]
-          });
-          return;
-        }
+      if (!(0, _utils.isDescribeCall)(node) && !(0, _utils.isTestCaseCall)(node)) {
+        return;
       }
 
-      if (callee.type === _experimentalUtils.AST_NODE_TYPES.Identifier && isCallToFocusedTestFunction(callee)) {
+      if ((0, _utils.getNodeName)(node).startsWith('f')) {
         context.report({
           messageId: 'focusedTest',
-          node: callee,
+          node,
           suggest: [{
             messageId: 'suggestRemoveFocus',
-
-            fix(fixer) {
-              return fixer.removeRange([callee.range[0], callee.range[0] + 1]);
-            }
-
+            fix: fixer => fixer.removeRange([node.range[0], node.range[0] + 1])
           }]
         });
+        return;
       }
+
+      const onlyNode = findOnlyNode(node);
+
+      if (!onlyNode) {
+        return;
+      }
+
+      context.report({
+        messageId: 'focusedTest',
+        node: onlyNode,
+        suggest: [{
+          messageId: 'suggestRemoveFocus',
+          fix: fixer => fixer.removeRange([onlyNode.range[0] - 1, onlyNode.range[1] + Number(onlyNode.type !== _experimentalUtils.AST_NODE_TYPES.Identifier)])
+        }]
+      });
     }
 
   })

package/lib/rules/no-identical-title.js

@@ -37,7 +37,7 @@ var _default = (0, _utils.createRule)({
       CallExpression(node) {
         const currentLayer = contexts[contexts.length - 1];
 
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           contexts.push(newDescribeContext());
         }
 
@@ -53,7 +53,7 @@ var _default = (0, _utils.createRule)({
 
         const title = (0, _utils.getStringValue)(argument);
 
-        if ((0, _utils.isTestCase)(node)) {
+        if ((0, _utils.isTestCaseCall)(node)) {
           if (currentLayer.testTitles.includes(title)) {
             context.report({
               messageId: 'multipleTestTitle',
@@ -64,7 +64,7 @@ var _default = (0, _utils.createRule)({
           currentLayer.testTitles.push(title);
         }
 
-        if (!(0, _utils.isDescribe)(node)) {
+        if (!(0, _utils.isDescribeCall)(node)) {
           return;
         }
 
@@ -79,7 +79,7 @@ var _default = (0, _utils.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           contexts.pop();
         }
       }

package/lib/rules/no-if.js

@@ -56,8 +56,12 @@ var _default = (0, _utils.createRule)({
 
     return {
       CallExpression(node) {
-        if ((0, _utils.isTestCase)(node)) {
+        if ((0, _utils.isTestCaseCall)(node)) {
           stack.push(true);
+
+          if ((0, _utils.getNodeName)(node).endsWith('each')) {
+            stack.push(true);
+          }
         }
       },
 

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

@@ -30,7 +30,7 @@ const getBlockType = statement => {
     } // if it's not a variable, it will be callExpr, we only care about describe
 
 
-    if (expr.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && (0, _utils.isDescribe)(expr)) {
+    if (expr.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && (0, _utils.isDescribeCall)(expr)) {
       return 'describe';
     }
   }
@@ -38,8 +38,6 @@ const getBlockType = statement => {
   return null;
 };
 
-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,
   meta: {
@@ -75,7 +73,7 @@ var _default = (0, _utils.createRule)({
 
     const isCustomTestBlockFunction = node => additionalTestBlockFunctions.includes((0, _utils.getNodeName)(node) || '');
 
-    const isTestBlock = node => (0, _utils.isTestCase)(node) || isCustomTestBlockFunction(node);
+    const isTestBlock = node => (0, _utils.isTestCaseCall)(node) || isCustomTestBlockFunction(node);
 
     return {
       CallExpression(node) {
@@ -104,7 +102,7 @@ var _default = (0, _utils.createRule)({
       'CallExpression:exit'(node) {
         const top = callStack[callStack.length - 1];
 
-        if (top === 'test' && (isEach(node) || isTestBlock(node) && node.callee.type !== _experimentalUtils.AST_NODE_TYPES.MemberExpression) || top === 'template' && node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression) {
+        if (top === 'test' && isTestBlock(node) && node.callee.type !== _experimentalUtils.AST_NODE_TYPES.MemberExpression || top === 'template' && node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression) {
           callStack.pop();
         }
       },

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

@@ -30,10 +30,10 @@ var _default = (0, _utils.createRule)({
     return {
       CallExpression(node) {
         const nodeName = (0, _utils.getNodeName)(node.callee);
-        if (!nodeName || !(0, _utils.isDescribe)(node) && !(0, _utils.isTestCase)(node)) return;
+        if (!nodeName || !(0, _utils.isDescribeCall)(node) && !(0, _utils.isTestCaseCall)(node)) return;
         const preferredNodeName = getPreferredNodeName(nodeName);
         if (!preferredNodeName) return;
-        const funcNode = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee;
+        const funcNode = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? node.callee.callee : node.callee;
         context.report({
           messageId: 'usePreferredName',
           node: node.callee,

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

@@ -38,7 +38,7 @@ var _default = (0, _utils.createRule)({
   create(context) {
     return {
       CallExpression(node) {
-        if (!(0, _utils.isTestCase)(node)) return;
+        if (!(0, _utils.isTestCaseCall)(node)) return;
         const body = getBody(node.arguments);
         const returnStmt = body.find(t => t.type === _experimentalUtils.AST_NODE_TYPES.ReturnStatement);
         if (!returnStmt) return;

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

@@ -35,7 +35,7 @@ var _default = (0, _utils.createRule)({
 
     return {
       CallExpression(node) {
-        if ((0, _utils.isTestCase)(node)) {
+        if ((0, _utils.isTestCaseCall)(node)) {
           isTest = true;
         } else if (isTest && isThrowExpectCall(node)) {
           context.report({
@@ -67,7 +67,7 @@ var _default = (0, _utils.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isTestCase)(node)) {
+        if ((0, _utils.isTestCaseCall)(node)) {
           isTest = false;
         }
       },

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

@@ -55,12 +55,22 @@ var _default = (0, _utils.createRule)({
 
   create(context, [options]) {
     return {
-      'CallExpression[callee.name=/^(it|test)$/][arguments.1.body.body]'(node) {
-        if (options.onlyFunctionsWithAsyncKeyword && !node.arguments[1].async) {
+      CallExpression(node) {
+        if (!(0, _utils.isTestCaseCall)(node)) {
           return;
         }
 
-        const testFuncBody = node.arguments[1].body.body;
+        if (node.arguments.length < 2) {
+          return;
+        }
+
+        const [, testFn] = node.arguments;
+
+        if (!(0, _utils.isFunction)(testFn) || testFn.body.type !== _experimentalUtils.AST_NODE_TYPES.BlockStatement || options.onlyFunctionsWithAsyncKeyword && !testFn.async) {
+          return;
+        }
+
+        const testFuncBody = testFn.body.body;
 
         if (!isFirstLineExprStmt(testFuncBody)) {
           context.report({
@@ -68,7 +78,7 @@ var _default = (0, _utils.createRule)({
             node,
             suggest: suggestions.map(([messageId, text]) => ({
               messageId,
-              fix: fixer => fixer.insertTextBeforeRange([node.arguments[1].body.range[0] + 1, node.arguments[1].body.range[1]], text)
+              fix: fixer => fixer.insertTextBeforeRange([testFn.body.range[0] + 1, testFn.body.range[1]], text)
             }))
           });
           return;

package/lib/rules/prefer-hooks-on-top.js

@@ -27,7 +27,7 @@ var _default = (0, _utils.createRule)({
     const hooksContext = [false];
     return {
       CallExpression(node) {
-        if (!(0, _utils.isHook)(node) && (0, _utils.isTestCase)(node)) {
+        if (!(0, _utils.isHook)(node) && (0, _utils.isTestCaseCall)(node)) {
           hooksContext[hooksContext.length - 1] = true;
         }
 

package/lib/rules/prefer-todo.js

@@ -18,11 +18,11 @@ function isEmptyFunction(node) {
 }
 
 function createTodoFixer(node, fixer) {
-  const testName = (0, _utils.getNodeName)(node.callee).split('.').shift();
+  const testName = (0, _utils.getNodeName)(node).split('.').shift();
   return fixer.replaceText(node.callee, `${testName}.todo`);
 }
 
-const isTargetedTestCase = node => (0, _utils.isTestCase)(node) && [_utils.TestCaseName.it, _utils.TestCaseName.test, 'it.skip', 'test.skip'].includes((0, _utils.getNodeName)(node.callee));
+const isTargetedTestCase = node => (0, _utils.isTestCaseCall)(node) && [_utils.TestCaseName.it, _utils.TestCaseName.test, 'it.skip', 'test.skip'].includes((0, _utils.getNodeName)(node));
 
 var _default = (0, _utils.createRule)({
   name: __filename,

package/lib/rules/require-top-level-describe.js

@@ -28,13 +28,13 @@ var _default = (0, _utils.createRule)({
     let numberOfDescribeBlocks = 0;
     return {
       CallExpression(node) {
-        if ((0, _utils.isDescribe)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           numberOfDescribeBlocks++;
           return;
         }
 
         if (numberOfDescribeBlocks === 0) {
-          if ((0, _utils.isTestCase)(node)) {
+          if ((0, _utils.isTestCaseCall)(node)) {
             context.report({
               node,
               messageId: 'unexpectedTestCase'
@@ -53,7 +53,7 @@ var _default = (0, _utils.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isDescribe)(node) && !(0, _utils.isEachCall)(node)) {
+        if ((0, _utils.isDescribeCall)(node)) {
           numberOfDescribeBlocks--;
         }
       }

package/lib/rules/unbound-method.js

@@ -50,6 +50,8 @@ const tryCreateBaseRule = context => {
   }
 };
 
+const DEFAULT_MESSAGE = 'This rule requires `@typescript-eslint/eslint-plugin`';
+
 var _default = (0, _utils.createRule)({
   defaultOptions: [{
     ignoreStatic: false
@@ -58,7 +60,8 @@ var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
     messages: {
-      unbound: 'This rule requires `@typescript-eslint/eslint-plugin`'
+      unbound: DEFAULT_MESSAGE,
+      unboundWithoutThisAnnotation: DEFAULT_MESSAGE
     },
     schema: [],
     type: 'problem',

package/lib/rules/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getNodeName = getNodeName;
-exports.scopeHasLocalReference = exports.getJestFunctionArguments = exports.isEachCall = 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;
+exports.scopeHasLocalReference = exports.isDescribeCall = exports.isTestCaseCall = 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");
 
@@ -390,48 +390,84 @@ const getTestCallExpressionsFromDeclaredVariables = declaredVariables => {
     references
   }) => acc.concat(references.map(({
     identifier
-  }) => identifier.parent).filter(node => !!node && node.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && isTestCase(node))), []);
+  }) => identifier.parent).filter(node => !!node && node.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && isTestCaseCall(node))), []);
 };
 
 exports.getTestCallExpressionsFromDeclaredVariables = getTestCallExpressionsFromDeclaredVariables;
 
-const isTestCase = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.Identifier && TestCaseName.hasOwnProperty(node.callee.name) || // e.g. it.each``()
-node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression && node.callee.tag.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.tag.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && TestCaseName.hasOwnProperty(node.callee.tag.object.name) && isSupportedAccessor(node.callee.tag.property, TestCaseProperty.each) || // e.g. it.concurrent.{skip,only}
-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));
+const isTestCaseName = node => node.type === _experimentalUtils.AST_NODE_TYPES.Identifier && TestCaseName.hasOwnProperty(node.name);
 
-exports.isTestCase = isTestCase;
-
-const isDescribe = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeAlias.hasOwnProperty(node.callee.name) || node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeAlias.hasOwnProperty(node.callee.object.name) && node.callee.property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeProperty.hasOwnProperty(node.callee.property.name) || node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression && node.callee.tag.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.tag.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeAlias.hasOwnProperty(node.callee.tag.object.name);
+const isTestCaseProperty = node => isSupportedAccessor(node) && TestCaseProperty.hasOwnProperty(getAccessorValue(node));
 /**
- * Checks if the given node` is a call to `<describe|test|it>.each(...)`.
- * If `true`, the code must look like `<method>.each(...)`.
+ * Checks if the given `node` is a *call* to a test case function that would
+ * result in tests being run by `jest`.
+ *
+ * Note that `.each()` does not count as a call in this context, as it will not
+ * result in `jest` running any tests.
  *
- * @param {JestFunctionCallExpression<DescribeAlias | TestCaseName>} node
+ * @param {TSESTree.CallExpression} node
  *
- * @return {node is JestFunctionCallExpressionWithMemberExpressionCallee<DescribeAlias | TestCaseName, DescribeProperty.each | TestCaseProperty.each>}
+ * @return {node is JestFunctionCallExpression<TestCaseName>}
  */
 
 
-exports.isDescribe = isDescribe;
+const isTestCaseCall = node => {
+  if (isTestCaseName(node.callee)) {
+    return true;
+  }
+
+  const callee = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? node.callee.callee : node.callee;
+
+  if (callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && isTestCaseProperty(callee.property)) {
+    // if we're an `each()`, ensure we're the outer CallExpression (i.e `.each()()`)
+    if (getAccessorValue(callee.property) === 'each' && node.callee.type !== _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression && node.callee.type !== _experimentalUtils.AST_NODE_TYPES.CallExpression) {
+      return false;
+    }
+
+    return callee.object.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression ? isTestCaseName(callee.object.object) : isTestCaseName(callee.object);
+  }
+
+  return false;
+};
 
-const isEachCall = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && isSupportedAccessor(node.callee.property, DescribeProperty.each);
+exports.isTestCaseCall = isTestCaseCall;
+
+const isDescribeAlias = node => node.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeAlias.hasOwnProperty(node.name);
+
+const isDescribeProperty = node => isSupportedAccessor(node) && DescribeProperty.hasOwnProperty(getAccessorValue(node));
 /**
- * Gets the arguments of the given `JestFunctionCallExpression`.
+ * Checks if the given `node` is a *call* to a `describe` function that would
+ * result in a `describe` block being created by `jest`.
  *
- * If the `node` is an `each` call, then the arguments of the actual suite
- * are returned, rather then the `each` array argument.
+ * Note that `.each()` does not count as a call in this context, as it will not
+ * result in `jest` creating any `describe` blocks.
  *
- * @param {JestFunctionCallExpression<DescribeAlias | TestCaseName>} node
+ * @param {TSESTree.CallExpression} node
  *
- * @return {Expression[]}
+ * @return {node is JestFunctionCallExpression<TestCaseName>}
  */
 
 
-exports.isEachCall = isEachCall;
+const isDescribeCall = node => {
+  if (isDescribeAlias(node.callee)) {
+    return true;
+  }
 
-const getJestFunctionArguments = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && isSupportedAccessor(node.callee.property, DescribeProperty.each) && node.parent && node.parent.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? node.parent.arguments : node.arguments;
+  const callee = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? node.callee.callee : node.callee;
+
+  if (callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && isDescribeProperty(callee.property)) {
+    // if we're an `each()`, ensure we're the outer CallExpression (i.e `.each()()`)
+    if (getAccessorValue(callee.property) === 'each' && node.callee.type !== _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression && node.callee.type !== _experimentalUtils.AST_NODE_TYPES.CallExpression) {
+      return false;
+    }
+
+    return callee.object.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression ? isDescribeAlias(callee.object.object) : isDescribeAlias(callee.object);
+  }
+
+  return false;
+};
 
-exports.getJestFunctionArguments = getJestFunctionArguments;
+exports.isDescribeCall = isDescribeCall;
 
 const collectReferences = scope => {
   const locals = new Set();

package/lib/rules/valid-describe.js

@@ -41,25 +41,23 @@ var _default = (0, _utils.createRule)({
   create(context) {
     return {
       CallExpression(node) {
-        if (!(0, _utils.isDescribe)(node) || node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression) {
+        if (!(0, _utils.isDescribeCall)(node)) {
           return;
         }
 
-        const nodeArguments = (0, _utils.getJestFunctionArguments)(node);
-
-        if (nodeArguments.length < 1) {
+        if (node.arguments.length < 1) {
           return context.report({
             messageId: 'nameAndCallback',
             loc: node.loc
           });
         }
 
-        const [, callback] = nodeArguments;
+        const [, callback] = node.arguments;
 
         if (!callback) {
           context.report({
             messageId: 'nameAndCallback',
-            loc: paramsLocation(nodeArguments)
+            loc: paramsLocation(node.arguments)
           });
           return;
         }
@@ -67,7 +65,7 @@ var _default = (0, _utils.createRule)({
         if (!(0, _utils.isFunction)(callback)) {
           context.report({
             messageId: 'secondArgumentMustBeFunction',
-            loc: paramsLocation(nodeArguments)
+            loc: paramsLocation(node.arguments)
           });
           return;
         }
@@ -79,7 +77,7 @@ var _default = (0, _utils.createRule)({
           });
         }
 
-        if (!(0, _utils.isEachCall)(node) && callback.params.length) {
+        if (!(0, _utils.getNodeName)(node).endsWith('each') && callback.params.length) {
           context.report({
             messageId: 'unexpectedDescribeArgument',
             loc: paramsLocation(callback.params)

package/lib/rules/valid-expect.js

@@ -46,7 +46,17 @@ const getParentIfThenified = node => {
   return node;
 };
 
-const isAcceptableReturnNode = (node, allowReturn) => allowReturn && node.type === _experimentalUtils.AST_NODE_TYPES.ReturnStatement || [_experimentalUtils.AST_NODE_TYPES.ArrowFunctionExpression, _experimentalUtils.AST_NODE_TYPES.AwaitExpression].includes(node.type);
+const isAcceptableReturnNode = (node, allowReturn) => {
+  if (allowReturn && node.type === _experimentalUtils.AST_NODE_TYPES.ReturnStatement) {
+    return true;
+  }
+
+  if (node.type === _experimentalUtils.AST_NODE_TYPES.ConditionalExpression && node.parent) {
+    return isAcceptableReturnNode(node.parent, allowReturn);
+  }
+
+  return [_experimentalUtils.AST_NODE_TYPES.ArrowFunctionExpression, _experimentalUtils.AST_NODE_TYPES.AwaitExpression].includes(node.type);
+};
 
 const isNoAssertionsParentNode = node => node.type === _experimentalUtils.AST_NODE_TYPES.ExpressionStatement || node.type === _experimentalUtils.AST_NODE_TYPES.AwaitExpression && node.parent !== undefined && node.parent.type === _experimentalUtils.AST_NODE_TYPES.ExpressionStatement;
 

package/lib/rules/valid-title.js

@@ -132,11 +132,11 @@ var _default = (0, _utils.createRule)({
     const mustMatchPatterns = compileMatcherPatterns(mustMatch !== null && mustMatch !== void 0 ? mustMatch : {});
     return {
       CallExpression(node) {
-        if (!(0, _utils.isDescribe)(node) && !(0, _utils.isTestCase)(node)) {
+        if (!(0, _utils.isDescribeCall)(node) && !(0, _utils.isTestCaseCall)(node)) {
           return;
         }
 
-        const [argument] = (0, _utils.getJestFunctionArguments)(node);
+        const [argument] = node.arguments;
 
         if (!argument) {
           return;
@@ -147,7 +147,7 @@ var _default = (0, _utils.createRule)({
             return;
           }
 
-          if (argument.type !== _experimentalUtils.AST_NODE_TYPES.TemplateLiteral && !(ignoreTypeOfDescribeName && (0, _utils.isDescribe)(node))) {
+          if (argument.type !== _experimentalUtils.AST_NODE_TYPES.TemplateLiteral && !(ignoreTypeOfDescribeName && (0, _utils.isDescribeCall)(node))) {
             context.report({
               messageId: 'titleMustBeString',
               loc: argument.loc
@@ -163,7 +163,7 @@ var _default = (0, _utils.createRule)({
           context.report({
             messageId: 'emptyTitle',
             data: {
-              jestFunctionName: (0, _utils.isDescribe)(node) ? _utils.DescribeAlias.describe : _utils.TestCaseName.test
+              jestFunctionName: (0, _utils.isDescribeCall)(node) ? _utils.DescribeAlias.describe : _utils.TestCaseName.test
             },
             node
           });
@@ -193,7 +193,7 @@ var _default = (0, _utils.createRule)({
           });
         }
 
-        const nodeName = trimFXprefix((0, _utils.getNodeName)(node.callee));
+        const nodeName = trimFXprefix((0, _utils.getNodeName)(node));
         const [firstWord] = title.split(' ');
 
         if (firstWord.toLowerCase() === nodeName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "24.3.2",
+  "version": "24.3.6",
   "description": "Eslint rules for Jest",
   "keywords": [
     "eslint",
@@ -108,7 +108,7 @@
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.0.0",
-    "husky": "^5.1.3",
+    "husky": "^6.0.0",
     "is-ci": "^3.0.0",
     "jest": "^26.0.1",
     "jest-runner-eslint": "^0.10.0",