fix(no-unnecessary-act): fix false positives when isStrict option i…

…s set to `false` (#418) * fix: false positives in no-unnecessary-act when isStrict is OFF * refactor: use experimental-utils Co-authored-by: Mario Beltrán Alarcón <belco90@gmail.com>
testing-library · Jul 20, 2021 · e0da981 · e0da981
1 parent 4808bca
commit e0da981
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/lib/rules/no-unnecessary-act.ts b/lib/rules/no-unnecessary-act.ts
@@ -1,10 +1,13 @@
-import { TSESTree } from '@typescript-eslint/experimental-utils';
+import { TSESTree, ASTUtils } from '@typescript-eslint/experimental-utils';
 
 import { createTestingLibraryRule } from '../create-testing-library-rule';
 import {
   getDeepestIdentifierNode,
+  getPropertyIdentifierNode,
   getStatementCallExpression,
   isEmptyFunction,
+  isExpressionStatement,
+  isReturnStatement,
 } from '../node-utils';
 
 export const RULE_NAME = 'no-unnecessary-act';
@@ -52,17 +55,30 @@ export default createTestingLibraryRule<Options, MessageIds>({
     function getStatementIdentifier(statement: TSESTree.Statement) {
       const callExpression = getStatementCallExpression(statement);
 
-      if (!callExpression) {
+      if (
+        !callExpression &&
+        !isExpressionStatement(statement) &&
+        !isReturnStatement(statement)
+      ) {
         return null;
       }
 
-      const identifier = getDeepestIdentifierNode(callExpression);
+      if (callExpression) {
+        return getDeepestIdentifierNode(callExpression);
+      }
 
-      if (!identifier) {
-        return null;
+      if (
+        isExpressionStatement(statement) &&
+        ASTUtils.isAwaitExpression(statement.expression)
+      ) {
+        return getPropertyIdentifierNode(statement.expression.argument);
+      }
+
+      if (isReturnStatement(statement) && statement.argument) {
+        return getPropertyIdentifierNode(statement.argument);
       }
 
-      return identifier;
+      return null;
     }
 
     /**

diff --git a/tests/lib/rules/no-unnecessary-act.test.ts b/tests/lib/rules/no-unnecessary-act.test.ts
@@ -31,6 +31,30 @@ ruleTester.run(RULE_NAME, rule, {
           await stuffThatDoesNotUseRTL();
         });
 
+        await act(async () => {
+          await stuffThatDoesNotUseRTL;
+        });
+
+        await act(() => stuffThatDoesNotUseRTL);
+
+        act(() => stuffThatDoesNotUseRTL);
+
+        act(() => {
+          return stuffThatDoesNotUseRTL
+        });
+
+        act(async function() {
+          await stuffThatDoesNotUseRTL;
+        });
+
+        await act(async function() {
+          await stuffThatDoesNotUseRTL;
+        });
+
+        act(async function() {
+          return stuffThatDoesNotUseRTL;
+        });
+
         act(function() {
           stuffThatDoesNotUseRTL();
           const a = foo();