From 0abbe041f1d3a1d7d0686bba69a4c1672d2cac8d Mon Sep 17 00:00:00 2001
From: Janpot <2109932+Janpot@users.noreply.github.com>
Date: Wed, 3 Dec 2025 20:21:52 +0100
Subject: [PATCH] [code-infra] make sure to clean up fake timers

---
 .../test-utils/src/createRenderer.tsx         | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/packages-internal/test-utils/src/createRenderer.tsx b/packages-internal/test-utils/src/createRenderer.tsx
index 88615ae1b23c99..20b13380b94708 100644
--- a/packages-internal/test-utils/src/createRenderer.tsx
+++ b/packages-internal/test-utils/src/createRenderer.tsx
@@ -221,6 +221,15 @@ function createClock(
         vi.setSystemTime(config);
       }
     });
+
+    afterEach(async () => {
+      if (vi.isFakeTimers()) {
+        await rtlAct(async () => {
+          vi.runOnlyPendingTimers();
+        });
+        vi.useRealTimers();
+      }
+    });
   } else {
     beforeEach(() => {
       if (config) {
@@ -229,15 +238,6 @@ function createClock(
     });
   }
 
-  afterEach(async () => {
-    if (vi.isFakeTimers()) {
-      await rtlAct(async () => {
-        vi.runOnlyPendingTimers();
-      });
-      vi.useRealTimers();
-    }
-  });
-
   return {
     withFakeTimers: () => {
       if (vi.isFakeTimers()) {
@@ -266,6 +266,15 @@ function createClock(
           vi.setSystemTime(config);
         }
       });
+
+      afterEach(async () => {
+        if (vi.isFakeTimers()) {
+          await rtlAct(async () => {
+            vi.runOnlyPendingTimers();
+          });
+          vi.useRealTimers();
+        }
+      });
     },
     runToLast: () => {
       rtlAct(() => {