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

refactor(fake-timers): don't setup fakeTimerAPIs unless needed #10551

Merged
merged 4 commits into from
Oct 19, 2020
Merged

refactor(fake-timers): don't setup fakeTimerAPIs unless needed #10551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
607f79b
refactor(fake-timers): don't setup _fakeTimerAPIs unless needed
tgriesser Sep 23, 2020
abcdd3e
Update CHANGELOG.md
SimenB Oct 19, 2020
c35326b
Merge branch 'master' into tgriesser/feat/remove-extra-fakeTimers-cre…
SimenB Oct 19, 2020
a198556
move changelog entry
SimenB Oct 19, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

### Fixes

- `[jest-fake-timers]` Lazily instantiate mock timers ([#10551](https://github.com/facebook/jest/pull/10551))
- `[jest-runtime]` `require.main` is no longer `undefined` when using `jest.resetModules` ([#10626](https://github.com/facebook/jest/pull/10626))
- `[@jest/types]` Add missing values for `timers` ([#10632](https://github.com/facebook/jest/pull/10632))

Expand Down
3 changes: 1 addition & 2 deletions packages/jest-fake-timers/src/legacyFakeTimers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ export default class FakeTimers<TimerRef> {
};

this.reset();
this._createMocks();
}

clearAllTimers(): void {
Expand Down Expand Up @@ -349,7 +348,7 @@ export default class FakeTimers<TimerRef> {
}

private _checkFakeTimers() {
if (this._global.setTimeout !== this._fakeTimerAPIs.setTimeout) {
if (this._global.setTimeout !== this._fakeTimerAPIs?.setTimeout) {
this._global.console.warn(
`A function to advance timers was called but the timers API is not ` +
`mocked with fake timers. Call \`jest.useFakeTimers()\` in this ` +
Expand Down