Merge pull request #196 from lo1tuma/gh-172

Fix no-setup-in-describe to correctly detect describe calls
lo1tuma · Jul 8, 2019 · 8ad04fc · 8ad04fc
2 parents dd43791 + 88a3598
commit 8ad04fc
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/lib/rules/no-setup-in-describe.js b/lib/rules/no-setup-in-describe.js
@@ -49,14 +49,17 @@ module.exports = function noSetupInDescribe(context) {
         }
     }
 
+    function isDescribe(node) {
+        return astUtils.isDescribe(node, additionalSuiteNames(settings));
+    }
+
     function isParentDescribe(node) {
-        return astUtils.isDescribe(node.parent, additionalSuiteNames(settings));
+        return isDescribe(node.parent);
     }
 
     return {
         CallExpression(node) {
-            const isDescribe = astUtils.isDescribe(node, additionalSuiteNames(settings));
-            if (isDescribe) {
+            if (isDescribe(node)) {
                 nesting.push(DESCRIBE);
                 return;
             }
@@ -68,7 +71,7 @@ module.exports = function noSetupInDescribe(context) {
         },
 
         'CallExpression:exit'(node) {
-            if (astUtils.isDescribe(node) || nesting.length && isPureNode(node)) {
+            if (isDescribe(node) || nesting.length && isPureNode(node)) {
                 nesting.pop();
             }
         },

diff --git a/lib/util/ast.js b/lib/util/ast.js
@@ -28,7 +28,7 @@ function getNodeName(node) {
     return node.name;
 }
 
-function isDescribe(node, additionalSuiteNames) {
+function isDescribe(node, additionalSuiteNames = []) {
     return isCallExpression(node) &&
       describeAliases.concat(additionalSuiteNames).indexOf(getNodeName(node.callee)) > -1;
 }

diff --git a/test/rules/no-setup-in-describe.js b/test/rules/no-setup-in-describe.js
@@ -52,6 +52,16 @@ ruleTester.run('no-setup-in-describe', rule, {
                     additionalSuiteNames: [ 'foo' ]
                 }
             }
+        },
+        {
+            code: `describe('', () => {
+              it('', () =>{
+                  foo()();
+                  foo()();
+                  bar();
+              });
+            });`,
+            parserOptions: { ecmaVersion: 2015 }
         }
     ],