eslint-plugin-jest 26.5.0 → 26.5.3

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "26.5.0",
+  "version": "26.5.3",
   "description": "ESLint rules for Jest",
   "keywords": [
     "eslint",