test_runner: move fakerTimers to mock module

Signed-off-by: Erick Wendel <[email protected]>
nodejs · May 1, 2023 · 278893a · 278893a
1 parent 568ad96
commit 278893a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 26 deletions.
diff --git a/lib/internal/test_runner/fake_timers.js → lib/internal/test_runner/mock/fake_timers.js b/lib/internal/test_runner/fake_timers.js → lib/internal/test_runner/mock/fake_timers.js
diff --git a/lib/internal/test_runner/mock.js → lib/internal/test_runner/mock/mock.js b/lib/internal/test_runner/mock.js → lib/internal/test_runner/mock/mock.js
@@ -26,6 +26,7 @@ const {
   validateInteger,
   validateObject,
 } = require('internal/validators');
+const { FakeTimers } = require('internal/test_runner/mock/fake_timers')
 
 function kDefaultFunction() {}
 
@@ -35,6 +36,7 @@ class MockFunctionContext {
   #implementation;
   #restore;
   #times;
+  #fakeTimers;
 
   constructor(implementation, restore, times) {
     this.#calls = [];
@@ -48,6 +50,10 @@ class MockFunctionContext {
     return ArrayPrototypeSlice(this.#calls, 0);
   }
 
+  get fakeTimers() {
+    this.#fakeTimers ??= new FakeTimers();
+    return this.#fakeTimers;
+  }
   callCount() {
     return this.#calls.length;
   }

diff --git a/lib/internal/test_runner/test.js b/lib/internal/test_runner/test.js
@@ -30,8 +30,8 @@ const {
   },
   AbortError,
 } = require('internal/errors');
-const { MockTracker } = require('internal/test_runner/mock');
-const { FakeTimers } = require('internal/test_runner/fake_timers');
+const { MockTracker } = require('internal/test_runner/mock/mock');
+const { FakeTimers } = require('internal/test_runner/mock/fake_timers');
 const { TestsStream } = require('internal/test_runner/tests_stream');
 const {
   createDeferredCallback,
@@ -109,11 +109,6 @@ class TestContext {
     return this.#test.mock;
   }
 
-  get fakeTimers() {
-    this.#test.fakeTimers ??= new FakeTimers();
-    return this.#test.fakeTimers;
-  }
-
   runOnly(value) {
     this.#test.runOnlySubtests = !!value;
   }

diff --git a/lib/test.js b/lib/test.js
@@ -23,28 +23,11 @@ ObjectDefineProperty(module.exports, 'mock', {
   enumerable: true,
   get() {
     if (lazyMock === undefined) {
-      const { MockTracker } = require('internal/test_runner/mock');
+      const { MockTracker } = require('internal/test_runner/mock/mock');
 
       lazyMock = new MockTracker();
     }
 
     return lazyMock;
   },
 });
-
-let lazyFakeTimers;
-
-ObjectDefineProperty(module.exports, 'fakeTimers', {
-  __proto__: null,
-  configurable: true,
-  enumerable: true,
-  get() {
-    if (lazyFakeTimers === undefined) {
-      const { FakeTimers } = require('internal/test_runner/fake_timers');
-
-      lazyFakeTimers = new FakeTimers();
-    }
-
-    return lazyFakeTimers;
-  },
-});
diff --git a/test/parallel/test-runner-fake-timers.js → ...rallel/test-runner-mocking-fake-timers.js b/test/parallel/test-runner-fake-timers.js → ...rallel/test-runner-mocking-fake-timers.js
@@ -3,7 +3,7 @@ const common = require('../common');
 process.env.NODE_TEST_KNOWN_GLOBALS = 0;
 
 const assert = require('node:assert');
-const { fakeTimers, it, mock, afterEach, describe } = require('node:test');
+const { it, mock: { fakeTimers }, afterEach, describe } = require('node:test');
 describe('Faketimers Test Suite', () => {
 
   describe('setTimeout Suite', () => {