Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
fix(expect): report expect.poll and expect.toPass as "expect" steps (#37356)
Dmitry Gozmanbee11cbc28f2
diff --git a/packages/playwright/src/index.ts b/packages/playwright/src/index.tsindex efbc00e686..c7f4023b2c 100644--- a/packages/playwright/src/index.ts+++ b/packages/playwright/src/index.ts@@ -265,7 +265,8 @@ const playwrightFixtures: Fixtures<TestFixtures, WorkerFixtures> = ({if (!testInfo || data.apiName.includes('setTestIdAttribute') || data.apiName === 'tracing.groupEnd')return;const zone = currentZone().data<TestStepInternal>('stepZone');- if (zone && zone.category === 'expect') {+ const isExpectCall = data.apiName === 'locator._expect' || data.apiName === 'frame._expect' || data.apiName === 'page._expectScreenshot';+ if (zone && zone.category === 'expect' && isExpectCall) {// Display the internal locator._expect call under the name of the enclosing expect call,// and connect it to the existing expect step.if (zone.apiName)diff --git a/packages/playwright/src/matchers/expect.ts b/packages/playwright/src/matchers/expect.tsindex 97261c40bb..4eb9013ae4 100644--- a/packages/playwright/src/matchers/expect.ts+++ b/packages/playwright/src/matchers/expect.ts@@ -68,7 +68,7 @@ import { TestInfoImpl } from '../worker/testInfo';import type { ExpectMatcherStateInternal } from './matchers';import type { Expect } from '../../types/test';-import type { TestStepCategory, TestStepInfoImpl } from '../worker/testInfo';+import type { TestStepInfoImpl } from '../worker/testInfo';// #region@@ -351,12 +351,11 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {// This looks like it is unnecessary, but it isn't - we need to filter// out all the frames that belong to the test runner from caught runtime errors.const stackFrames = filteredStackTrace(captureRawStack());- const category = matcherName === 'toPass' || this._info.poll ? 'test.step' : 'expect' as TestStepCategory;// toPass and poll matchers can contain other steps, expects and API calls,// so they behave like a retriable step.const stepInfo = {- category,+ category: 'expect' as const,apiName,title,params: args[0] ? { expected: args[0] } : undefined,diff --git a/tests/playwright-test/test-step.spec.ts b/tests/playwright-test/test-step.spec.tsindex c49820735c..60e818d604 100644--- a/tests/playwright-test/test-step.spec.ts+++ b/tests/playwright-test/test-step.spec.ts@@ -640,7 +640,7 @@ test('should not propagate errors from within toPass', async ({ runInlineTest })expect(result.exitCode).toBe(0);expect(result.output).toBe(`hook |Before Hooks-test.step |Expect "toPass" @ a.test.ts:7+expect |Expect "toPass" @ a.test.ts:7expect | Expect "toBe" @ a.test.ts:6expect | ↪ error: Error: expect(received).toBe(expected) // Object.is equalityexpect | Expect "toBe" @ a.test.ts:6@@ -667,8 +667,8 @@ test('should show final toPass error', async ({ runInlineTest }) => {expect(result.exitCode).toBe(1);expect(stripAnsi(result.output)).toBe(`hook |Before Hooks-test.step |Expect "toPass" @ a.test.ts:6-test.step |↪ error: Error: expect(received).toBe(expected) // Object.is equality+expect |Expect "toPass" @ a.test.ts:6+expect |↪ error: Error: expect(received).toBe(expected) // Object.is equalityexpect | Expect "toBe" @ a.test.ts:5expect | ↪ error: Error: expect(received).toBe(expected) // Object.is equalityhook |After Hooks@@ -934,7 +934,7 @@ test('step inside toPass', async ({ runInlineTest }) => {expect(stripAnsi(result.output)).toBe(`hook |Before Hookstest.step |step 1 @ a.test.ts:4-test.step | Expect "toPass" @ a.test.ts:11+expect | Expect "toPass" @ a.test.ts:11test.step | step 2, attempt: 0 @ a.test.ts:7test.step | ↪ error: Error: expect(received).toBe(expected) // Object.is equalityexpect | Expect "toBe" @ a.test.ts:9@@ -981,7 +981,7 @@ fixture | Fixture "context"pw:api | Create contextfixture | Fixture "page"pw:api | Create page-test.step |Expect "toPass" @ a.test.ts:11+expect |Expect "toPass" @ a.test.ts:11pw:api | Navigate to "about:blank" @ a.test.ts:6test.step | inner step attempt: 0 @ a.test.ts:7test.step | ↪ error: Error: expect(received).toBe(expected) // Object.is equality@@ -1033,7 +1033,7 @@ fixture | Fixture "context"pw:api | Create contextfixture | Fixture "page"pw:api | Create page-test.step |Expect "poll toHaveLength" @ a.test.ts:14+expect |Expect "poll toHaveLength" @ a.test.ts:14pw:api | Navigate to "about:blank" @ a.test.ts:7test.step | inner step attempt: 0 @ a.test.ts:8expect | Expect "toBe" @ a.test.ts:10@@ -1086,7 +1086,7 @@ pw:api | Create contextfixture | Fixture "page"pw:api | Create pagepw:api |Set content @ a.test.ts:4-test.step |Expect "poll toBe" @ a.test.ts:13+expect |Expect "poll toBe" @ a.test.ts:13expect | Expect "toHaveText" @ a.test.ts:7test.step | iteration 1 @ a.test.ts:9expect | Expect "toBeVisible" @ a.test.ts:10@@ -1746,7 +1746,7 @@ fixture | Fixture "page"pw:api | Create pagepw:api |Set content @ a.test.ts:16expect |Expect "toBeInvisible" @ a.test.ts:17-test.step | Expect "poll toBe" @ a.test.ts:7+expect | Expect "poll toBe" @ a.test.ts:7pw:api | Query count locator('div').filter({ visible: true }) @ a.test.ts:7expect | Expect "toBe" @ a.test.ts:7expect | ↪ error: Error: expect(received).toBe(expected) // Object.is equality