eslint-plugin-jest 26.1.1 → 26.5.3

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

@@ -9,16 +9,18 @@ var _utils = require("@typescript-eslint/utils");
 
 var _utils2 = require("./utils");
 
-const findCallbackArg = (node, isJestEach) => {
+const findCallbackArg = (node, isJestEach, context) => {
   if (isJestEach) {
     return node.arguments[1];
   }
 
-  if ((0, _utils2.isHook)(node) && node.arguments.length >= 1) {
+  const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
+
+  if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) === 'hook' && node.arguments.length >= 1) {
     return node.arguments[0];
   }
 
-  if ((0, _utils2.isTestCaseCall)(node) && node.arguments.length >= 2) {
+  if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) === 'test' && node.arguments.length >= 2) {
     return node.arguments[1];
   }
 
@@ -60,7 +62,7 @@ var _default = (0, _utils2.createRule)({
           return;
         }
 
-        const callback = findCallbackArg(node, isJestEach);
+        const callback = findCallbackArg(node, isJestEach, context);
         const callbackArgIndex = Number(isJestEach);
 
         if (!callback || !(0, _utils2.isFunction)(callback) || callback.params.length !== 1 + callbackArgIndex) {

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

@@ -7,13 +7,6 @@ exports.default = void 0;
 
 var _utils = require("./utils");
 
-const newHookContext = () => ({
-  beforeAll: 0,
-  beforeEach: 0,
-  afterAll: 0,
-  afterEach: 0
-});
-
 var _default = (0, _utils.createRule)({
   name: __filename,
   meta: {
@@ -31,31 +24,38 @@ var _default = (0, _utils.createRule)({
   defaultOptions: [],
 
   create(context) {
-    const hookContexts = [newHookContext()];
+    const hookContexts = [{}];
     return {
       CallExpression(node) {
-        if ((0, _utils.isDescribeCall)(node)) {
-          hookContexts.push(newHookContext());
+        var _jestFnCall$name;
+
+        const jestFnCall = (0, _utils.parseJestFnCall)(node, context);
+
+        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) === 'describe') {
+          hookContexts.push({});
+        }
+
+        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'hook') {
+          return;
         }
 
-        if ((0, _utils.isHook)(node)) {
-          const currentLayer = hookContexts[hookContexts.length - 1];
-          currentLayer[node.callee.name] += 1;
+        const currentLayer = hookContexts[hookContexts.length - 1];
+        currentLayer[_jestFnCall$name = jestFnCall.name] || (currentLayer[_jestFnCall$name] = 0);
+        currentLayer[jestFnCall.name] += 1;
 
-          if (currentLayer[node.callee.name] > 1) {
-            context.report({
-              messageId: 'noDuplicateHook',
-              data: {
-                hook: node.callee.name
-              },
-              node
-            });
-          }
+        if (currentLayer[jestFnCall.name] > 1) {
+          context.report({
+            messageId: 'noDuplicateHook',
+            data: {
+              hook: jestFnCall.name
+            },
+            node
+          });
         }
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isDescribeCall)(node)) {
+        if ((0, _utils.isTypeOfJestFnCall)(node, context, ['describe'])) {
           hookContexts.pop();
         }
       }

package/lib/rules/no-export.js

@@ -41,7 +41,7 @@ var _default = (0, _utils2.createRule)({
       },
 
       CallExpression(node) {
-        if ((0, _utils2.isTestCaseCall)(node)) {
+        if ((0, _utils2.isTypeOfJestFnCall)(node, context, ['test'])) {
           hasTestCase = true;
         }
       },

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

@@ -9,24 +9,6 @@ var _utils = require("@typescript-eslint/utils");
 
 var _utils2 = require("./utils");
 
-const findOnlyNode = node => {
-  const callee = node.callee.type === _utils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee.type === _utils.AST_NODE_TYPES.CallExpression ? node.callee.callee : node.callee;
-
-  if (callee.type === _utils.AST_NODE_TYPES.MemberExpression) {
-    if (callee.object.type === _utils.AST_NODE_TYPES.MemberExpression) {
-      if ((0, _utils2.isSupportedAccessor)(callee.object.property, 'only')) {
-        return callee.object.property;
-      }
-    }
-
-    if ((0, _utils2.isSupportedAccessor)(callee.property, 'only')) {
-      return callee.property;
-    }
-  }
-
-  return null;
-};
-
 var _default = (0, _utils2.createRule)({
   name: __filename,
   meta: {
@@ -45,41 +27,56 @@ var _default = (0, _utils2.createRule)({
     hasSuggestions: true
   },
   defaultOptions: [],
-  create: context => ({
-    CallExpression(node) {
-      if (!(0, _utils2.isDescribeCall)(node) && !(0, _utils2.isTestCaseCall)(node)) {
-        return;
-      }
 
-      if ((0, _utils2.getNodeName)(node).startsWith('f')) {
+  create(context) {
+    return {
+      CallExpression(node) {
+        const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
+
+        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'test' && (jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'describe') {
+          return;
+        }
+
+        if (jestFnCall.name.startsWith('f')) {
+          context.report({
+            messageId: 'focusedTest',
+            node,
+            suggest: [{
+              messageId: 'suggestRemoveFocus',
+
+              fix(fixer) {
+                // don't apply the fixer if we're an aliased import
+                if (jestFnCall.head.type === 'import' && jestFnCall.name !== jestFnCall.head.local) {
+                  return null;
+                }
+
+                return fixer.removeRange([node.range[0], node.range[0] + 1]);
+              }
+
+            }]
+          });
+          return;
+        }
+
+        const onlyNode = jestFnCall.members.find(s => (0, _utils2.getAccessorValue)(s) === 'only');
+
+        if (!onlyNode) {
+          return;
+        }
+
         context.report({
           messageId: 'focusedTest',
-          node,
+          node: onlyNode,
           suggest: [{
             messageId: 'suggestRemoveFocus',
-            fix: fixer => fixer.removeRange([node.range[0], node.range[0] + 1])
+            fix: fixer => fixer.removeRange([onlyNode.range[0] - 1, onlyNode.range[1] + Number(onlyNode.type !== _utils.AST_NODE_TYPES.Identifier)])
           }]
         });
-        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 !== _utils.AST_NODE_TYPES.Identifier)])
-        }]
-      });
-    }
-
-  })
 });
 
 exports.default = _default;

package/lib/rules/no-hooks.js

@@ -39,12 +39,14 @@ var _default = (0, _utils.createRule)({
   }]) {
     return {
       CallExpression(node) {
-        if ((0, _utils.isHook)(node) && !allow.includes(node.callee.name)) {
+        const jestFnCall = (0, _utils.parseJestFnCall)(node, context);
+
+        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) === 'hook' && !allow.includes(jestFnCall.name)) {
           context.report({
             node,
             messageId: 'unexpectedHook',
             data: {
-              hookName: node.callee.name
+              hookName: jestFnCall.name
             }
           });
         }

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

@@ -33,15 +33,18 @@ var _default = (0, _utils.createRule)({
     const contexts = [newDescribeContext()];
     return {
       CallExpression(node) {
-        var _getNodeName;
-
         const currentLayer = contexts[contexts.length - 1];
+        const jestFnCall = (0, _utils.parseJestFnCall)(node, context);
+
+        if (!jestFnCall) {
+          return;
+        }
 
-        if ((0, _utils.isDescribeCall)(node)) {
+        if (jestFnCall.type === 'describe') {
           contexts.push(newDescribeContext());
         }
 
-        if ((_getNodeName = (0, _utils.getNodeName)(node.callee)) !== null && _getNodeName !== void 0 && _getNodeName.endsWith('.each')) {
+        if (jestFnCall.members.find(s => (0, _utils.isSupportedAccessor)(s, 'each'))) {
           return;
         }
 
@@ -53,7 +56,7 @@ var _default = (0, _utils.createRule)({
 
         const title = (0, _utils.getStringValue)(argument);
 
-        if ((0, _utils.isTestCaseCall)(node)) {
+        if (jestFnCall.type === 'test') {
           if (currentLayer.testTitles.includes(title)) {
             context.report({
               messageId: 'multipleTestTitle',
@@ -64,7 +67,7 @@ var _default = (0, _utils.createRule)({
           currentLayer.testTitles.push(title);
         }
 
-        if (!(0, _utils.isDescribeCall)(node)) {
+        if (jestFnCall.type !== 'describe') {
           return;
         }
 
@@ -79,7 +82,7 @@ var _default = (0, _utils.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if ((0, _utils.isDescribeCall)(node)) {
+        if ((0, _utils.isTypeOfJestFnCall)(node, context, ['describe'])) {
           contexts.pop();
         }
       }

package/lib/rules/no-if.js

@@ -9,7 +9,7 @@ var _utils = require("@typescript-eslint/utils");
 
 var _utils2 = require("./utils");
 
-const testCaseNames = new Set([...Object.keys(_utils2.TestCaseName), 'it.only', 'it.concurrent.only', 'it.skip', 'it.concurrent.skip', 'test.only', 'test.concurrent.only', 'test.skip', 'test.concurrent.skip', 'fit.concurrent']);
+const testCaseNames = new Set([...Object.keys(_utils2.TestCaseName), 'it.only', 'it.only', 'it.skip', 'it.skip', 'test.only', 'test.only', 'test.skip', 'test.skip', 'fit.concurrent']);
 
 const isTestFunctionExpression = node => node.parent !== undefined && node.parent.type === _utils.AST_NODE_TYPES.CallExpression && testCaseNames.has((0, _utils2.getNodeName)(node.parent.callee));
 
@@ -58,10 +58,12 @@ var _default = (0, _utils2.createRule)({
 
     return {
       CallExpression(node) {
-        if ((0, _utils2.isTestCaseCall)(node)) {
+        const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
+
+        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) === 'test') {
           stack.push(true);
 
-          if ((0, _utils2.getNodeName)(node).endsWith('each')) {
+          if (jestFnCall.members.some(s => (0, _utils2.getAccessorValue)(s) === 'each')) {
             stack.push(true);
           }
         }
@@ -73,7 +75,7 @@ var _default = (0, _utils2.createRule)({
 
       FunctionDeclaration(node) {
         const declaredVariables = context.getDeclaredVariables(node);
-        const testCallExpressions = (0, _utils2.getTestCallExpressionsFromDeclaredVariables)(declaredVariables);
+        const testCallExpressions = (0, _utils2.getTestCallExpressionsFromDeclaredVariables)(declaredVariables, context);
         stack.push(testCallExpressions.length > 0);
       },
 

package/lib/rules/no-restricted-matchers.js

@@ -30,6 +30,23 @@ var _default = (0, _utils.createRule)({
   defaultOptions: [{}],
 
   create(context, [restrictedChains]) {
+    const reportIfRestricted = (loc, chain) => {
+      if (!(chain in restrictedChains)) {
+        return false;
+      }
+
+      const message = restrictedChains[chain];
+      context.report({
+        messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
+        data: {
+          message,
+          chain
+        },
+        loc
+      });
+      return true;
+    };
+
     return {
       CallExpression(node) {
         if (!(0, _utils.isExpectCall)(node)) {
@@ -41,58 +58,37 @@ var _default = (0, _utils.createRule)({
           modifier
         } = (0, _utils.parseExpectCall)(node);
 
-        if (matcher) {
-          const chain = matcher.name;
-
-          if (chain in restrictedChains) {
-            const message = restrictedChains[chain];
-            context.report({
-              messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
-              data: {
-                message,
-                chain
-              },
-              node: matcher.node.property
-            });
-            return;
-          }
+        if (matcher && reportIfRestricted(matcher.node.property.loc, matcher.name)) {
+          return;
         }
 
         if (modifier) {
-          const chain = modifier.name;
-
-          if (chain in restrictedChains) {
-            const message = restrictedChains[chain];
-            context.report({
-              messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
-              data: {
-                message,
-                chain
-              },
-              node: modifier.node.property
-            });
+          if (reportIfRestricted(modifier.node.property.loc, modifier.name)) {
             return;
           }
+
+          if (modifier.negation) {
+            if (reportIfRestricted(modifier.negation.property.loc, 'not') || reportIfRestricted({
+              start: modifier.node.property.loc.start,
+              end: modifier.negation.property.loc.end
+            }, `${modifier.name}.not`)) {
+              return;
+            }
+          }
         }
 
         if (matcher && modifier) {
-          const chain = `${modifier.name}.${matcher.name}`;
-
-          if (chain in restrictedChains) {
-            const message = restrictedChains[chain];
-            context.report({
-              messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
-              data: {
-                message,
-                chain
-              },
-              loc: {
-                start: modifier.node.property.loc.start,
-                end: matcher.node.property.loc.end
-              }
-            });
-            return;
+          let chain = modifier.name;
+
+          if (modifier.negation) {
+            chain += '.not';
           }
+
+          chain += `.${matcher.name}`;
+          reportIfRestricted({
+            start: modifier.node.property.loc.start,
+            end: matcher.node.property.loc.end
+          }, chain);
         }
       }
 

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

@@ -9,7 +9,7 @@ var _utils = require("@typescript-eslint/utils");
 
 var _utils2 = require("./utils");
 
-const getBlockType = statement => {
+const getBlockType = (statement, context) => {
   const func = statement.parent;
   /* istanbul ignore if */
 
@@ -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 === _utils.AST_NODE_TYPES.CallExpression && (0, _utils2.isDescribeCall)(expr)) {
+    if (expr.type === _utils.AST_NODE_TYPES.CallExpression && (0, _utils2.isTypeOfJestFnCall)(expr, context, ['describe'])) {
       return 'describe';
     }
   }
@@ -73,7 +73,7 @@ var _default = (0, _utils2.createRule)({
 
     const isCustomTestBlockFunction = node => additionalTestBlockFunctions.includes((0, _utils2.getNodeName)(node) || '');
 
-    const isTestBlock = node => (0, _utils2.isTestCaseCall)(node) || isCustomTestBlockFunction(node);
+    const isTestBlock = node => (0, _utils2.isTypeOfJestFnCall)(node, context, ['test']) || isCustomTestBlockFunction(node);
 
     return {
       CallExpression(node) {
@@ -108,7 +108,7 @@ var _default = (0, _utils2.createRule)({
       },
 
       BlockStatement(statement) {
-        const blockType = getBlockType(statement);
+        const blockType = getBlockType(statement, context);
 
         if (blockType) {
           callStack.push(blockType);
@@ -116,7 +116,7 @@ var _default = (0, _utils2.createRule)({
       },
 
       'BlockStatement:exit'(statement) {
-        if (callStack[callStack.length - 1] === getBlockType(statement)) {
+        if (callStack[callStack.length - 1] === getBlockType(statement, context)) {
           callStack.pop();
         }
       },

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

@@ -29,10 +29,17 @@ var _default = (0, _utils2.createRule)({
   create(context) {
     return {
       CallExpression(node) {
-        const nodeName = (0, _utils2.getNodeName)(node.callee);
-        if (!nodeName || !(0, _utils2.isDescribeCall)(node) && !(0, _utils2.isTestCaseCall)(node)) return;
-        const preferredNodeName = getPreferredNodeName(nodeName);
-        if (!preferredNodeName) return;
+        const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
+
+        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'describe' && (jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'test') {
+          return;
+        }
+
+        if (jestFnCall.name[0] !== 'f' && jestFnCall.name[0] !== 'x') {
+          return;
+        }
+
+        const preferredNodeName = [jestFnCall.name.slice(1), jestFnCall.name[0] === 'f' ? 'only' : 'skip', ...jestFnCall.members.map(s => (0, _utils2.getAccessorValue)(s))].join('.');
         const funcNode = node.callee.type === _utils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee.type === _utils.AST_NODE_TYPES.CallExpression ? node.callee.callee : node.callee;
         context.report({
           messageId: 'usePreferredName',
@@ -53,19 +60,4 @@ var _default = (0, _utils2.createRule)({
 
 });
 
-exports.default = _default;
-
-function getPreferredNodeName(nodeName) {
-  const firstChar = nodeName.charAt(0);
-  const suffix = nodeName.endsWith('.each') ? '.each' : '';
-
-  if (firstChar === 'f') {
-    return `${nodeName.slice(1).replace('.each', '')}.only${suffix}`;
-  }
-
-  if (firstChar === 'x') {
-    return `${nodeName.slice(1).replace('.each', '')}.skip${suffix}`;
-  }
-
-  return null;
-}
+exports.default = _default;

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

@@ -38,7 +38,10 @@ var _default = (0, _utils2.createRule)({
   create(context) {
     return {
       CallExpression(node) {
-        if (!(0, _utils2.isTestCaseCall)(node)) return;
+        if (!(0, _utils2.isTypeOfJestFnCall)(node, context, ['test'])) {
+          return;
+        }
+
         const body = getBody(node.arguments);
         const returnStmt = body.find(t => t.type === _utils.AST_NODE_TYPES.ReturnStatement);
         if (!returnStmt) return;
@@ -50,7 +53,7 @@ var _default = (0, _utils2.createRule)({
 
       FunctionDeclaration(node) {
         const declaredVariables = context.getDeclaredVariables(node);
-        const testCallExpressions = (0, _utils2.getTestCallExpressionsFromDeclaredVariables)(declaredVariables);
+        const testCallExpressions = (0, _utils2.getTestCallExpressionsFromDeclaredVariables)(declaredVariables, context);
         if (testCallExpressions.length === 0) return;
         const returnStmt = node.body.body.find(t => t.type === _utils.AST_NODE_TYPES.ReturnStatement);
         if (!returnStmt) return;

package/lib/rules/prefer-called-with.js

@@ -33,19 +33,20 @@ var _default = (0, _utils.createRule)({
         const {
           modifier,
           matcher
-        } = (0, _utils.parseExpectCall)(node); // Could check resolves/rejects here but not a likely idiom.
-
-        if (matcher && !modifier) {
-          if (['toBeCalled', 'toHaveBeenCalled'].includes(matcher.name)) {
-            context.report({
-              data: {
-                name: matcher.name
-              },
-              // todo: rename to 'matcherName'
-              messageId: 'preferCalledWith',
-              node: matcher.node.property
-            });
-          }
+        } = (0, _utils.parseExpectCall)(node);
+
+        if (!matcher || (modifier === null || modifier === void 0 ? void 0 : modifier.name) === _utils.ModifierName.not || modifier !== null && modifier !== void 0 && modifier.negation) {
+          return;
+        }
+
+        if (['toBeCalled', 'toHaveBeenCalled'].includes(matcher.name)) {
+          context.report({
+            data: {
+              name: matcher.name
+            },
+            messageId: 'preferCalledWith',
+            node: matcher.node.property
+          });
         }
       }
 

package/lib/rules/prefer-comparison-matcher.js

@@ -108,7 +108,10 @@ var _default = (0, _utils2.createRule)({
           return;
         }
 
-        const preferredMatcher = determineMatcher(comparison.operator, (0, _utils2.followTypeAssertionChain)(matcher.arguments[0]).value === !!modifier);
+        const negation = modifier !== null && modifier !== void 0 && modifier.negation ? {
+          node: modifier.negation
+        } : (modifier === null || modifier === void 0 ? void 0 : modifier.name) === _utils2.ModifierName.not ? modifier : null;
+        const preferredMatcher = determineMatcher(comparison.operator, (0, _utils2.followTypeAssertionChain)(matcher.arguments[0]).value === !!negation);
 
         if (!preferredMatcher) {
           return;
@@ -116,10 +119,12 @@ var _default = (0, _utils2.createRule)({
 
         context.report({
           fix(fixer) {
-            const sourceCode = context.getSourceCode();
+            const sourceCode = context.getSourceCode(); // preserve the existing modifier if it's not a negation
+
+            const modifierText = modifier && (modifier === null || modifier === void 0 ? void 0 : modifier.node) !== (negation === null || negation === void 0 ? void 0 : negation.node) ? `.${modifier.name}` : '';
             return [// replace the comparison argument with the left-hand side of the comparison
             fixer.replaceText(comparison, sourceCode.getText(comparison.left)), // replace the current matcher & modifier with the preferred matcher
-            fixer.replaceTextRange([expectCallEnd, matcher.node.range[1]], `.${preferredMatcher}`), // replace the matcher argument with the right-hand side of the comparison
+            fixer.replaceTextRange([expectCallEnd, matcher.node.range[1]], `${modifierText}.${preferredMatcher}`), // replace the matcher argument with the right-hand side of the comparison
             fixer.replaceText(matcher.arguments[0], sourceCode.getText(comparison.right))];
           },
 
@@ -127,7 +132,7 @@ var _default = (0, _utils2.createRule)({
           data: {
             preferredMatcher
           },
-          node: (modifier || matcher).node.property
+          node: (negation || matcher).node.property
         });
       }
 

package/lib/rules/prefer-equality-matcher.js

@@ -64,16 +64,26 @@ var _default = (0, _utils2.createRule)({
           return;
         }
 
-        const matcherValue = (0, _utils2.followTypeAssertionChain)(matcher.arguments[0]).value; // we need to negate the expectation if the current expected
+        const matcherValue = (0, _utils2.followTypeAssertionChain)(matcher.arguments[0]).value;
+        const negation = modifier !== null && modifier !== void 0 && modifier.negation ? {
+          node: modifier.negation
+        } : (modifier === null || modifier === void 0 ? void 0 : modifier.name) === _utils2.ModifierName.not ? modifier : null; // we need to negate the expectation if the current expected
         // value is itself negated by the "not" modifier
 
-        const addNotModifier = (comparison.operator === '!==' ? !matcherValue : matcherValue) === !!modifier;
+        const addNotModifier = (comparison.operator === '!==' ? !matcherValue : matcherValue) === !!negation;
 
         const buildFixer = equalityMatcher => fixer => {
-          const sourceCode = context.getSourceCode();
+          const sourceCode = context.getSourceCode(); // preserve the existing modifier if it's not a negation
+
+          let modifierText = modifier && (modifier === null || modifier === void 0 ? void 0 : modifier.node) !== (negation === null || negation === void 0 ? void 0 : negation.node) ? `.${modifier.name}` : '';
+
+          if (addNotModifier) {
+            modifierText += `.${_utils2.ModifierName.not}`;
+          }
+
           return [// replace the comparison argument with the left-hand side of the comparison
           fixer.replaceText(comparison, sourceCode.getText(comparison.left)), // replace the current matcher & modifier with the preferred matcher
-          fixer.replaceTextRange([expectCallEnd, matcher.node.range[1]], addNotModifier ? `.${_utils2.ModifierName.not}.${equalityMatcher}` : `.${equalityMatcher}`), // replace the matcher argument with the right-hand side of the comparison
+          fixer.replaceTextRange([expectCallEnd, matcher.node.range[1]], `${modifierText}.${equalityMatcher}`), // replace the matcher argument with the right-hand side of the comparison
           fixer.replaceText(matcher.arguments[0], sourceCode.getText(comparison.right))];
         };
 
@@ -86,7 +96,7 @@ var _default = (0, _utils2.createRule)({
             },
             fix: buildFixer(equalityMatcher)
           })),
-          node: (modifier || matcher).node.property
+          node: (negation || matcher).node.property
         });
       }
 

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

@@ -116,7 +116,7 @@ var _default = (0, _utils2.createRule)({
       'ForOfStatement:exit': exitForLoop,
 
       CallExpression(node) {
-        if ((0, _utils2.isTestCaseCall)(node)) {
+        if ((0, _utils2.isTypeOfJestFnCall)(node, context, ['test'])) {
           inTestCaseCall = true;
           return;
         }
@@ -133,10 +133,12 @@ var _default = (0, _utils2.createRule)({
       },
 
       'CallExpression:exit'(node) {
-        if (!(0, _utils2.isTestCaseCall)(node)) {
+        if (!(0, _utils2.isTypeOfJestFnCall)(node, context, ['test'])) {
           return;
         }
 
+        inTestCaseCall = false;
+
         if (node.arguments.length < 2) {
           return;
         }