Check scope references as late as possible

lo1tuma · May 26, 2021 · 05e1275 · 05e1275
1 parent b5b97b3
commit 05e1275
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/lib/rules/no-mocha-arrows.js b/lib/rules/no-mocha-arrows.js
@@ -91,7 +91,7 @@ module.exports = {
 
         return {
             CallExpression(node) {
-                if (isMochaFunctionCall(node, context.getScope())) {
+                if (isMochaFunctionCall(node, context)) {
                     const amountOfArguments = node.arguments.length;
 
                     if (amountOfArguments > 0) {

diff --git a/lib/rules/no-nested-tests.js b/lib/rules/no-nested-tests.js
@@ -30,13 +30,20 @@ module.exports = {
             return isNested && isTest;
         }
 
-        function checkForAndReportErrors(node, isTestCase, isDescribe, isHookCall) {
+        function checkForAndReportErrors(
+            node,
+            isTestCase,
+            isDescribe,
+            isHookCall
+        ) {
             if (isNestedTest(isTestCase, isDescribe, testNestingLevel)) {
                 const message = isDescribe ?
                     'Unexpected suite nested within a test.' :
                     'Unexpected test nested within another test.';
                 report(node, message);
-            } else if (isNestedTest(isTestCase, isHookCall, hookCallNestingLevel)) {
+            } else if (
+                isNestedTest(isTestCase, isHookCall, hookCallNestingLevel)
+            ) {
                 const message = isHookCall ?
                     'Unexpected test hook nested within a test hook.' :
                     'Unexpected test nested within a test hook.';
@@ -50,7 +57,12 @@ module.exports = {
                 const isHookCall = astUtils.isHookCall(node);
                 const isDescribe = astUtils.isDescribe(node);
 
-                checkForAndReportErrors(node, isTestCase, isDescribe, isHookCall);
+                checkForAndReportErrors(
+                    node,
+                    isTestCase,
+                    isDescribe,
+                    isHookCall
+                );
 
                 if (isTestCase) {
                     testNestingLevel += 1;

diff --git a/lib/util/ast.js b/lib/util/ast.js
@@ -108,12 +108,20 @@ function createAstUtils(settings) {
     }
 
     function buildIsMochaFunctionCallAnswerer(_isTestCase, _isDescribe) {
-        return (node, scope) => {
-            if (isCallToShadowedReference(node, scope)) {
-                return false;
+        function _isMochaFunctionCall(node) {
+            return _isTestCase(node) || _isDescribe(node) || isHookCall(node);
+        }
+
+        return (node, context) => {
+            if (_isMochaFunctionCall(node)) {
+                const scope = context.getScope();
+
+                if (!isCallToShadowedReference(node, scope)) {
+                    return true;
+                }
             }
 
-            return _isTestCase(node) || _isDescribe(node) || isHookCall(node);
+            return false;
         };
     }