eslint-plugin-jest 23.0.2 → 23.0.3

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [23.0.3](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.2...v23.0.3) (2019-11-08)
+
+### Bug Fixes
+
+- **no-test-callback:** don't provide fix for `async` functions
+  ([#469](https://github.com/jest-community/eslint-plugin-jest/issues/469))
+  ([09111e0](https://github.com/jest-community/eslint-plugin-jest/commit/09111e0c951aaa930c9a2c8e0ca84251b3196e94)),
+  closes [#466](https://github.com/jest-community/eslint-plugin-jest/issues/466)
+
 ## [23.0.2](https://github.com/jest-community/eslint-plugin-jest/compare/v23.0.1...v23.0.2) (2019-10-28)
 
 ### Bug Fixes

package/lib/rules/no-test-callback.js

@@ -16,7 +16,8 @@ var _default = (0, _utils.createRule)({
       recommended: false
     },
     messages: {
-      illegalTestCallback: 'Illegal usage of test callback'
+      illegalTestCallback: 'Illegal usage of test callback',
+      useAwaitInsteadOfCallback: 'Use await instead of callback in async functions'
     },
     fixable: 'code',
     schema: [],
@@ -38,6 +39,15 @@ var _default = (0, _utils.createRule)({
         }
 
         const [argument] = callback.params;
+
+        if (callback.async) {
+          context.report({
+            node: argument,
+            messageId: 'useAwaitInsteadOfCallback'
+          });
+          return;
+        }
+
         context.report({
           node: argument,
           messageId: 'illegalTestCallback',
@@ -81,7 +91,7 @@ var _default = (0, _utils.createRule)({
             let replaceBefore = true;
 
             if (body.type === 'BlockStatement') {
-              const keyword = callback.async ? 'await' : 'return';
+              const keyword = 'return';
               beforeReplacement = `${keyword} ${beforeReplacement}{`;
               afterReplacement += '}';
               replaceBefore = false;

package/lib/rules/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getNodeName = getNodeName;
-exports.scopeHasLocalReference = exports.getJestFunctionArguments = exports.isDescribe = exports.isTestCase = exports.isHook = exports.isFunction = exports.TestCaseProperty = exports.DescribeProperty = exports.HookName = exports.TestCaseName = exports.DescribeAlias = exports.parseExpectCall = exports.isParsedEqualityMatcherCall = exports.EqualityMatcher = exports.ModifierName = exports.isExpectMember = exports.isExpectCall = exports.getAccessorValue = exports.isSupportedAccessor = exports.hasOnlyOneArgument = exports.getStringValue = exports.isStringNode = exports.followTypeAssertionChain = exports.createRule = void 0;
+exports.scopeHasLocalReference = exports.getJestFunctionArguments = exports.isDescribeEach = exports.isDescribe = exports.isTestCase = exports.isHook = exports.isFunction = exports.TestCaseProperty = exports.DescribeProperty = exports.HookName = exports.TestCaseName = exports.DescribeAlias = exports.parseExpectCall = exports.isParsedEqualityMatcherCall = exports.EqualityMatcher = exports.ModifierName = exports.isExpectMember = exports.isExpectCall = exports.getAccessorValue = exports.isSupportedAccessor = exports.hasOnlyOneArgument = exports.getStringValue = exports.isStringNode = exports.followTypeAssertionChain = exports.createRule = void 0;
 
 var _path = require("path");
 
@@ -401,6 +401,17 @@ exports.isTestCase = isTestCase;
 const isDescribe = node => {
   return node.callee.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeAlias.hasOwnProperty(node.callee.name) || node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && node.callee.object.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeAlias.hasOwnProperty(node.callee.object.name) && node.callee.property.type === _experimentalUtils.AST_NODE_TYPES.Identifier && DescribeProperty.hasOwnProperty(node.callee.property.name);
 };
+/**
+ * Checks if the given `describe` is a call to `describe.each`.
+ *
+ * @param {JestFunctionCallExpression<DescribeAlias>} node
+ * @return {node is JestFunctionCallExpression<DescribeAlias, DescribeProperty.each>}
+ */
+
+
+exports.isDescribe = isDescribe;
+
+const isDescribeEach = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && isSupportedAccessor(node.callee.property, DescribeProperty.each);
 /**
  * Gets the arguments of the given `JestFunctionCallExpression`.
  *
@@ -413,7 +424,7 @@ const isDescribe = node => {
  */
 
 
-exports.isDescribe = isDescribe;
+exports.isDescribeEach = isDescribeEach;
 
 const getJestFunctionArguments = node => node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && isSupportedAccessor(node.callee.property, DescribeProperty.each) && node.parent && node.parent.type === _experimentalUtils.AST_NODE_TYPES.CallExpression ? node.parent.arguments : node.arguments;
 

package/lib/rules/valid-describe.js

@@ -79,7 +79,7 @@ var _default = (0, _utils.createRule)({
           });
         }
 
-        if (callback.params.length) {
+        if (!(0, _utils.isDescribeEach)(node) && callback.params.length) {
           context.report({
             messageId: 'unexpectedDescribeArgument',
             loc: paramsLocation(callback.params)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "23.0.2",
+  "version": "23.0.3",
   "description": "Eslint rules for Jest",
   "repository": "jest-community/eslint-plugin-jest",
   "license": "MIT",