refactor: remove unneeded utils

jest-community · Apr 10, 2021 · c0c7bef · c0c7bef
1 parent 6acf878
commit c0c7bef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 37 deletions.
diff --git a/src/rules/utils.ts b/src/rules/utils.ts
@@ -794,39 +794,6 @@ export const isDescribeCall = (
   return false;
 };
 
-/**
- * Checks if the given node` is a call to `<describe|test|it>.each(...)()`.
- * If `true`, the code must look like `<method>.each(...)()`.
- *
- * @param {JestFunctionCallExpression<DescribeAlias | TestCaseName>} node
- *
- * @return {node is JestFunctionCallExpressionWithMemberExpressionCallee<DescribeAlias | TestCaseName, DescribeProperty.each | TestCaseProperty.each> & {parent: TSESTree.CallExpression}}
- */
-export const isEachCall = (
-  node: JestFunctionCallExpression<DescribeAlias | TestCaseName>,
-): node is JestEachCallExpression<DescribeAlias | TestCaseName> =>
-  getNodeName(node).endsWith('each');
-
-/**
- * Gets the arguments of the given `JestFunctionCallExpression`.
- *
- * If the `node` is an `each` call, then the arguments of the actual suite
- * are returned, rather then the `each` array argument.
- *
- * @param {JestFunctionCallExpression<DescribeAlias | TestCaseName>} node
- *
- * @return {Expression[]}
- */
-export const getJestFunctionArguments = (
-  node: JestFunctionCallExpression<DescribeAlias | TestCaseName>,
-) =>
-  node.callee.type === AST_NODE_TYPES.MemberExpression &&
-  isSupportedAccessor(node.callee.property, DescribeProperty.each) &&
-  node.parent &&
-  node.parent.type === AST_NODE_TYPES.CallExpression
-    ? node.parent.arguments
-    : node.arguments;
-
 const collectReferences = (scope: TSESLint.Scope.Scope) => {
   const locals = new Set();
   const unresolved = new Set();

diff --git a/src/rules/valid-describe.ts b/src/rules/valid-describe.ts
@@ -2,7 +2,7 @@ import {
   AST_NODE_TYPES,
   TSESTree,
 } from '@typescript-eslint/experimental-utils';
-import { createRule, isDescribeCall, isEachCall, isFunction } from './utils';
+import { createRule, getNodeName, isDescribeCall, isFunction } from './utils';
 
 const paramsLocation = (
   params: TSESTree.Expression[] | TSESTree.Parameter[],
@@ -77,7 +77,7 @@ export default createRule({
           });
         }
 
-        if (!isEachCall(node) && callback.params.length) {
+        if (!getNodeName(node).endsWith('each') && callback.params.length) {
           context.report({
             messageId: 'unexpectedDescribeArgument',
             loc: paramsLocation(callback.params),

diff --git a/src/rules/valid-title.ts b/src/rules/valid-title.ts
@@ -7,7 +7,6 @@ import {
   StringNode,
   TestCaseName,
   createRule,
-  getJestFunctionArguments,
   getNodeName,
   getStringValue,
   isDescribeCall,
@@ -165,7 +164,7 @@ export default createRule<[Options], MessageIds>({
           return;
         }
 
-        const [argument] = getJestFunctionArguments(node);
+        const [argument] = node.arguments;
 
         if (!argument) {
           return;