Move hasParentMochaFunctionCall into astUtils

lo1tuma · Jul 16, 2019 · 7d7eed8 · 7d7eed8
1 parent c4928ab
commit 7d7eed8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/lib/rules/no-return-and-callback.js b/lib/rules/no-return-and-callback.js
@@ -2,10 +2,6 @@
 
 const astUtils = require('../util/ast');
 
-function hasParentMochaFunctionCall(functionExpression) {
-    return astUtils.isTestCase(functionExpression.parent) || astUtils.isHookCall(functionExpression.parent);
-}
-
 function reportIfShortArrowFunction(context, node) {
     if (node.body.type !== 'BlockStatement') {
         context.report({
@@ -56,7 +52,7 @@ function reportIfFunctionWithBlock(context, node, doneName) {
 
 module.exports = function (context) {
     function check(node) {
-        if (node.params.length === 0 || !hasParentMochaFunctionCall(node)) {
+        if (node.params.length === 0 || !astUtils.hasParentMochaFunctionCall(node)) {
             return;
         }
 

diff --git a/lib/rules/no-return-from-async.js b/lib/rules/no-return-from-async.js
@@ -2,10 +2,6 @@
 
 const astUtils = require('../util/ast');
 
-function hasParentMochaFunctionCall(functionExpression) {
-    return astUtils.isTestCase(functionExpression.parent) || astUtils.isHookCall(functionExpression.parent);
-}
-
 function reportIfShortArrowFunction(context, node) {
     if (node.body.type !== 'BlockStatement') {
         context.report({
@@ -50,7 +46,7 @@ function reportIfFunctionWithBlock(context, node) {
 
 module.exports = function (context) {
     function check(node) {
-        if (!node.async || !hasParentMochaFunctionCall(node)) {
+        if (!node.async || !astUtils.hasParentMochaFunctionCall(node)) {
             return;
         }
 

diff --git a/lib/util/ast.js b/lib/util/ast.js
@@ -77,6 +77,10 @@ function isStringLiteral(node) {
     return node && node.type === 'Literal' && typeof node.value === 'string';
 }
 
+function hasParentMochaFunctionCall(functionExpression) {
+    return isTestCase(functionExpression.parent) || isHookCall(functionExpression.parent);
+}
+
 const findReturnStatement = R.find(R.propEq('type', 'ReturnStatement'));
 
 module.exports = {
@@ -88,5 +92,6 @@ module.exports = {
     isMochaFunctionCall,
     isHookCall,
     isStringLiteral,
+    hasParentMochaFunctionCall,
     findReturnStatement
 };