From 8ff2fc886c5998df8d9ae3e646bd13a414244aaa Mon Sep 17 00:00:00 2001
From: Simon Knott <info@simonknott.de>
Date: Thu, 22 Aug 2024 08:44:50 +0200
Subject: [PATCH] fix(test runner): expect.poll error reporting should handle
 non-expect errors

---
 packages/playwright/src/matchers/expect.ts      |  7 ++++---
 packages/playwright/src/matchers/matcherHint.ts |  4 ++++
 tests/playwright-test/expect-poll.spec.ts       | 13 +++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/playwright/src/matchers/expect.ts b/packages/playwright/src/matchers/expect.ts
index 3e49360eb7..22e0c4862d 100644
--- a/packages/playwright/src/matchers/expect.ts
+++ b/packages/playwright/src/matchers/expect.ts
@@ -60,7 +60,7 @@ import {
 } from '../common/expectBundle';
 import { zones } from 'playwright-core/lib/utils';
 import { TestInfoImpl } from '../worker/testInfo';
-import { ExpectError } from './matcherHint';
+import { ExpectError, isExpectError } from './matcherHint';
 
 // #region
 // Mirrored from https://github.com/facebook/jest/blob/f13abff8df9a0e1148baf3584bcde6d1b479edc7/packages/expect/src/print.ts
@@ -289,8 +289,9 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
 
       const step = testInfo._addStep(stepInfo);
 
-      const reportStepError = (jestError: ExpectError) => {
-        const error = new ExpectError(jestError, customMessage, stackFrames);
+      const reportStepError = (_error: unknown) => {
+        const jestError = _error instanceof Error ? _error : new Error(String(_error));
+        const error = isExpectError(jestError) ? new ExpectError(jestError, customMessage, stackFrames) : jestError;
         step.complete({ error });
         if (this._info.isSoft)
           testInfo._failWithError(error);
diff --git a/packages/playwright/src/matchers/matcherHint.ts b/packages/playwright/src/matchers/matcherHint.ts
index e8aba2bbff..8a78932c68 100644
--- a/packages/playwright/src/matchers/matcherHint.ts
+++ b/packages/playwright/src/matchers/matcherHint.ts
@@ -64,3 +64,7 @@ export class ExpectError extends Error {
     this.stack = this.name + ': ' + this.message + '\n' + stringifyStackFrames(stackFrames).join('\n');
   }
 }
+
+export function isExpectError(e: unknown): e is ExpectError {
+  return e instanceof Error && 'matcherResult' in e;
+}
diff --git a/tests/playwright-test/expect-poll.spec.ts b/tests/playwright-test/expect-poll.spec.ts
index e740fd5abe..00e19bc6f7 100644
--- a/tests/playwright-test/expect-poll.spec.ts
+++ b/tests/playwright-test/expect-poll.spec.ts
@@ -232,3 +232,16 @@ test('should show intermediate result for poll that spills over test time', asyn
   expect(result.output).toContain('Expected: 2');
   expect(result.output).toContain('Received: 3');
 });
+
+test('should propagate promise rejections', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/32256' } }, async ({ runInlineTest }) => {
+  const result = await runInlineTest({
+    'a.spec.ts': `
+      import { test, expect } from '@playwright/test';
+      test('should fail', async () => {
+        await expect.poll(() => Promise.reject('some error')).toBe({ foo: 'baz' });
+      });
+    `
+  });
+
+  expect(result.output).toContain('Error: some error');
+});
\ No newline at end of file