eslint-plugin-jest 25.5.0 → 26.1.0-next.1

package/lib/rules/valid-expect.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _experimentalUtils = require("@typescript-eslint/experimental-utils");
+var _utils = require("@typescript-eslint/utils");
 
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 
 /*
  * This implementation is ported from from eslint-plugin-jasmine.
@@ -22,11 +22,11 @@ var _utils = require("./utils");
  * @Returns CallExpressionNode
  */
 const getPromiseCallExpressionNode = node => {
-  if (node.type === _experimentalUtils.AST_NODE_TYPES.ArrayExpression && node.parent && node.parent.type === _experimentalUtils.AST_NODE_TYPES.CallExpression) {
+  if (node.type === _utils.AST_NODE_TYPES.ArrayExpression && node.parent && node.parent.type === _utils.AST_NODE_TYPES.CallExpression) {
     node = node.parent;
   }
 
-  if (node.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && node.callee.type === _experimentalUtils.AST_NODE_TYPES.MemberExpression && (0, _utils.isSupportedAccessor)(node.callee.object) && (0, _utils.getAccessorValue)(node.callee.object) === 'Promise' && node.parent) {
+  if (node.type === _utils.AST_NODE_TYPES.CallExpression && node.callee.type === _utils.AST_NODE_TYPES.MemberExpression && (0, _utils2.isSupportedAccessor)(node.callee.object) && (0, _utils2.getAccessorValue)(node.callee.object) === 'Promise' && node.parent) {
     return node;
   }
 
@@ -36,7 +36,7 @@ const getPromiseCallExpressionNode = node => {
 const findPromiseCallExpressionNode = node => {
   var _node$parent;
 
-  return (_node$parent = node.parent) !== null && _node$parent !== void 0 && _node$parent.parent && [_experimentalUtils.AST_NODE_TYPES.CallExpression, _experimentalUtils.AST_NODE_TYPES.ArrayExpression].includes(node.parent.type) ? getPromiseCallExpressionNode(node.parent) : null;
+  return (_node$parent = node.parent) !== null && _node$parent !== void 0 && _node$parent.parent && [_utils.AST_NODE_TYPES.CallExpression, _utils.AST_NODE_TYPES.ArrayExpression].includes(node.parent.type) ? getPromiseCallExpressionNode(node.parent) : null;
 };
 
 const getParentIfThenified = node => {
@@ -44,7 +44,7 @@ const getParentIfThenified = node => {
 
   const grandParentNode = (_node$parent2 = node.parent) === null || _node$parent2 === void 0 ? void 0 : _node$parent2.parent;
 
-  if (grandParentNode && grandParentNode.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && (0, _utils.isExpectMember)(grandParentNode.callee) && ['then', 'catch'].includes((0, _utils.getAccessorValue)(grandParentNode.callee.property)) && grandParentNode.parent) {
+  if (grandParentNode && grandParentNode.type === _utils.AST_NODE_TYPES.CallExpression && (0, _utils2.isExpectMember)(grandParentNode.callee) && ['then', 'catch'].includes((0, _utils2.getAccessorValue)(grandParentNode.callee.property)) && grandParentNode.parent) {
     // Just in case `then`s are chained look one above.
     return getParentIfThenified(grandParentNode);
   }
@@ -53,25 +53,27 @@ const getParentIfThenified = node => {
 };
 
 const isAcceptableReturnNode = (node, allowReturn) => {
-  if (allowReturn && node.type === _experimentalUtils.AST_NODE_TYPES.ReturnStatement) {
+  if (allowReturn && node.type === _utils.AST_NODE_TYPES.ReturnStatement) {
     return true;
   }
 
-  if (node.type === _experimentalUtils.AST_NODE_TYPES.ConditionalExpression && node.parent) {
+  if (node.type === _utils.AST_NODE_TYPES.ConditionalExpression && node.parent) {
     return isAcceptableReturnNode(node.parent, allowReturn);
   }
 
-  return [_experimentalUtils.AST_NODE_TYPES.ArrowFunctionExpression, _experimentalUtils.AST_NODE_TYPES.AwaitExpression].includes(node.type);
+  return [_utils.AST_NODE_TYPES.ArrowFunctionExpression, _utils.AST_NODE_TYPES.AwaitExpression].includes(node.type);
 };
 
-const isNoAssertionsParentNode = node => node.type === _experimentalUtils.AST_NODE_TYPES.ExpressionStatement || node.type === _experimentalUtils.AST_NODE_TYPES.AwaitExpression && node.parent !== undefined && node.parent.type === _experimentalUtils.AST_NODE_TYPES.ExpressionStatement;
+const isNoAssertionsParentNode = node => node.type === _utils.AST_NODE_TYPES.ExpressionStatement || node.type === _utils.AST_NODE_TYPES.AwaitExpression && node.parent !== undefined && node.parent.type === _utils.AST_NODE_TYPES.ExpressionStatement;
 
 const promiseArrayExceptionKey = ({
   start,
   end
 }) => `${start.line}:${start.column}-${end.line}:${end.column}`;
 
-var _default = (0, _utils.createRule)({
+const defaultAsyncMatchers = ['toReject', 'toResolve'];
+
+var _default = (0, _utils2.createRule)({
   name: __filename,
   meta: {
     docs: {
@@ -96,6 +98,12 @@ var _default = (0, _utils.createRule)({
           type: 'boolean',
           default: false
         },
+        asyncMatchers: {
+          type: 'array',
+          items: {
+            type: 'string'
+          }
+        },
         minArgs: {
           type: 'number',
           minimum: 1
@@ -110,12 +118,14 @@ var _default = (0, _utils.createRule)({
   },
   defaultOptions: [{
     alwaysAwait: false,
+    asyncMatchers: defaultAsyncMatchers,
     minArgs: 1,
     maxArgs: 1
   }],
 
   create(context, [{
     alwaysAwait,
+    asyncMatchers = defaultAsyncMatchers,
     minArgs = 1,
     maxArgs = 1
   }]) {
@@ -136,7 +146,7 @@ var _default = (0, _utils.createRule)({
 
     return {
       CallExpression(node) {
-        if (!(0, _utils.isExpectCall)(node)) {
+        if (!(0, _utils2.isExpectCall)(node)) {
           return;
         }
 
@@ -144,10 +154,10 @@ var _default = (0, _utils.createRule)({
           expect,
           modifier,
           matcher
-        } = (0, _utils.parseExpectCall)(node);
+        } = (0, _utils2.parseExpectCall)(node);
 
         if (expect.arguments.length < minArgs) {
-          const expectLength = (0, _utils.getAccessorValue)(expect.callee).length;
+          const expectLength = (0, _utils2.getAccessorValue)(expect.callee).length;
           const loc = {
             start: {
               column: node.loc.start.column + expectLength,
@@ -206,7 +216,7 @@ var _default = (0, _utils.createRule)({
           return;
         }
 
-        if ((0, _utils.isExpectMember)(matcher.node.parent)) {
+        if ((0, _utils2.isExpectMember)(matcher.node.parent)) {
           context.report({
             messageId: 'modifierUnknown',
             data: {
@@ -225,8 +235,9 @@ var _default = (0, _utils.createRule)({
         }
 
         const parentNode = matcher.node.parent;
+        const shouldBeAwaited = modifier && modifier.name !== _utils2.ModifierName.not || asyncMatchers.includes(matcher.name);
 
-        if (!parentNode.parent || !modifier || modifier.name === _utils.ModifierName.not) {
+        if (!parentNode.parent || !shouldBeAwaited) {
           return;
         }
         /**
@@ -235,7 +246,7 @@ var _default = (0, _utils.createRule)({
          */
 
 
-        const isParentArrayExpression = parentNode.parent.type === _experimentalUtils.AST_NODE_TYPES.ArrayExpression;
+        const isParentArrayExpression = parentNode.parent.type === _utils.AST_NODE_TYPES.ArrayExpression;
         const orReturned = alwaysAwait ? '' : ' or returned';
         /**
          * An async assertion can be chained with `then` or `catch` statements.
@@ -266,7 +277,7 @@ var _default = (0, _utils.createRule)({
 
       // nothing called on "expect()"
       'CallExpression:exit'(node) {
-        if ((0, _utils.isExpectCall)(node) && isNoAssertionsParentNode(node.parent)) {
+        if ((0, _utils2.isExpectCall)(node) && isNoAssertionsParentNode(node.parent)) {
           context.report({
             messageId: 'matcherNotFound',
             node

package/lib/rules/valid-title.js

@@ -5,25 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _experimentalUtils = require("@typescript-eslint/experimental-utils");
+var _utils = require("@typescript-eslint/utils");
 
-var _utils = require("./utils");
+var _utils2 = require("./utils");
 
 const trimFXprefix = word => ['f', 'x'].includes(word.charAt(0)) ? word.substr(1) : word;
 
 const doesBinaryExpressionContainStringNode = binaryExp => {
-  if ((0, _utils.isStringNode)(binaryExp.right)) {
+  if ((0, _utils2.isStringNode)(binaryExp.right)) {
     return true;
   }
 
-  if (binaryExp.left.type === _experimentalUtils.AST_NODE_TYPES.BinaryExpression) {
+  if (binaryExp.left.type === _utils.AST_NODE_TYPES.BinaryExpression) {
     return doesBinaryExpressionContainStringNode(binaryExp.left);
   }
 
-  return (0, _utils.isStringNode)(binaryExp.left);
+  return (0, _utils2.isStringNode)(binaryExp.left);
 };
 
-const quoteStringValue = node => node.type === _experimentalUtils.AST_NODE_TYPES.TemplateLiteral ? `\`${node.quasis[0].value.raw}\`` : node.raw;
+const quoteStringValue = node => node.type === _utils.AST_NODE_TYPES.TemplateLiteral ? `\`${node.quasis[0].value.raw}\`` : node.raw;
 
 const compileMatcherPattern = matcherMaybeWithMessage => {
   const [matcher, message] = Array.isArray(matcherMaybeWithMessage) ? matcherMaybeWithMessage : [matcherMaybeWithMessage];
@@ -57,7 +57,7 @@ const MatcherAndMessageSchema = {
   additionalItems: false
 };
 
-var _default = (0, _utils.createRule)({
+var _default = (0, _utils2.createRule)({
   name: __filename,
   meta: {
     docs: {
@@ -130,7 +130,7 @@ var _default = (0, _utils.createRule)({
       CallExpression(node) {
         var _mustNotMatchPatterns, _mustMatchPatterns$je;
 
-        if (!(0, _utils.isDescribeCall)(node) && !(0, _utils.isTestCaseCall)(node)) {
+        if (!(0, _utils2.isDescribeCall)(node) && !(0, _utils2.isTestCaseCall)(node)) {
           return;
         }
 
@@ -140,12 +140,12 @@ var _default = (0, _utils.createRule)({
           return;
         }
 
-        if (!(0, _utils.isStringNode)(argument)) {
-          if (argument.type === _experimentalUtils.AST_NODE_TYPES.BinaryExpression && doesBinaryExpressionContainStringNode(argument)) {
+        if (!(0, _utils2.isStringNode)(argument)) {
+          if (argument.type === _utils.AST_NODE_TYPES.BinaryExpression && doesBinaryExpressionContainStringNode(argument)) {
             return;
           }
 
-          if (argument.type !== _experimentalUtils.AST_NODE_TYPES.TemplateLiteral && !(ignoreTypeOfDescribeName && (0, _utils.isDescribeCall)(node))) {
+          if (argument.type !== _utils.AST_NODE_TYPES.TemplateLiteral && !(ignoreTypeOfDescribeName && (0, _utils2.isDescribeCall)(node))) {
             context.report({
               messageId: 'titleMustBeString',
               loc: argument.loc
@@ -155,13 +155,13 @@ var _default = (0, _utils.createRule)({
           return;
         }
 
-        const title = (0, _utils.getStringValue)(argument);
+        const title = (0, _utils2.getStringValue)(argument);
 
         if (!title) {
           context.report({
             messageId: 'emptyTitle',
             data: {
-              jestFunctionName: (0, _utils.isDescribeCall)(node) ? _utils.DescribeAlias.describe : _utils.TestCaseName.test
+              jestFunctionName: (0, _utils2.isDescribeCall)(node) ? _utils2.DescribeAlias.describe : _utils2.TestCaseName.test
             },
             node
           });
@@ -191,7 +191,7 @@ var _default = (0, _utils.createRule)({
           });
         }
 
-        const nodeName = trimFXprefix((0, _utils.getNodeName)(node));
+        const nodeName = trimFXprefix((0, _utils2.getNodeName)(node));
         const [firstWord] = title.split(' ');
 
         if (firstWord.toLowerCase() === nodeName) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "25.5.0",
-  "description": "Eslint rules for Jest",
+  "version": "26.1.0-next.1",
+  "description": "ESLint rules for Jest",
   "keywords": [
     "eslint",
     "eslintplugin",
@@ -82,7 +82,7 @@
     ]
   },
   "dependencies": {
-    "@typescript-eslint/experimental-utils": "^5.0.0"
+    "@typescript-eslint/utils": "^5.10.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
@@ -112,7 +112,7 @@
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.4.1",
     "eslint-remote-tester": "^2.1.0",
-    "eslint-remote-tester-repositories": "^0.0.3",
+    "eslint-remote-tester-repositories": "^0.0.4",
     "husky": "^7.0.2",
     "is-ci": "^3.0.0",
     "jest": "^27.0.0",
@@ -121,13 +121,13 @@
     "pinst": "^2.0.0",
     "prettier": "^2.0.5",
     "rimraf": "^3.0.0",
-    "semantic-release": "^18.0.0",
+    "semantic-release": "^19.0.0",
     "semver": "^7.3.5",
     "ts-node": "^10.2.1",
     "typescript": "^4.4.0"
   },
   "peerDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.0.0 || ^5.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.0.0",
     "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "peerDependenciesMeta": {
@@ -159,7 +159,9 @@
     ]
   },
   "resolutions": {
-    "@typescript-eslint/experimental-utils": "^5.0.0"
+    "@semantic-release/npm/npm": "7.20.6",
+    "@typescript-eslint/experimental-utils": "^5.0.0",
+    "fsevents/node-gyp": "^7.0.0"
   },
   "packageManager": "yarn@3.1.1"
 }