fix(spy): clear/reset/restore mocks in stack order #7499

hi-ogawa · 2025-02-15T06:55:43Z

Description

This PR reverts spy reuse idea of #6464 and fixes the original issue #6419 with a different approach. By reversing the order of restoreAllMocks, it can restore the original method.

Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

It's really useful if your PR references an issue where it is discussed ahead of time. If the feature is substantial or introduces breaking changes without a discussion, PR might be closed.
Ideally, include a test that fails without this PR but passes with it.
Please, don't make changes to pnpm-lock.yaml unless you introduce a new test example.

Tests

Run the tests with pnpm test:ci.

Documentation

If you introduce new functionality, document it. You can run documentation with pnpm run docs command.

Changesets

Changes in changelog are generated from PR name. Please, make sure that it explains your changes in an understandable manner. Please, prefix changeset messages with feat:, fix:, perf:, docs:, or chore:.

netlify · 2025-02-15T06:58:04Z

✅ Deploy Preview for vitest-dev ready!

Built without sensitive environment variables

Name	Link
🔨 Latest commit	`c76b0fd`
🔍 Latest deploy log	https://app.netlify.com/sites/vitest-dev/deploys/67b51ef0923a230008240226
😎 Deploy Preview	https://deploy-preview-7499--vitest-dev.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

pkg-pr-new · 2025-02-16T04:06:08Z

@vitest/browser

npm i https://pkg.pr.new/@vitest/browser@7499

@vitest/coverage-istanbul

npm i https://pkg.pr.new/@vitest/coverage-istanbul@7499

@vitest/coverage-v8

npm i https://pkg.pr.new/@vitest/coverage-v8@7499

@vitest/expect

npm i https://pkg.pr.new/@vitest/expect@7499

@vitest/mocker

npm i https://pkg.pr.new/@vitest/mocker@7499

@vitest/pretty-format

npm i https://pkg.pr.new/@vitest/pretty-format@7499

@vitest/snapshot

npm i https://pkg.pr.new/@vitest/snapshot@7499

@vitest/runner

npm i https://pkg.pr.new/@vitest/runner@7499

@vitest/spy

npm i https://pkg.pr.new/@vitest/spy@7499

@vitest/ui

npm i https://pkg.pr.new/@vitest/ui@7499

@vitest/utils

npm i https://pkg.pr.new/@vitest/utils@7499

vite-node

npm i https://pkg.pr.new/vite-node@7499

vitest

npm i https://pkg.pr.new/vitest@7499

@vitest/web-worker

npm i https://pkg.pr.new/@vitest/web-worker@7499

@vitest/ws-client

npm i https://pkg.pr.new/@vitest/ws-client@7499

commit: c76b0fd

