From 9ff2888e0486188f87fe4fa2e1fb3a8629e12a2f Mon Sep 17 00:00:00 2001
From: Benjamin Gruenbaum <inglor@gmail.com>
Date: Sun, 25 Jun 2023 18:04:37 +0000
Subject: [PATCH 1/2] test: add Symbol.dispose support to mock timers

---
 doc/api/test.md                              |  4 ++++
 lib/internal/test_runner/mock/mock_timers.js |  5 +++++
 test/parallel/test-runner-mock-timers.js     | 15 +++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/doc/api/test.md b/doc/api/test.md
index 1df555a8274894..3e77930b2712d9 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -1580,6 +1580,10 @@ const { mock } = require('node:test');
 mock.timers.reset();
 ```
 
+### `timers[Symbol.dispose]()`
+
+An alias for `timers.reset()`.
+
 ### `timers.tick(milliseconds)`
 
 <!-- YAML
diff --git a/lib/internal/test_runner/mock/mock_timers.js b/lib/internal/test_runner/mock/mock_timers.js
index ec79b9e860de3d..790c48e663b387 100644
--- a/lib/internal/test_runner/mock/mock_timers.js
+++ b/lib/internal/test_runner/mock/mock_timers.js
@@ -13,6 +13,7 @@ const {
   FunctionPrototypeBind,
   Promise,
   SymbolAsyncIterator,
+  SymbolDispose,
   globalThis,
 } = primordials;
 const {
@@ -316,6 +317,10 @@ class MockTimers {
     this.#toggleEnableTimers(true);
   }
 
+  [SymbolDispose]() {
+    this.reset();
+  }
+
   reset() {
     // Ignore if not enabled
     if (!this.#isEnabled) return;
diff --git a/test/parallel/test-runner-mock-timers.js b/test/parallel/test-runner-mock-timers.js
index 150883f52237e0..883dd9d08ad752 100644
--- a/test/parallel/test-runner-mock-timers.js
+++ b/test/parallel/test-runner-mock-timers.js
@@ -61,6 +61,21 @@ describe('Mock Timers Test Suite', () => {
       assert.strictEqual(fn.mock.callCount(), 0);
     });
 
+    it('should reset all timers when calling Symbol.dispose', (t) => {
+      t.mock.timers.enable();
+      const fn = t.mock.fn();
+      global.setTimeout(fn, 1000);
+      // TODO(benjamingr) refactor to `using`
+      t.mock.timers[Symbol.dispose]();
+      assert.throws(() => {
+        t.mock.timers.tick(1000);
+      }, {
+        code: 'ERR_INVALID_STATE',
+      });
+
+      assert.strictEqual(fn.mock.callCount(), 0);
+    });
+
     it('should execute in order if timeout is the same', (t) => {
       t.mock.timers.enable();
       const order = [];

From 97e8f46736426bb66d68041ac21ac9804c79398d Mon Sep 17 00:00:00 2001
From: Benjamin Gruenbaum <inglor@gmail.com>
Date: Mon, 26 Jun 2023 14:05:00 +0300
Subject: [PATCH 2/2] Update doc/api/test.md

---
 doc/api/test.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/test.md b/doc/api/test.md
index 3e77930b2712d9..b86a877bb8addd 100644
--- a/doc/api/test.md
+++ b/doc/api/test.md
@@ -1582,7 +1582,7 @@ mock.timers.reset();
 
 ### `timers[Symbol.dispose]()`
 
-An alias for `timers.reset()`.
+Calls `timers.reset()`.
 
 ### `timers.tick(milliseconds)`