fix: fix markSnapshotsAsCheckedForTest

vitest-dev · Oct 30, 2024 · 940dbb3 · 940dbb3
1 parent 5b1182b
commit 940dbb3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/packages/snapshot/src/client.ts b/packages/snapshot/src/client.ts
@@ -75,9 +75,9 @@ export class SnapshotClient {
     return result
   }
 
-  skipTest(filepath: string, testId: string): void {
+  skipTest(filepath: string, testName: string): void {
     const state = this.getSnapshotState(filepath)
-    state.markSnapshotsAsCheckedForTest(testId)
+    state.markSnapshotsAsCheckedForTest(testName)
   }
 
   clearTest(filepath: string, testId: string): void {

diff --git a/packages/snapshot/src/port/state.ts b/packages/snapshot/src/port/state.ts
@@ -111,11 +111,12 @@ export default class SnapshotState {
     return this._environment
   }
 
-  markSnapshotsAsCheckedForTest(testId: string): void {
-    // TODO: broken... for skipped test, we don't even have _testIdToKeys
-    for (const key of this._testIdToKeys.get(testId) ?? []) {
-      this._uncheckedKeys.delete(key)
-    }
+  markSnapshotsAsCheckedForTest(testName: string): void {
+    this._uncheckedKeys.forEach((uncheckedKey) => {
+      if (keyToTestName(uncheckedKey) === testName) {
+        this._uncheckedKeys.delete(uncheckedKey)
+      }
+    })
   }
 
   clearTest(testId: string): void {

diff --git a/packages/vitest/src/runtime/runners/test.ts b/packages/vitest/src/runtime/runners/test.ts
@@ -14,7 +14,7 @@ import type {
 import type { SerializedConfig } from '../config'
 import type { VitestExecutor } from '../execute'
 import { getState, GLOBAL_EXPECT, setState } from '@vitest/expect'
-import { getTestName, getTests } from '@vitest/runner/utils'
+import { getNames, getTestName, getTests } from '@vitest/runner/utils'
 import { createExpect } from '../../integrations/chai/index'
 import { getSnapshotClient } from '../../integrations/snapshot/chai'
 import { vi } from '../../integrations/vi'
@@ -58,7 +58,8 @@ export class VitestTestRunner implements VitestRunner {
       // mark snapshots in skipped tests as not obsolete
       for (const test of getTests(suite)) {
         if (test.mode === 'skip') {
-          this.snapshotClient.skipTest(suite.file.filepath, test.id)
+          const name = getNames(test).slice(1).join(' > ')
+          this.snapshotClient.skipTest(suite.file.filepath, name)
         }
       }