eslint-plugin-jest 25.0.5 → 25.0.6

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [25.0.6](https://github.com/jest-community/eslint-plugin-jest/compare/v25.0.5...v25.0.6) (2021-10-14)
+
+
+### Bug Fixes
+
+* **valid-expect-in-promise:** allow `expect.resolve` & `expect.reject` ([#948](https://github.com/jest-community/eslint-plugin-jest/issues/948)) ([71b7e17](https://github.com/jest-community/eslint-plugin-jest/commit/71b7e17953b4310a4f2845adc951c68cf062cdc1)), closes [#947](https://github.com/jest-community/eslint-plugin-jest/issues/947)
+* **valid-expect-in-promise:** support `await` in arrays ([#949](https://github.com/jest-community/eslint-plugin-jest/issues/949)) ([a62130c](https://github.com/jest-community/eslint-plugin-jest/commit/a62130c28d01dea065cc6900a062180de2079876))
+
 ## [25.0.5](https://github.com/jest-community/eslint-plugin-jest/compare/v25.0.4...v25.0.5) (2021-10-11)
 
 

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

@@ -103,6 +103,25 @@ const isPromiseMethodThatUsesValue = (node, identifier) => {
 
   return (0, _utils.isIdentifier)(node.argument, name);
 };
+/**
+ * Attempts to determine if the runtime value represented by the given `identifier`
+ * is `await`ed within the given array of elements
+ */
+
+
+const isValueAwaitedInElements = (name, elements) => {
+  for (const element of elements) {
+    if (element.type === _experimentalUtils.AST_NODE_TYPES.AwaitExpression && (0, _utils.isIdentifier)(element.argument, name)) {
+      return true;
+    }
+
+    if (element.type === _experimentalUtils.AST_NODE_TYPES.ArrayExpression && isValueAwaitedInElements(name, element.elements)) {
+      return true;
+    }
+  }
+
+  return false;
+};
 /**
  * Attempts to determine if the runtime value represented by the given `identifier`
  * is `await`ed as an argument along the given call expression
@@ -114,10 +133,8 @@ const isValueAwaitedInArguments = (name, call) => {
 
   while (node) {
     if (node.type === _experimentalUtils.AST_NODE_TYPES.CallExpression) {
-      for (const argument of node.arguments) {
-        if (argument.type === _experimentalUtils.AST_NODE_TYPES.AwaitExpression && (0, _utils.isIdentifier)(argument.argument, name)) {
-          return true;
-        }
+      if (isValueAwaitedInElements(name, node.arguments)) {
+        return true;
       }
 
       node = node.callee;
@@ -132,6 +149,26 @@ const isValueAwaitedInArguments = (name, call) => {
 
   return false;
 };
+
+const getLeftMostCallExpression = call => {
+  let leftMostCallExpression = call;
+  let node = call;
+
+  while (node) {
+    if (node.type === _experimentalUtils.AST_NODE_TYPES.CallExpression) {
+      leftMostCallExpression = node;
+      node = node.callee;
+    }
+
+    if (node.type !== _experimentalUtils.AST_NODE_TYPES.MemberExpression) {
+      break;
+    }
+
+    node = node.object;
+  }
+
+  return leftMostCallExpression;
+};
 /**
  * Attempts to determine if the runtime value represented by the given `identifier`
  * is `await`ed or `return`ed within the given `body` of statements
@@ -156,8 +193,22 @@ const isValueAwaitedOrReturned = (identifier, body) => {
 
     if (node.type === _experimentalUtils.AST_NODE_TYPES.ExpressionStatement) {
       // it's possible that we're awaiting the value as an argument
-      if (node.expression.type === _experimentalUtils.AST_NODE_TYPES.CallExpression && isValueAwaitedInArguments(name, node.expression)) {
-        return true;
+      if (node.expression.type === _experimentalUtils.AST_NODE_TYPES.CallExpression) {
+        if (isValueAwaitedInArguments(name, node.expression)) {
+          return true;
+        }
+
+        const leftMostCall = getLeftMostCallExpression(node.expression);
+
+        if ((0, _utils.isExpectCall)(leftMostCall) && leftMostCall.arguments.length > 0 && (0, _utils.isIdentifier)(leftMostCall.arguments[0], name)) {
+          const {
+            modifier
+          } = (0, _utils.parseExpectCall)(leftMostCall);
+
+          if ((modifier === null || modifier === void 0 ? void 0 : modifier.name) === _utils.ModifierName.resolves || (modifier === null || modifier === void 0 ? void 0 : modifier.name) === _utils.ModifierName.rejects) {
+            return true;
+          }
+        }
       }
 
       if (node.expression.type === _experimentalUtils.AST_NODE_TYPES.AwaitExpression && isPromiseMethodThatUsesValue(node.expression, identifier)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jest",
-  "version": "25.0.5",
+  "version": "25.0.6",
   "description": "Eslint rules for Jest",
   "keywords": [
     "eslint",
@@ -60,10 +60,10 @@
     "projects": [
       {
         "displayName": "test",
-        "testEnvironment": "node",
         "testPathIgnorePatterns": [
           "<rootDir>/lib/.*",
-          "<rootDir>/src/rules/__tests__/fixtures/*"
+          "<rootDir>/src/rules/__tests__/fixtures/*",
+          "<rootDir>/src/rules/__tests__/test-utils.ts"
         ]
       },
       {
@@ -105,17 +105,16 @@
     "eslint-plugin-eslint-comments": "^3.1.2",
     "eslint-plugin-eslint-config": "^2.0.0",
     "eslint-plugin-eslint-plugin": "^3.5.3",
-    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-import": "^2.25.1",
     "eslint-plugin-node": "^11.0.0",
     "eslint-plugin-prettier": "^3.4.1",
     "husky": "^7.0.2",
     "is-ci": "^3.0.0",
     "jest": "^27.0.0",
-    "jest-runner-eslint": "^0.11.0",
+    "jest-runner-eslint": "^1.0.0",
     "lint-staged": "^11.1.2",
     "pinst": "^2.0.0",
     "prettier": "^2.0.5",
-    "resolve-from": "^5.0.0",
     "rimraf": "^3.0.0",
     "semantic-release": "^18.0.0",
     "semver": "^7.3.5",