Skip to content

Commit 9ffc42d

Browse files
authored
Apply suggestions from code review
Co-authored-by: René <[email protected]>
1 parent fb02de7 commit 9ffc42d

2 files changed

Lines changed: 16 additions & 22 deletions

File tree

lib/internal/test_runner/mock/mock_timers.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,11 +313,7 @@ class MockTimers {
313313
}
314314

315315
#restoreOriginalAbortSignalTimeout() {
316-
if (this.#realAbortSignalTimeout) {
317-
ObjectDefineProperty(AbortSignal, 'timeout', this.#realAbortSignalTimeout);
318-
} else {
319-
delete AbortSignal.timeout;
320-
}
316+
ObjectDefineProperty(AbortSignal, 'timeout', this.#realAbortSignalTimeout);
321317
}
322318

323319
#createTimer(isInterval, callback, delay, ...args) {

test/parallel/test-mock-timers-abortsignal-timeout.js

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,18 @@ require('../common');
44
const assert = require('assert');
55
const { mock } = require('node:test');
66

7-
{
8-
mock.timers.enable({ apis: ['AbortSignal.timeout'] });
9-
10-
try {
11-
const signal = AbortSignal.timeout(50);
12-
13-
assert.strictEqual(signal.aborted, false);
14-
15-
mock.timers.tick(49);
16-
assert.strictEqual(signal.aborted, false);
17-
18-
mock.timers.tick(1);
19-
assert.strictEqual(signal.aborted, true);
20-
} finally {
21-
mock.timers.reset();
22-
}
23-
}
7+
const originalAbortSignalTimeout = AbortSignal.timeout;
8+
9+
mock.timers.enable({ apis: ['AbortSignal.timeout'] });
10+
11+
const signal = AbortSignal.timeout(50);
12+
assert.strictEqual(signal.aborted, false);
13+
14+
mock.timers.tick(49);
15+
assert.strictEqual(signal.aborted, false);
16+
17+
mock.timers.tick(1);
18+
assert.strictEqual(signal.aborted, true);
19+
20+
mock.timers.reset();
21+
assert.strictEqual(AbortSignal.timeout, originalAbortSignalTimeout);

0 commit comments

Comments
 (0)