Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test_runner: fix invalid timer call #49477

Merged
merged 2 commits into from
Sep 5, 2023
Merged

test_runner: fix invalid timer call #49477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72220bf
test_runner: fix invalid timer call
ErickWendel Sep 3, 2023
279aa99
test_runner: manually check descriptors
ErickWendel Sep 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/internal/test_runner/mock/mock_timers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ class MockTimers {
ObjectDefineProperty(
nodeTimers,
'setTimeout',
this.#realSetTimeout,
this.#realTimersSetTimeout,
);
ObjectDefineProperty(
nodeTimers,
Expand Down
39 changes: 24 additions & 15 deletions test/parallel/test-runner-mock-timers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ describe('Mock Timers Test Suite', () => {
code: 'ERR_INVALID_ARG_VALUE',
});
});

it('should check that propertyDescriptor gets back after reseting timers', (t) => {
it('should check that propertyDescriptor gets back after resetting timers', (t) => {
const getDescriptor = (ctx, fn) => Object.getOwnPropertyDescriptor(ctx, fn);
const getCurrentTimersDescriptors = () => {
const timers = [
Expand All @@ -71,26 +70,36 @@ describe('Mock Timers Test Suite', () => {
nodeTimersPromises: nodeTimersPromisesDescriptors,
};
};
const before = getCurrentTimersDescriptors();

const originalDescriptors = getCurrentTimersDescriptors();

t.mock.timers.enable();
const during = getCurrentTimersDescriptors();
t.mock.timers.reset();
const after = getCurrentTimersDescriptors();

assert.deepStrictEqual(
before,
after,
);
for (const env in originalDescriptors) {
for (const prop in originalDescriptors[env]) {
const originalDescriptor = originalDescriptors[env][prop];
const afterDescriptor = after[env][prop];

assert.notDeepStrictEqual(
before,
during,
);
assert.deepStrictEqual(
originalDescriptor,
afterDescriptor,
);

assert.notDeepStrictEqual(
during,
after,
);
assert.notDeepStrictEqual(
originalDescriptor,
during[env][prop],
);

assert.notDeepStrictEqual(
during[env][prop],
after[env][prop],
);

}
}
});

it('should reset all timers when calling .reset function', (t) => {
Expand Down