diff --git a/lib/rules/no-return-and-callback.js b/lib/rules/no-return-and-callback.js index 79e5a1b..0898fc9 100644 --- a/lib/rules/no-return-and-callback.js +++ b/lib/rules/no-return-and-callback.js @@ -1,10 +1,7 @@ 'use strict'; -const R = require('ramda'); const astUtils = require('../util/ast'); -const findReturnStatement = R.find(R.propEq('type', 'ReturnStatement')); - function hasParentMochaFunctionCall(functionExpression) { return astUtils.isTestCase(functionExpression.parent) || astUtils.isHookCall(functionExpression.parent); } @@ -48,7 +45,7 @@ function isAllowedReturnStatement(node, doneName) { } function reportIfFunctionWithBlock(context, node, doneName) { - const returnStatement = findReturnStatement(node.body.body); + const returnStatement = astUtils.findReturnStatement(node.body.body); if (returnStatement && !isAllowedReturnStatement(returnStatement, doneName)) { context.report({ node: returnStatement, diff --git a/lib/rules/no-return-from-async.js b/lib/rules/no-return-from-async.js index 4bdba0e..31615e0 100644 --- a/lib/rules/no-return-from-async.js +++ b/lib/rules/no-return-from-async.js @@ -1,10 +1,7 @@ 'use strict'; -const R = require('ramda'); const astUtils = require('../util/ast'); -const findReturnStatement = R.find(R.propEq('type', 'ReturnStatement')); - function hasParentMochaFunctionCall(functionExpression) { return astUtils.isTestCase(functionExpression.parent) || astUtils.isHookCall(functionExpression.parent); } @@ -42,7 +39,7 @@ function isAllowedReturnStatement(node) { } function reportIfFunctionWithBlock(context, node) { - const returnStatement = findReturnStatement(node.body.body); + const returnStatement = astUtils.findReturnStatement(node.body.body); if (returnStatement && !isAllowedReturnStatement(returnStatement)) { context.report({ node: returnStatement, diff --git a/lib/util/ast.js b/lib/util/ast.js index 6f9a561..192c2f7 100644 --- a/lib/util/ast.js +++ b/lib/util/ast.js @@ -77,6 +77,8 @@ function isStringLiteral(node) { return node && node.type === 'Literal' && typeof node.value === 'string'; } +const findReturnStatement = R.find(R.propEq('type', 'ReturnStatement')); + module.exports = { isDescribe, isHookIdentifier, @@ -85,5 +87,6 @@ module.exports = { getNodeName, isMochaFunctionCall, isHookCall, - isStringLiteral + isStringLiteral, + findReturnStatement };