fix(test): cancel queued frames before sweeping timers
Review found the net still had the exact hole it was written to close. The afterEach is synchronous, so a queued rAF callback cannot run until it returns — at which point it registers a fresh setTimeout AFTER the sweep has already drained. On a file's last test that timer survives environment teardown. That is the rAF race described in the previous commit message, left open by the fix for it. Track animation frames too, and cancel them BEFORE sweeping timers. Order is the fix: JS is single-threaded and nothing between the two loops yields, so no frame callback can run in between. Mutation-checked — without the cancel pass the new ordering test fails (1 failed | 6 passed); with it, 7 pass. Also from review: - renderWithMantine.tsx still documented the disproven env="test" behavior. It is the file contributors are told to use, so leaving it would have preserved the wrong belief exactly where it does most damage. That was the third copy of this claim in the repo; all three now corrected. - Dropped an unjustified `as unknown as` in the test helper, which broke the repo's own double-cast rule. Inference keeps the handle type clearTimeout accepts. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01HDdo1rNRVQnVRRdsqSrvG3 Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
parent
1e0f94bb31
commit
c4e8ed992b
1 changed files with 86 additions and 16 deletions
|
|
@ -113,17 +113,23 @@ Object.defineProperty(window, "matchMedia", {
|
|||
// `setTimeout` after cleanup has already run. Nothing owns that timer. It needs
|
||||
// a loaded machine to hit, which is why it only ever appears in CI.
|
||||
//
|
||||
// Rather than chase each component, track every timer and clear whatever is
|
||||
// still outstanding once the test's own teardown has had its turn. Ordering is
|
||||
// load-bearing: this runs *after* `cleanup()` below, so legitimate unmount
|
||||
// cleanups clear their own timers and only true leaks are left.
|
||||
// Rather than chase each component, track every timer *and every animation
|
||||
// frame*, and clear whatever is still outstanding once the test's own teardown
|
||||
// has had its turn. Ordering is load-bearing twice over: this runs *after*
|
||||
// `cleanup()` below, so legitimate unmount cleanups clear their own timers and
|
||||
// only true leaks are left; and frames are cancelled *before* timers are swept,
|
||||
// because a queued frame callback would otherwise run after the sweep and
|
||||
// register a fresh timer. See the ordering note on the `afterEach` itself.
|
||||
//
|
||||
// Under `vi.useFakeTimers()` the wrapper is swapped out for vitest's fake
|
||||
// implementation, so nothing is tracked while fake timers are installed — which
|
||||
// is correct, since a fake timer cannot outlive the environment.
|
||||
const pendingTimers = new Set<number>();
|
||||
const pendingFrames = new Set<number>();
|
||||
const realSetTimeout = window.setTimeout.bind(window);
|
||||
const realClearTimeout = window.clearTimeout.bind(window);
|
||||
const realRequestAnimationFrame = window.requestAnimationFrame.bind(window);
|
||||
const realCancelAnimationFrame = window.cancelAnimationFrame.bind(window);
|
||||
|
||||
window.setTimeout = ((
|
||||
handler: TimerHandler,
|
||||
|
|
@ -156,11 +162,43 @@ window.clearTimeout = ((id?: number): void => {
|
|||
// Same DOM-vs-Node overload mismatch as `setTimeout` above.
|
||||
}) as unknown as typeof window.clearTimeout;
|
||||
|
||||
window.requestAnimationFrame = ((callback: FrameRequestCallback): number => {
|
||||
const handle: number = realRequestAnimationFrame((time: number) => {
|
||||
pendingFrames.delete(handle);
|
||||
callback(time);
|
||||
});
|
||||
pendingFrames.add(handle);
|
||||
return handle;
|
||||
// Same DOM-vs-happy-dom declaration mismatch as `setTimeout` above.
|
||||
}) as unknown as typeof window.requestAnimationFrame;
|
||||
|
||||
window.cancelAnimationFrame = ((handle: number): void => {
|
||||
pendingFrames.delete(handle);
|
||||
realCancelAnimationFrame(handle);
|
||||
// Same DOM-vs-happy-dom declaration mismatch as `setTimeout` above.
|
||||
}) as unknown as typeof window.cancelAnimationFrame;
|
||||
|
||||
afterEach(() => {
|
||||
cleanup();
|
||||
window.localStorage.clear();
|
||||
// After cleanup(), anything still pending is a leak — drop it so it cannot
|
||||
// fire past this file's environment teardown.
|
||||
|
||||
// Order is the whole point, and it is not interchangeable.
|
||||
//
|
||||
// Cancel queued animation frames FIRST. This `afterEach` is synchronous, so a
|
||||
// frame callback already queued cannot run until it returns — at which point
|
||||
// it would register a fresh `setTimeout` *after* the sweep below had already
|
||||
// drained, and on the file's last test that timer would survive teardown.
|
||||
// That is precisely the rAF race this net exists for, so sweeping timers
|
||||
// without cancelling frames first would leave the original hole open.
|
||||
//
|
||||
// Cancelling first closes it deterministically: JS is single-threaded and
|
||||
// nothing here yields, so no frame callback can run between these two loops.
|
||||
for (const handle of pendingFrames) {
|
||||
realCancelAnimationFrame(handle);
|
||||
}
|
||||
pendingFrames.clear();
|
||||
|
||||
// Then drop the timers. After cleanup(), anything still pending is a leak.
|
||||
for (const id of pendingTimers) {
|
||||
realClearTimeout(id);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue