[shrabantipaul-collate]

Describe your changes:

Fixes #36379

Test-only change to playwright/e2e/Flow/ProductTour.spec.ts: the walk no longer reads the tour's step while react-tour is between pages.

Product tour — Classic › walks the Classic pages on recorded data and returns to Home failed both attempts in this merge-queue run after #36286. The end modal was open on Memories: the walk pressed Next once past the last step, as in #36285, but for a different reason.

Cause. When Next moves to another page, changePage runs goToStep in a view transition, and the browser runs it only after it has captured the old page. Meanwhile react-tour advances on its own after stepWaitTimer (150 ms). On a slow runner the outgoing react-tour therefore shows the next step on the old page, then unmounts behind the loading mask while the new page settles, then mounts again. goNext returned on the outgoing popover's text, and isLastStep landed in the unmounted gap:

t (ms)	URL	event
560252	/context-center/overview	popover reads step 9 (Memories) with last-step-button, so goNext returns
560462	/context-center/memories	react-tour unmounted, loading mask up
560465	/context-center/memories	isLastStep → count() = 0, so the walk calls goNext again
560853	/context-center/memories	react-tour mounted again with last-step-button
560882		goNext clicks the Next arrow, now Finish → end modal

Fix. Two changes in the spec:

1. goNext also waits for the loading mask to be gone. The mask is up for exactly the time react-tour is unmounted, since both follow readyStepIndex in the same render, so goNext returns on a settled step and not the outgoing popover.
2. isLastStep waits until a popover is on screen and reads the popover and its last-step-button in one page.evaluate (review feedback). Checking the mask and then counting the button as two separate reads still left a window where react-tour could unmount between them. While react-tour is unmounted it now waits for the step to come back. If the outgoing popover is still up, it already shows the right step's button, so the answer is right either way.

Not in scope

The outgoing react-tour showing the next step on the old page is a product glitch of its own. It isn't changed here.

Type of change:

• Bug fix

High-level design:

N/A, small change.

Tests:

Use cases covered

• The Classic walk stops on the last step (Memories) even when the page change's view transition is slower than react-tour's step wait (reproduced locally with 4× CPU throttling).

Unit tests

N/A, test-only change.

Integration tests

N/A.

Playwright

Run locally against this branch's UI (Vite on :3010, backend on :8585), with --retries=0.

This PR under 4× CPU throttle: walk passes 10/10.

This PR, whole spec × 10 (--repeat-each=10 --workers=3): 40/40 passed.

yarn lint:playwright: 0 errors. tsc on the Playwright project is clean.

Checklist:

• I have read the CONTRIBUTING document.
• My PR title is Fixes <issue-number>: <short explanation>
• I have commented on my code, particularly in hard-to-understand areas.

🤖 Generated with Claude Code

Confidence Score: 5/5

The PR appears safe to merge; the earlier extra-Next race is addressed.

Summary

This test-only change makes the Classic tour walk wait through page changes without mistaking an absent popover for another step.

• The Classic tour test waits for page changes before checking its last step.

_{Reviews (2) · Last reviewed commit: "ProductTour spec reads the last step onl..." · Reviewed by Greptile}

[github-actions]

❌ PR checklist incomplete

This PR cannot be merged until the following are addressed on its linked issue:

• Linked issue Flaky Playwright: ProductTour Classic walk reads the last step while react-tour remounts on a page change #36379 is not added to the Shipping project.

The fields live on the linked issue in the Shipping project (open the issue → right sidebar → Projects). After you set them, re-run this check (or push a commit) — issue/project changes do not re-trigger it automatically.

Maintainers can bypass this check by adding the skip-pr-checks label.

[gitar-bot]

Code Review ✅ Approved

🟢 Low risk · The Playwright-only synchronization change affects when the ProductTour spec reads steps, with impact limited to test execution rather than application behavior.

Test-only fix to playwright/e2e/Flow/ProductTour.spec.ts so goNext also waits for the tour-step-loading mask to clear before returning, preventing the Classic walk from reading the last step during the react-tour unmount gap. No issues found.

Verification

Rules No rules evaluated

Functional validation Not enabled

Set up

Auto-approval Not enabled

Set up

_{For more verification details, comment gitar display:verbose.}

Options

Display: compact → Showing compact verification results.

Comment with these commands to change the behavior for this request:

Compact

gitar display:verbose

_{Was this helpful? React with 👍 / 👎 | Powered by Gitar — free for open source}