fix(valid-expect-in-promise): support out of order awaits (#939)

jest-community · Oct 11, 2021 · 07d2137 · 07d2137
1 parent e731bce
commit 07d2137
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/rules/__tests__/valid-expect-in-promise.test.ts b/src/rules/__tests__/valid-expect-in-promise.test.ts
@@ -383,6 +383,19 @@ ruleTester.run('valid-expect-in-promise', rule, {
         }
       );
     `,
+    dedent`
+      it('is valid', async () => {
+        const promiseOne = loadNumber().then(number => {
+          expect(typeof number).toBe('number');
+        });
+        const promiseTwo = loadNumber().then(number => {
+          expect(typeof number).toBe('number');
+        });
+
+        await promiseTwo;
+        await promiseOne;
+      });
+    `,
     dedent`
       it("it1", () => somePromise.then(() => {
         expect(someThing).toEqual(true)

diff --git a/src/rules/valid-expect-in-promise.ts b/src/rules/valid-expect-in-promise.ts
@@ -163,8 +163,11 @@ const isValueAwaitedOrReturned = (
     }
 
     if (node.type === AST_NODE_TYPES.ExpressionStatement) {
-      if (node.expression.type === AST_NODE_TYPES.AwaitExpression) {
-        return isPromiseMethodThatUsesValue(node.expression, identifier);
+      if (
+        node.expression.type === AST_NODE_TYPES.AwaitExpression &&
+        isPromiseMethodThatUsesValue(node.expression, identifier)
+      ) {
+        return true;
       }
 
       // (re)assignment changes the runtime value, so if we've not found an