eslint-plugin-jest 26.4.4 → 26.4.7

package/lib/rules/expect-expect.js

@@ -23,8 +23,8 @@ var _utils2 = require("./utils");
  */
 function matchesAssertFunctionName(nodeName, patterns) {
   return patterns.some(p => new RegExp(`^${p.split('.').map(x => {
-    if (x === '**') return '[a-z\\.]*';
-    return x.replace(/\*/gu, '[a-z]*');
+    if (x === '**') return '[a-z\\d\\.]*';
+    return x.replace(/\*/gu, '[a-z\\d]*');
   }).join('\\.')}(\\.|$)`, 'ui').test(nodeName));
 }
 

package/lib/rules/no-disabled-tests.js

@@ -46,7 +46,7 @@ var _default = (0, _utils.createRule)({
         if (jestFnCall.type === 'test') {
           testDepth++;
 
-          if (node.arguments.length < 2) {
+          if (node.arguments.length < 2 && jestFnCall.members.every(s => (0, _utils.getAccessorValue)(s) !== 'todo')) {
             context.report({
               messageId: 'missingFunction',
               node

package/lib/rules/no-restricted-matchers.js

@@ -30,6 +30,23 @@ var _default = (0, _utils.createRule)({
   defaultOptions: [{}],
 
   create(context, [restrictedChains]) {
+    const reportIfRestricted = (loc, chain) => {
+      if (!(chain in restrictedChains)) {
+        return false;
+      }
+
+      const message = restrictedChains[chain];
+      context.report({
+        messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
+        data: {
+          message,
+          chain
+        },
+        loc
+      });
+      return true;
+    };
+
     return {
       CallExpression(node) {
         if (!(0, _utils.isExpectCall)(node)) {
@@ -41,58 +58,37 @@ var _default = (0, _utils.createRule)({
           modifier
         } = (0, _utils.parseExpectCall)(node);
 
-        if (matcher) {
-          const chain = matcher.name;
-
-          if (chain in restrictedChains) {
-            const message = restrictedChains[chain];
-            context.report({
-              messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
-              data: {
-                message,
-                chain
-              },
-              node: matcher.node.property
-            });
-            return;
-          }
+        if (matcher && reportIfRestricted(matcher.node.property.loc, matcher.name)) {
+          return;
         }
 
         if (modifier) {
-          const chain = modifier.name;
-
-          if (chain in restrictedChains) {
-            const message = restrictedChains[chain];
-            context.report({
-              messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
-              data: {
-                message,
-                chain
-              },
-              node: modifier.node.property
-            });
+          if (reportIfRestricted(modifier.node.property.loc, modifier.name)) {
             return;
           }
+
+          if (modifier.negation) {
+            if (reportIfRestricted(modifier.negation.property.loc, 'not') || reportIfRestricted({
+              start: modifier.node.property.loc.start,
+              end: modifier.negation.property.loc.end
+            }, `${modifier.name}.not`)) {
+              return;
+            }
+          }
         }
 
         if (matcher && modifier) {
-          const chain = `${modifier.name}.${matcher.name}`;
-
-          if (chain in restrictedChains) {
-            const message = restrictedChains[chain];
-            context.report({
-              messageId: message ? 'restrictedChainWithMessage' : 'restrictedChain',
-              data: {
-                message,
-                chain
-              },
-              loc: {
-                start: modifier.node.property.loc.start,
-                end: matcher.node.property.loc.end
-              }
-            });
-            return;
+          let chain = modifier.name;
+
+          if (modifier.negation) {
+            chain += '.not';
           }
+
+          chain += `.${matcher.name}`;
+          reportIfRestricted({
+            start: modifier.node.property.loc.start,
+            end: matcher.node.property.loc.end
+          }, chain);
         }
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "26.4.4",
+  "version": "26.4.7",
   "description": "ESLint rules for Jest",
   "keywords": [
     "eslint",
@@ -92,7 +92,7 @@
     "@semantic-release/changelog": "^6.0.0",
     "@semantic-release/git": "^10.0.0",
     "@types/dedent": "^0.7.0",
-    "@types/jest": "^27.0.0",
+    "@types/jest": "^28.0.0",
     "@types/node": "^16.0.0",
     "@types/prettier": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",