Skip to content

Addon-vitest: Fix coverage when restarting Vitest due to config change #31069

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

Merged
merged 1 commit into from
Apr 4, 2025

Conversation

JReinhold
Copy link
Contributor

@JReinhold JReinhold commented Apr 4, 2025

Closes #30900

What I did

The issue was technically already fixed in #30875, where coverage mode became more resilient and always restarted Vitest when a run was triggered with coverage mode that didn't match the currently running mode:

const { watching, config } = this.testManager.store.getState();
const coverageShouldBeEnabled =
config.coverage && !watching && (runPayload?.storyIds?.length ?? 0) === 0;
const currentCoverage = this.vitest?.config.coverage?.enabled;
if (!this.vitest) {
await this.startVitest({ coverage: coverageShouldBeEnabled });
} else if (currentCoverage !== coverageShouldBeEnabled) {
await this.restartVitest({ coverage: coverageShouldBeEnabled });
} else {
await this.vitestRestartPromise;
}

However restarting Vitest due to config change didn't correctly set coverage mode, so it could result in:

  1. Enable coverage
  2. Run all tests
  3. (This restarts Vitest with coverage enabled)
  4. Change Vitest config
  5. (This restarts Vitest with coverage disabled)
  6. Run all tests
  7. (This restarts Vitest again to enable coverage)

This PR eliminates step 7, because step 5 will have the correct coverage mode.

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

Manual testing

This section is mandatory for all contributions. If you believe no manual test is necessary, please state so explicitly. Thanks!

Documentation

  • Add or update documentation reflecting your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Checklist for Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli-storybook/src/sandbox-templates.ts

  • Make sure this PR contains one of the labels below:

    Available labels
    • bug: Internal changes that fixes incorrect behavior.
    • maintenance: User-facing maintenance tasks.
    • dependencies: Upgrading (sometimes downgrading) dependencies.
    • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
    • cleanup: Minor cleanup style change. Will not show up in release changelog.
    • documentation: Documentation only changes. Will not show up in release changelog.
    • feature request: Introducing a new feature.
    • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
    • other: Changes that don't fit in the above categories.

🦋 Canary release

This PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the @storybookjs/core team here.

core team members can create a canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>

Greptile Summary

Updated the VitestManager in /code/addons/vitest/src/node/vitest-manager.ts to correctly apply the coverage mode when restarting Vitest after configuration changes.

  • Modified startVitest to require an explicit coverage boolean.
  • Removed redundant waiting on the prior restart promise in restartVitest.
  • Updated the config change listener to fetch the current coverage state from the test manager store.
  • Ensured the correct coverage mode is maintained post-config change, preventing unnecessary restarts.

@JReinhold JReinhold self-assigned this Apr 4, 2025
@JReinhold JReinhold marked this pull request as ready for review April 4, 2025 12:32
@JReinhold JReinhold requested a review from yannbf April 4, 2025 12:33
Copy link

nx-cloud bot commented Apr 4, 2025

View your CI Pipeline Execution ↗ for commit 71a080b.

Command Status Duration Result
nx affected -t check -c production --parallel=7 ✅ Succeeded 6s View ↗
nx run-many -t build -c production --parallel=3 ✅ Succeeded 4m 10s View ↗

☁️ Nx Cloud last updated this comment at 2025-04-04 12:43:45 UTC

@@ -206,7 +206,6 @@ export class VitestManager {
if (!this.vitest) {
await this.startVitest({ coverage: coverageShouldBeEnabled });
} else if (currentCoverage !== coverageShouldBeEnabled) {
await this.vitestRestartPromise;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

this was already called within this.restartVitest

Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

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

LGTM

1 file(s) reviewed, no comment(s)
Edit PR Review Bot Settings | Greptile

@JReinhold JReinhold merged commit 2dcf9dc into next Apr 4, 2025
47 of 67 checks passed
@JReinhold JReinhold deleted the jeppe/improve-vitest-restarts branch April 4, 2025 14:10
@github-actions github-actions bot mentioned this pull request Apr 4, 2025
5 tasks
@shilman shilman changed the title Addon-vitest: Correctly set coverage when restarting Vitest due to config change Addon-vitest: Fix coverage when restarting Vitest due to config change Apr 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Storybook 9 - When running tests after updating vite config, coverage is not calculated anymore
2 participants