eslint-plugin-jest 26.3.0 → 26.4.0

package/lib/rules/valid-expect-in-promise.js

@@ -53,11 +53,13 @@ const findTopMostCallExpression = node => {
 };
 
 const isTestCaseCallWithCallbackArg = (node, scope) => {
-  if (!(0, _utils2.isTestCaseCall)(node, scope)) {
+  const jestCallFn = (0, _utils2.parseJestFnCall)(node, scope);
+
+  if ((jestCallFn === null || jestCallFn === void 0 ? void 0 : jestCallFn.type) !== 'test') {
     return false;
   }
 
-  const isJestEach = (0, _utils2.getNodeName)(node).endsWith('.each');
+  const isJestEach = jestCallFn.members.some(s => (0, _utils2.getAccessorValue)(s) === 'each');
 
   if (isJestEach && node.callee.type !== _utils.AST_NODE_TYPES.TaggedTemplateExpression) {
     // isJestEach but not a TaggedTemplateExpression, so this must be
@@ -67,13 +69,9 @@ const isTestCaseCallWithCallbackArg = (node, scope) => {
     return true;
   }
 
-  if (isJestEach || node.arguments.length >= 2) {
-    const [, callback] = node.arguments;
-    const callbackArgIndex = Number(isJestEach);
-    return callback && (0, _utils2.isFunction)(callback) && callback.params.length === 1 + callbackArgIndex;
-  }
-
-  return false;
+  const [, callback] = node.arguments;
+  const callbackArgIndex = Number(isJestEach);
+  return callback && (0, _utils2.isFunction)(callback) && callback.params.length === 1 + callbackArgIndex;
 };
 
 const isPromiseMethodThatUsesValue = (node, identifier) => {
@@ -262,7 +260,7 @@ const isDirectlyWithinTestCaseCall = (node, scope) => {
       var _parent;
 
       parent = parent.parent;
-      return !!(((_parent = parent) === null || _parent === void 0 ? void 0 : _parent.type) === _utils.AST_NODE_TYPES.CallExpression && (0, _utils2.isTestCaseCall)(parent, scope));
+      return ((_parent = parent) === null || _parent === void 0 ? void 0 : _parent.type) === _utils.AST_NODE_TYPES.CallExpression && (0, _utils2.isTypeOfJestFnCall)(parent, scope, ['test']);
     }
 
     parent = parent.parent;
@@ -336,7 +334,7 @@ var _default = (0, _utils2.createRule)({
         // make promises containing expects safe in a test for us to be able to
         // accurately check, so we just bail out completely if it's present
         if (inTestCaseWithDoneCallback) {
-          if ((0, _utils2.isTestCaseCall)(node, context.getScope())) {
+          if ((0, _utils2.isTypeOfJestFnCall)(node, context.getScope(), ['test'])) {
             inTestCaseWithDoneCallback = false;
           }
 

package/lib/rules/valid-title.js

@@ -131,8 +131,9 @@ var _default = (0, _utils2.createRule)({
         var _mustNotMatchPatterns, _mustMatchPatterns$je;
 
         const scope = context.getScope();
+        const jestFnCall = (0, _utils2.parseJestFnCall)(node, scope);
 
-        if (!(0, _utils2.isDescribeCall)(node, scope) && !(0, _utils2.isTestCaseCall)(node, scope)) {
+        if ((jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'describe' && (jestFnCall === null || jestFnCall === void 0 ? void 0 : jestFnCall.type) !== 'test') {
           return;
         }
 
@@ -147,7 +148,7 @@ var _default = (0, _utils2.createRule)({
             return;
           }
 
-          if (argument.type !== _utils.AST_NODE_TYPES.TemplateLiteral && !(ignoreTypeOfDescribeName && (0, _utils2.isDescribeCall)(node, scope))) {
+          if (argument.type !== _utils.AST_NODE_TYPES.TemplateLiteral && !(ignoreTypeOfDescribeName && jestFnCall.type === 'describe')) {
             context.report({
               messageId: 'titleMustBeString',
               loc: argument.loc
@@ -163,7 +164,7 @@ var _default = (0, _utils2.createRule)({
           context.report({
             messageId: 'emptyTitle',
             data: {
-              jestFunctionName: (0, _utils2.isDescribeCall)(node, scope) ? _utils2.DescribeAlias.describe : _utils2.TestCaseName.test
+              jestFunctionName: jestFnCall.type === 'describe' ? _utils2.DescribeAlias.describe : _utils2.TestCaseName.test
             },
             node
           });
@@ -193,10 +194,10 @@ var _default = (0, _utils2.createRule)({
           });
         }
 
-        const nodeName = trimFXprefix((0, _utils2.getNodeName)(node));
+        const unprefixedName = trimFXprefix(jestFnCall.name);
         const [firstWord] = title.split(' ');
 
-        if (firstWord.toLowerCase() === nodeName) {
+        if (firstWord.toLowerCase() === unprefixedName) {
           context.report({
             messageId: 'duplicatePrefix',
             node: argument,
@@ -204,7 +205,7 @@ var _default = (0, _utils2.createRule)({
           });
         }
 
-        const [jestFunctionName] = nodeName.split('.');
+        const jestFunctionName = unprefixedName;
         const [mustNotMatchPattern, mustNotMatchMessage] = (_mustNotMatchPatterns = mustNotMatchPatterns[jestFunctionName]) !== null && _mustNotMatchPatterns !== void 0 ? _mustNotMatchPatterns : [];
 
         if (mustNotMatchPattern) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "26.3.0",
+  "version": "26.4.0",
   "description": "ESLint rules for Jest",
   "keywords": [
     "eslint",