eslint-plugin-jest 29.2.2 → 29.3.0

package/lib/rules/prefer-expect-assertions.js

@@ -36,7 +36,7 @@ var _default = exports.default = (0, _utils2.createRule)({
     },
     messages: {
       hasAssertionsTakesNoArguments: '`expect.hasAssertions` expects no arguments',
-      assertionsRequiresOneArgument: '`expect.assertions` excepts a single argument of type number',
+      assertionsRequiresOneArgument: '`expect.assertions` expects a single argument of type number',
       assertionsRequiresNumberArgument: 'This argument should be a number',
       haveExpectAssertions: 'Every test should have either `expect.assertions(<number of assertions>)` or `expect.hasAssertions()` as its first expression',
       suggestAddingHasAssertions: 'Add `expect.hasAssertions()`',
@@ -68,6 +68,7 @@ var _default = exports.default = (0, _utils2.createRule)({
   }],
   create(context, [options]) {
     let expressionDepth = 0;
+    let describeDepth = 0;
     let hasExpectInCallback = false;
     let hasExpectInLoop = false;
     let hasExpectAssertionsAsFirstStatement = false;
@@ -122,7 +123,7 @@ var _default = exports.default = (0, _utils2.createRule)({
         return;
       }
       const [arg] = expectFnCall.args;
-      if (arg.type === _utils.AST_NODE_TYPES.Literal && typeof arg.value === 'number' && Number.isInteger(arg.value)) {
+      if (arg.type === _utils.AST_NODE_TYPES.Literal && Number.isInteger(arg.value)) {
         return;
       }
       context.report({
@@ -134,6 +135,14 @@ var _default = exports.default = (0, _utils2.createRule)({
     const exitExpression = () => inTestCaseCall && expressionDepth--;
     const enterForLoop = () => inForLoop = true;
     const exitForLoop = () => inForLoop = false;
+    let inEachHook = false;
+
+    // when set to a non-negative value, all expect calls within describes whose depth
+    // are equal to or higher than this value are covered by an expect.hasAssertions set
+    // up within a beforeEach or afterEach hook
+    //
+    // when the describe depth is lower than the current value, it gets reset to -1
+    let coveredByHookAtDepth = -1;
     return {
       FunctionExpression: enterExpression,
       'FunctionExpression:exit': exitExpression,
@@ -147,12 +156,24 @@ var _default = exports.default = (0, _utils2.createRule)({
       'ForOfStatement:exit': exitForLoop,
       CallExpression(node) {
         const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
+        if (jestFnCall?.type === 'describe') {
+          describeDepth += 1;
+        }
+        if (jestFnCall?.type === 'hook' && jestFnCall.name.endsWith('Each')) {
+          inEachHook = true;
+        }
         if (jestFnCall?.type === 'test') {
           inTestCaseCall = true;
           return;
         }
+        if (jestFnCall?.type === 'expect' && inEachHook && (0, _utils2.getAccessorValue)(jestFnCall.members[0]) === 'hasAssertions') {
+          checkExpectHasAssertions(jestFnCall, node);
+          if (coveredByHookAtDepth < 0) {
+            coveredByHookAtDepth = describeDepth;
+          }
+        }
         if (jestFnCall?.type === 'expect' && inTestCaseCall) {
-          if (expressionDepth === 1 && isFirstStatement(node) && jestFnCall.head.node.parent?.type === _utils.AST_NODE_TYPES.MemberExpression && jestFnCall.members.length === 1 && ['assertions', 'hasAssertions'].includes((0, _utils2.getAccessorValue)(jestFnCall.members[0]))) {
+          if (expressionDepth === 1 && isFirstStatement(node) && ['assertions', 'hasAssertions'].includes((0, _utils2.getAccessorValue)(jestFnCall.members[0]))) {
             checkExpectHasAssertions(jestFnCall, node);
             hasExpectAssertionsAsFirstStatement = true;
           }
@@ -165,7 +186,20 @@ var _default = exports.default = (0, _utils2.createRule)({
         }
       },
       'CallExpression:exit'(node) {
-        if (!(0, _utils2.isTypeOfJestFnCall)(node, context, ['test'])) {
+        const jestFnCall = (0, _utils2.parseJestFnCall)(node, context);
+        if (jestFnCall?.type === 'describe') {
+          describeDepth -= 1;
+
+          // clear the "covered by each hook" flag if we have left the describe
+          // depth that it applies to
+          if (coveredByHookAtDepth > describeDepth) {
+            coveredByHookAtDepth = -1;
+          }
+        }
+        if (jestFnCall?.type === 'hook' && jestFnCall.name.endsWith('Each')) {
+          inEachHook = false;
+        }
+        if (jestFnCall?.type !== 'test') {
           return;
         }
         inTestCaseCall = false;
@@ -182,6 +216,9 @@ var _default = exports.default = (0, _utils2.createRule)({
           hasExpectAssertionsAsFirstStatement = false;
           return;
         }
+        if (coveredByHookAtDepth >= 0 && coveredByHookAtDepth <= describeDepth) {
+          return;
+        }
         const suggestions = [];
         if (testFn.body.type === _utils.AST_NODE_TYPES.BlockStatement) {
           suggestions.push(['suggestAddingHasAssertions', 'expect.hasAssertions();'], ['suggestAddingAssertions', 'expect.assertions();']);

package/package.json

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