Skip to content

Commit 1d115dc

Browse files
hi-ogawaclaude
andauthored
fix(browser): fix expect.element with message and remove redundant [ERROR] in trace steps (#11832)
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
1 parent 3c967a7 commit 1d115dc

5 files changed

Lines changed: 22 additions & 20 deletions

File tree

‎docs/guide/browser/snippets/trace-failure.ansi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ Received:
1616
Caused by: Error: Matcher did not succeed in time.
1717

1818
Trace:
19-
 step locator start duration location
20-
fill form -  +1ms 58ms src/sign-in.test.ts:6:14
21-
├── fill getByLabel('Email')  +2ms 31ms src/sign-in.test.ts:7:40
22-
└── fill getByLabel('Password')  +34ms 24ms src/sign-in.test.ts:8:43
23-
click getByRole('button', { name: 'Sign in' }) +61ms 18ms src/sign-in.test.ts:10:55
24-
 toHaveTextContent [ERROR] getByRole('heading')  +80ms 1003ms src/sign-in.test.ts:11:16
19+
 step locator start duration location
20+
fill form -  +1ms 58ms src/sign-in.test.ts:6:14
21+
├── fill getByLabel('Email')  +2ms 31ms src/sign-in.test.ts:7:40
22+
└── fill getByLabel('Password')  +34ms 24ms src/sign-in.test.ts:8:43
23+
click getByRole('button', { name: 'Sign in' }) +61ms 18ms src/sign-in.test.ts:10:55
24+
 toHaveTextContent getByRole('heading')  +80ms 1003ms src/sign-in.test.ts:11:16

‎packages/browser/src/client/tester/expect-element.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,12 @@ function element<T extends HTMLElement | SVGElement | null | Locator>(
7474
!elementOrLocator || elementOrLocator instanceof Element
7575
? undefined
7676
: elementOrLocator.serialize()
77-
const getTraceName = (assertion: Assertion, status?: BrowserTraceEntryStatus) => {
77+
const getTraceName = (assertion: Assertion) => {
7878
const isNot = chai.util.flag(assertion, 'negate')
7979
const name = chai.util.flag(assertion, '_name') || '<unknown>'
80-
const baseName = `${isNot ? 'not.' : ''}${name}`
81-
return status === 'fail' ? `${baseName} [ERROR]` : baseName
80+
const message = chai.util.flag(assertion, 'message')
81+
const matcher = `${isNot ? 'not.' : ''}${name}`
82+
return message ? `${message} (${matcher})` : matcher
8283
}
8384
chai.util.flag(expectElement, '_poll.onStart', async (meta: { assertion: Assertion }) => {
8485
if (hasActiveTraceView) {
@@ -95,7 +96,7 @@ function element<T extends HTMLElement | SVGElement | null | Locator>(
9596
expectElement,
9697
'_poll.onSettled',
9798
async (meta: { assertion: Assertion; status: BrowserTraceEntryStatus }) => {
98-
const traceName = getTraceName(meta.assertion, meta.status)
99+
const traceName = getTraceName(meta.assertion)
99100
if (hasActiveTraceView) {
100101
await recordBrowserTraceEntry(currentTest, {
101102
name: traceName,
@@ -111,7 +112,8 @@ function element<T extends HTMLElement | SVGElement | null | Locator>(
111112
'__vitest_markTrace',
112113
[
113114
{
114-
name: traceName,
115+
// trace marks have no status, so the name shows the failure
116+
name: meta.status === 'fail' ? `${traceName} [ERROR]` : traceName,
115117
element: getSelector(),
116118
stack: sourceError.stack,
117119
},

‎test/browser/specs/trace-timeline.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,20 @@ test('prints trace timeline on failure', async () => {
5454
})
5555
await new Promise(resolve => setTimeout(resolve, 300))
5656
await page.mark('after wait')
57-
await expect.element(page.getByRole('button'), { timeout: 100 }).toHaveTextContent('Done')
57+
await expect.element(page.getByRole('button'), { timeout: 100, message: 'button done' }).toHaveTextContent('Done')
5858
})
5959
`,
6060
})
6161

6262
expect(extractTimelines(stderr)).toMatchInlineSnapshot(`
6363
[
6464
"Trace:
65-
step locator start duration location
66-
load - +<time> <time> basic.test.ts:12
67-
├── click getByRole('button') +<time> <time> basic.test.ts:13
68-
└── toHaveTextContent getByRole('button') +<time> <time> basic.test.ts:14
69-
after wait - +<time> - basic.test.ts:17
70-
toHaveTextContent [ERROR] getByRole('button') +<time> <time> basic.test.ts:18",
65+
step locator start duration location
66+
load - +<time> <time> basic.test.ts:12
67+
├── click getByRole('button') +<time> <time> basic.test.ts:13
68+
└── toHaveTextContent getByRole('button') +<time> <time> basic.test.ts:14
69+
after wait - +<time> - basic.test.ts:17
70+
button done (toHaveTextContent) getByRole('button') +<time> <time> basic.test.ts:18",
7171
]
7272
`)
7373
})

‎test/browser/specs/trace.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ test('trace view artifacts', async () => {
397397
},
398398
"kind": "expect",
399399
"location": "expect.test.ts:15",
400-
"name": "toHaveTextContent [ERROR]",
400+
"name": "toHaveTextContent",
401401
"range": {
402402
"phase": "end",
403403
},

‎test/ui/test/trace-failure-only.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ async function testBasic(page: Page) {
7272
await expect(traceSteps).toHaveText([
7373
'toHaveTextContent',
7474
'toHaveAccessibleName',
75-
'toHaveTextContent [ERROR]',
75+
'toHaveTextContent',
7676
'test finished',
7777
])
7878

0 commit comments

Comments
 (0)