eslint-plugin-jest 24.1.2 → 24.1.3

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [24.1.3](https://github.com/jest-community/eslint-plugin-jest/compare/v24.1.2...v24.1.3) (2020-11-12)
+
+
+### Bug Fixes
+
+* revert change causing regressions for test.each ([#713](https://github.com/jest-community/eslint-plugin-jest/issues/713)) ([7c8d75a](https://github.com/jest-community/eslint-plugin-jest/commit/7c8d75a4fcbd2c6ce005cf4f57d676c7c44ce0b2)), closes [#710](https://github.com/jest-community/eslint-plugin-jest/issues/710) [#711](https://github.com/jest-community/eslint-plugin-jest/issues/711)
+
 ## [24.1.2](https://github.com/jest-community/eslint-plugin-jest/compare/v24.1.1...v24.1.2) (2020-11-12)
 
 

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

@@ -60,8 +60,6 @@ var _default = (0, _utils.createRule)({
           describeNestingLevel++;
         }
 
-        const funcNode = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee;
-
         if ((0, _utils.isTestCase)(node) && describeNestingLevel === 0 && !nodeName.includes(testKeyword)) {
           const oppositeTestKeyword = getOppositeTestKeyword(testKeyword);
           context.report({
@@ -71,7 +69,7 @@ var _default = (0, _utils.createRule)({
               testKeyword,
               oppositeTestKeyword
             },
-            fix: buildFixer(funcNode, nodeName, testKeyword)
+            fix: buildFixer(node.callee, nodeName, testKeyword)
           });
         }
 
@@ -84,7 +82,7 @@ var _default = (0, _utils.createRule)({
               testKeywordWithinDescribe,
               oppositeTestKeyword
             },
-            fix: buildFixer(funcNode, nodeName, testKeywordWithinDescribe)
+            fix: buildFixer(node.callee, nodeName, testKeywordWithinDescribe)
           });
         }
       },

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

@@ -50,9 +50,7 @@ var _default = (0, _utils.createRule)({
       },
 
       CallExpression(node) {
-        const functionName = (0, _utils.getNodeName)(node.callee); // prevent duplicate warnings for it.each()()
-
-        if (node.callee.type === 'CallExpression') return;
+        const functionName = (0, _utils.getNodeName)(node.callee);
 
         switch (functionName) {
           case 'describe.skip':
@@ -66,10 +64,6 @@ var _default = (0, _utils.createRule)({
           case 'it.concurrent.skip':
           case 'test.skip':
           case 'test.concurrent.skip':
-          case 'it.skip.each':
-          case 'test.skip.each':
-          case 'xit.each':
-          case 'xtest.each':
             context.report({
               messageId: 'skippedTest',
               node

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

@@ -9,11 +9,7 @@ var _experimentalUtils = require("@typescript-eslint/experimental-utils");
 
 var _utils = require("./utils");
 
-const findCallbackArg = (node, isJestEach) => {
-  if (isJestEach) {
-    return node.arguments[1];
-  }
-
+const findCallbackArg = node => {
   if ((0, _utils.isHook)(node) && node.arguments.length >= 1) {
     return node.arguments[0];
   }
@@ -47,18 +43,13 @@ var _default = (0, _utils.createRule)({
   create(context) {
     return {
       CallExpression(node) {
-        var _getNodeName$endsWith, _getNodeName;
-
-        // done is the second argument for it.each, not the first
-        const isJestEach = (_getNodeName$endsWith = (_getNodeName = (0, _utils.getNodeName)(node.callee)) === null || _getNodeName === void 0 ? void 0 : _getNodeName.endsWith('.each')) !== null && _getNodeName$endsWith !== void 0 ? _getNodeName$endsWith : false;
-        const callback = findCallbackArg(node, isJestEach);
-        const callbackArgIndex = Number(isJestEach);
+        const callback = findCallbackArg(node);
 
-        if (!callback || !(0, _utils.isFunction)(callback) || callback.params.length !== 1 + callbackArgIndex) {
+        if (!callback || !(0, _utils.isFunction)(callback) || callback.params.length !== 1) {
           return;
         }
 
-        const argument = callback.params[callbackArgIndex];
+        const [argument] = callback.params;
 
         if (argument.type !== _experimentalUtils.AST_NODE_TYPES.Identifier) {
           context.report({

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

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _experimentalUtils = require("@typescript-eslint/experimental-utils");
-
 var _utils = require("./utils");
 
 var _default = (0, _utils.createRule)({
@@ -33,7 +31,6 @@ var _default = (0, _utils.createRule)({
         if (!nodeName || !(0, _utils.isDescribe)(node) && !(0, _utils.isTestCase)(node)) return;
         const preferredNodeName = getPreferredNodeName(nodeName);
         if (!preferredNodeName) return;
-        const funcNode = node.callee.type === _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression ? node.callee.tag : node.callee;
         context.report({
           messageId: 'usePreferredName',
           node: node.callee,
@@ -42,7 +39,7 @@ var _default = (0, _utils.createRule)({
           },
 
           fix(fixer) {
-            return [fixer.replaceText(funcNode, preferredNodeName)];
+            return [fixer.replaceText(node.callee, preferredNodeName)];
           }
 
         });
@@ -57,14 +54,13 @@ 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}`;
+    return `${nodeName.slice(1)}.only`;
   }
 
   if (firstChar === 'x') {
-    return `${nodeName.slice(1).replace('.each', '')}.skip${suffix}`;
+    return `${nodeName.slice(1)}.skip`;
   }
 
   return null;

package/lib/rules/utils.js

@@ -363,9 +363,6 @@ function getNodeName(node) {
   }
 
   switch (node.type) {
-    case _experimentalUtils.AST_NODE_TYPES.TaggedTemplateExpression:
-      return getNodeName(node.tag);
-
     case _experimentalUtils.AST_NODE_TYPES.MemberExpression:
       return joinNames(getNodeName(node.object), getNodeName(node.property));
 
@@ -395,9 +392,7 @@ const getTestCallExpressionsFromDeclaredVariables = declaredVariables => {
 
 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 && 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 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "24.1.2",
+  "version": "24.1.3",
   "description": "Eslint rules for Jest",
   "keywords": [
     "eslint",