fix(runner): preserve fixtures when calling runif and skipif (fix vit…

…est-dev#4585) (vitest-dev#4591)
LorenzoBloedow · Dec 19, 2023 · 06a1fae · 06a1fae
1 parent eb0fe12
commit 06a1fae
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/runner/src/suite.ts b/packages/runner/src/suite.ts
@@ -269,8 +269,12 @@ export function createTaskCollector(
     }
   }
 
-  taskFn.skipIf = (condition: any) => (condition ? test.skip : test) as TestAPI
-  taskFn.runIf = (condition: any) => (condition ? test : test.skip) as TestAPI
+  taskFn.skipIf = function (this: TestAPI, condition: any) {
+    return condition ? this.skip : this
+  }
+  taskFn.runIf = function (this: TestAPI, condition: any) {
+    return condition ? this : this.skip
+  }
 
   taskFn.extend = function (fixtures: Fixtures<Record<string, any>>) {
     const _context = mergeContextFixtures(fixtures, context)

diff --git a/test/core/test/fixture-initialization.test.ts b/test/core/test/fixture-initialization.test.ts
@@ -82,6 +82,14 @@ describe('fixture initialization', () => {
     })
   })
 
+  myTest.runIf(true)('fixtures work with runIf', ({ a }) => {
+    expect(a).toBe(1)
+  })
+
+  myTest.skipIf(false)('fixtures work with skipIf', ({ a }) => {
+    expect(a).toBe(1)
+  })
+
   describe('fixture dependency', () => {
     myTest2('b => a', ({ b }) => {
       expect(b).toBe('2')