microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-01-05 19:04:43 +03:00
Code Issues Projects Releases Wiki Activity

chore: ensure web assertions are merged in trace (#22544)

Browse Source
This commit is contained in:
Pavel Feldman 2023-04-21 10:07:23 -07:00 committed by GitHub
parent a919f5f66f
commit bbc47ba315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 51 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/playwright-core/src/utils/traceUtils.ts
View File

@ -122,11 +122,11 @@ export async function saveTraceFile(fileName: string, traceEvents: TraceEvent[],
});
}
export function createBeforeActionTraceEventForExpect(callId: string, apiName: string, expected: any, stack: StackFrame[]): BeforeActionTraceEvent {
export function createBeforeActionTraceEventForExpect(callId: string, apiName: string, wallTime: number, expected: any, stack: StackFrame[]): BeforeActionTraceEvent {
return {
type: 'before',
callId,
wallTime: Date.now(),
wallTime,
startTime: monotonicTime(),
class: 'Test',
method: 'step',

2
packages/playwright-test/src/matchers/expect.ts
View File

@ -224,7 +224,7 @@ class ExpectMetaInfoProxyHandler implements ProxyHandler<any> {
const generateTraceEvent = matcherName !== 'poll' && matcherName !== 'toPass';
const callId = ++lastCallId;
if (generateTraceEvent)
testInfo._traceEvents.push(createBeforeActionTraceEventForExpect(`expect@${callId}`, defaultTitle, args[0], stackFrames));
testInfo._traceEvents.push(createBeforeActionTraceEventForExpect(`expect@${callId}`, defaultTitle, wallTime, args[0], stackFrames));
const reportStepError = (jestError: Error) => {
const message = jestError.message;

48
tests/playwright-test/ui-mode-trace.spec.ts
View File

@ -45,6 +45,54 @@ test('should merge trace events', async ({ runUITest, server }) => {
], { timeout: 15000 });
});
test('should merge web assertion events', async ({ runUITest }, testInfo) => {
const { page } = await runUITest({
'a.test.ts': `
import { test, expect } from '@playwright/test';
test('trace test', async ({ page }) => {
await page.setContent('<button>Submit</button>');
await expect(page.locator('button')).toBeVisible();
});
`,
});
await page.getByText('trace test').dblclick();
const listItem = page.getByTestId('action-list').getByRole('listitem');
await expect(
listItem,
'action list'
).toHaveText([
/browserContext\.newPage[\d.]+m?s/,
/page\.setContent[\d.]+m?s/,
/expect\.toBeVisiblelocator\('button'\)[\d.]+m?s/,
], { timeout: 15000 });
});
test('should merge screenshot assertions', async ({ runUITest }, testInfo) => {
const { page } = await runUITest({
'a.test.ts': `
import { test, expect } from '@playwright/test';
test('trace test', async ({ page }) => {
await page.setContent('<button>Submit</button>');
await expect(page.locator('button')).toHaveScreenshot();
});
`,
});
await page.getByText('trace test').dblclick();
const listItem = page.getByTestId('action-list').getByRole('listitem');
await expect(
listItem,
'action list'
).toHaveText([
/browserContext\.newPage[\d.]+m?s/,
/page\.setContent[\d.]+m?s/,
/expect\.toHaveScreenshot[\d.]+m?s/,
], { timeout: 15000 });
});
test('should locate sync assertions in source', async ({ runUITest, server }) => {
const { page } = await runUITest({
'a.test.ts': `