This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [@vitest/coverage-v8](https://github.com/vitest-dev/vitest/tree/main/packages/coverage-v8#readme) ([source](https://github.com/vitest-dev/vitest/tree/HEAD/packages/coverage-v8)) | devDependencies | patch | [`3.0.5` -> `3.0.7`](https://renovatebot.com/diffs/npm/@vitest%2fcoverage-v8/3.0.5/3.0.7) | | [vitest](https://github.com/vitest-dev/vitest) ([source](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest)) | devDependencies | patch | [`3.0.5` -> `3.0.7`](https://renovatebot.com/diffs/npm/vitest/3.0.5/3.0.7) | --- ### Release Notes <details> <summary>vitest-dev/vitest (@vitest/coverage-v8)</summary> ### [`v3.0.7`](https://github.com/vitest-dev/vitest/releases/tag/v3.0.7) [Compare Source](vitest-dev/vitest@v3.0.6...v3.0.7) ##### 🐞 Bug Fixes - **browser**: Support webdriverio 9 - by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#7553 [<samp>(b1949)</samp>](vitest-dev/vitest@b1949c97) - **deps**: Update all non-major dependencies - in vitest-dev/vitest#7543 [<samp>(365ff)</samp>](vitest-dev/vitest@365ffe6b) - **expect**: Correct generic MatchersObject this type in expect.extend - by [@Workingstiff-s](https://github.com/Workingstiff-s) in vitest-dev/vitest#7526 [<samp>(d5765)</samp>](vitest-dev/vitest@d5765f71) - **mocker**: Include more modules to prefix-only module list - by [@btea](https://github.com/btea) in vitest-dev/vitest#7524 [<samp>(a12ec)</samp>](vitest-dev/vitest@a12ec008) - **spy**: Clear/reset/restore mocks in stack order - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7499 [<samp>(f7100)</samp>](vitest-dev/vitest@f71004ff) ##### 🏎 Performance - **browser**: Do wdio context switching only once per file - by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#7549 [<samp>(aaa58)</samp>](vitest-dev/vitest@aaa58556) ##### [View changes on GitHub](vitest-dev/vitest@v3.0.6...v3.0.7) ### [`v3.0.6`](https://github.com/vitest-dev/vitest/releases/tag/v3.0.6) [Compare Source](vitest-dev/vitest@v3.0.5...v3.0.6) ##### 🐞 Bug Fixes - Fix `getMockedSystemTime` for `useFakeTimer` - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7405 [<samp>(03912)</samp>](vitest-dev/vitest@03912b43) - Compat for jest-image-snapshot - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7390 [<samp>(9542b)</samp>](vitest-dev/vitest@9542b699) - Ensure project names are readable in dark terminals - by [@rgrove](https://github.com/rgrove) in vitest-dev/vitest#7371 [<samp>(bb94c)</samp>](vitest-dev/vitest@bb94c19f) - Exclude `queueMicrotask` from default fake timers to not break node fetch - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7505 [<samp>(167a9)</samp>](vitest-dev/vitest@167a98d7) - **browser**: - Fix mocking modules out of root - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7415 [<samp>(d3acb)</samp>](vitest-dev/vitest@d3acbd8b) - Fix `toHaveClass` typing - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7383 [<samp>(7ef23)</samp>](vitest-dev/vitest@7ef238c0) - Relax locator selectors methods - by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#7422 [<samp>(1b8c5)</samp>](vitest-dev/vitest@1b8c5c9e) - Resolve thread count from `maxWorkers` - by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#7483 [<samp>(adbb2)</samp>](vitest-dev/vitest@adbb25ab) - Cleanup timeout on resolve and give more information in the error - by [@sheremet-va](https://github.com/sheremet-va) in vitest-dev/vitest#7487 [<samp>(5a45a)</samp>](vitest-dev/vitest@5a45a7ca) - **coverage**: - `vite-node` to pass correct execution wrapper offset - by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#7417 [<samp>(1f2e5)</samp>](vitest-dev/vitest@1f2e5552) - Preserve moduleExecutionInfo in non-isolated runs - by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#7486 [<samp>(f31a0)</samp>](vitest-dev/vitest@f31a07bb) - **deps**: - Update all non-major dependencies - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7363 [<samp>(e348b)</samp>](vitest-dev/vitest@e348bd4c) - Update all non-major dependencies - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7507 [<samp>(6cc40)</samp>](vitest-dev/vitest@6cc408d6) - **init**: - Invalid browser config - by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#7475 [<samp>(8fe64)</samp>](vitest-dev/vitest@8fe641b4) - **reporters**: - Render tasks in tree when in TTY - by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#7503 [<samp>(027ce)</samp>](vitest-dev/vitest@027ce9bb) - **vite-node**: - Remove fake first line mapping on Vite 6 - by [@hi-ogawa](https://github.com/hi-ogawa) in vitest-dev/vitest#7124 [<samp>(b9973)</samp>](vitest-dev/vitest@b997355b) - **watch**: - Properly remove cache after removing existing test files - by [@soc221b](https://github.com/soc221b) in vitest-dev/vitest#7399 [<samp>(01a59)</samp>](vitest-dev/vitest@01a59721) - **workspace**: - Forward `inspect` related cli options - by [@AriPerkkio](https://github.com/AriPerkkio) in vitest-dev/vitest#7373 [<samp>(ed15b)</samp>](vitest-dev/vitest@ed15b5b3) ##### [View changes on GitHub](vitest-dev/vitest@v3.0.5...v3.0.6) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about these updates again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).  Reviewed-on: https://gitea.justinelmore.dev/jelmore1674/build-changelog/pulls/91 Co-authored-by: Renovate Bot <[email protected]> Co-committed-by: Renovate Bot <[email protected]>

fix(spy): clear/reset/restore mocks in stack order

935946f

chore: cleanup

e4c0484

hi-ogawa marked this pull request as ready for review February 15, 2025 07:32

hi-ogawa added the cr-tracked label Feb 16, 2025

Smrtnyk mentioned this pull request Feb 17, 2025

ci(): Migrate jest to vitest fabricjs/fabric.js#10420

Merged

AriPerkkio requested a review from sheremet-va February 18, 2025 06:46

sheremet-va approved these changes Feb 18, 2025

View reviewed changes

Merge branch 'main' into fix-restore-mock-all-in-stack-order

c76b0fd

hi-ogawa mentioned this pull request Feb 19, 2025

fix(spy)!: reset existing spy on repeated spyOn #7359

Closed

6 tasks

hi-ogawa merged commit f71004f into vitest-dev:main Feb 19, 2025
14 checks passed

hi-ogawa deleted the fix-restore-mock-all-in-stack-order branch February 19, 2025 01:06

gfscott mentioned this pull request Mar 8, 2025

Update dev dependencies gfscott/eleventy-plugin-embed-everything#323

Merged

hi-ogawa mentioned this pull request Apr 5, 2025

Calling spyOn multiple times discards previous mocks #7798

Closed

6 tasks

renovate bot mentioned this pull request Apr 28, 2025

fix(deps): update all minor dependencies (minor) mermaid-js/mermaid#6321

Closed

1 task

renovate bot mentioned this pull request May 6, 2025

fix(deps): update all dependencies un-ts/cf-cleaner#64

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

fix(spy): clear/reset/restore mocks in stack order #7499

fix(spy): clear/reset/restore mocks in stack order #7499

Uh oh!

hi-ogawa commented Feb 15, 2025 •

edited

Loading

Uh oh!

netlify bot commented Feb 15, 2025 •

edited

Loading

Uh oh!

pkg-pr-new bot commented Feb 16, 2025 •

edited

Loading

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

fix(spy): clear/reset/restore mocks in stack order #7499

fix(spy): clear/reset/restore mocks in stack order #7499

Uh oh!

Conversation

hi-ogawa commented Feb 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Please don't delete this checklist! Before submitting the PR, please make sure you do the following:

Tests

Documentation

Changesets

Uh oh!

netlify bot commented Feb 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for vitest-dev ready!

Uh oh!

pkg-pr-new bot commented Feb 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

hi-ogawa commented Feb 15, 2025 •

edited

Loading

netlify bot commented Feb 15, 2025 •

edited

Loading

pkg-pr-new bot commented Feb 16, 2025 •

edited

Loading