chore(prefer-strict-equal): use parseExpectCall (#388)

jest-community · Aug 12, 2019 · b39aad5 · b39aad5
1 parent 4ca5889
commit b39aad5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/src/rules/prefer-strict-equal.ts b/src/rules/prefer-strict-equal.ts
@@ -1,4 +1,4 @@
-import { createRule, isExpectCallWithParent } from './tsUtils';
+import { createRule, isExpectCall, parseExpectCall } from './tsUtils';
 
 export default createRule({
   name: __filename,
@@ -12,26 +12,26 @@ export default createRule({
       useToStrictEqual: 'Use toStrictEqual() instead',
     },
     fixable: 'code',
-    schema: [],
     type: 'suggestion',
+    schema: [],
   },
   defaultOptions: [],
   create(context) {
     return {
       CallExpression(node) {
-        if (!isExpectCallWithParent(node)) {
+        if (!isExpectCall(node)) {
           return;
         }
 
-        const methodNode = node.parent.property;
+        const { matcher } = parseExpectCall(node);
 
-        if (methodNode && methodNode.name === 'toEqual') {
+        if (matcher && matcher.name === 'toEqual') {
           context.report({
-            fix(fixer) {
-              return [fixer.replaceText(methodNode, 'toStrictEqual')];
-            },
+            fix: fixer => [
+              fixer.replaceText(matcher.node.property, 'toStrictEqual'),
+            ],
             messageId: 'useToStrictEqual',
-            node: methodNode,
+            node: matcher.node.property,
           });
         }
       },

diff --git a/src/rules/tsUtils.ts b/src/rules/tsUtils.ts
@@ -308,18 +308,6 @@ export const isExpectCall = (node: TSESTree.Node): node is ExpectCall =>
   isSupportedAccessor(node.callee, 'expect') &&
   node.parent !== undefined;
 
-interface JestExpectCallWithParent extends JestExpectCallExpression {
-  parent: JestExpectCallMemberExpression;
-}
-
-export const isExpectCallWithParent = (
-  node: TSESTree.Node,
-): node is JestExpectCallWithParent =>
-  isExpectCall(node) &&
-  node.parent !== undefined &&
-  node.parent.type === AST_NODE_TYPES.MemberExpression &&
-  node.parent.property.type === AST_NODE_TYPES.Identifier;
-
 interface ParsedExpectMember<
   Name extends ExpectPropertyName = ExpectPropertyName,
   Node extends ExpectMember<Name> = ExpectMember<Name>