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.

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

fix(jest-fake-timers): Return real Date.now() from jest.now() when real timers are in use #13246

Merged
merged 5 commits into from
Sep 10, 2022

Conversation

robhogan
Copy link
Contributor

Summary

Quick follow up to #13244, applying the review suggestion that jest.now() should return real Date.now() if real timers are in use. Currently, it will throw if the clock has not previously been initialised.

Test plan

Added unit tests for the real timer case - also cleared up some global pollution in adjacent tests.

Copy link
Member

@SimenB SimenB left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

Comment on lines -409 to +417
// @ts-expect-error: condition always returns 'true'
if (this._global.setTimeout !== this._fakeTimerAPIs?.setTimeout) {
if (!this._fakingTime) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@SimenB SimenB merged commit 74d27a7 into jestjs:main Sep 10, 2022
@robhogan robhogan deleted the feature/jest-now-with-real-timers branch September 10, 2022 18:46
@github-actions
Copy link

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
Please note this issue tracker is not a help forum. We recommend using StackOverflow or our discord channel for questions.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 11, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants