fix(types): fix test.each and describe.each types

packages/vitest/src/types/tasks.ts

@@ -103,24 +103,28 @@ interface EachFunction {
   ) => void
 }
 
-export type TestAPI<ExtraContext = {}> = ChainableFunction<
+type ChainableTestAPI<ExtraContext = {}> = ChainableFunction<
 'concurrent' | 'only' | 'skip' | 'todo' | 'fails',
 [name: string, fn?: TestFunction<ExtraContext>, timeout?: number],
 void
-> & {
+>
+
+export type TestAPI<ExtraContext = {}> = ChainableTestAPI<ExtraContext> & {
   each: EachFunction
-  skipIf(condition: any): TestAPI<ExtraContext>
-  runIf(condition: any): TestAPI<ExtraContext>
+  skipIf(condition: any): ChainableTestAPI<ExtraContext>
+  runIf(condition: any): ChainableTestAPI<ExtraContext>
 }
 
-export type SuiteAPI<ExtraContext = {}> = ChainableFunction<
+type ChainableSuiteAPI<ExtraContext = {}> = ChainableFunction<
 'concurrent' | 'only' | 'skip' | 'todo' | 'shuffle',
 [name: string, factory?: SuiteFactory],
 SuiteCollector<ExtraContext>
-> & {
+>
+
+export type SuiteAPI<ExtraContext = {}> = ChainableSuiteAPI & {
   each: EachFunction
-  skipIf(condition: any): SuiteAPI<ExtraContext>
-  runIf(condition: any): SuiteAPI<ExtraContext>
+  skipIf(condition: any): ChainableSuiteAPI<ExtraContext>
+  runIf(condition: any): ChainableSuiteAPI<ExtraContext>
 }
 
 export type HookListener<T extends any[], Return = void> = (...args: T) => Awaitable<Return>

test/core/test/basic.test.ts

@@ -57,18 +57,3 @@ it('timeout', () => new Promise(resolve => setTimeout(resolve, timeout)))
 it.fails('deprecated done callback', (done) => {
   done()
 })
-
-const shouldSkip = true
-
-it.skipIf(shouldSkip)('skipped', () => {
-  throw new Error('foo')
-})
-it.skipIf(!shouldSkip)('not skipped', () => {
-  expect(1).toBe(1)
-})
-it.runIf(!shouldSkip)('skipped 2', () => {
-  throw new Error('foo')
-})
-it.runIf(shouldSkip)('not skipped 2', () => {
-  expect(1).toBe(1)
-})

test/core/test/run-if.test.ts

@@ -0,0 +1,31 @@
+import { describe, expect, it } from 'vitest'
+
+describe('runIf', () => {
+  const shouldSkip = true
+
+  it.skipIf(shouldSkip)('skipped', () => {
+    throw new Error('foo')
+  })
+
+  it.skipIf(!shouldSkip)('not skipped', () => {
+    expect(1).toBe(1)
+  })
+
+  it.runIf(!shouldSkip)('skipped 2', () => {
+    throw new Error('foo')
+  })
+
+  it.runIf(shouldSkip)('not skipped 2', () => {
+    expect(1).toBe(1)
+  })
+
+  /*
+  it.runIf(!shouldSkip).each([1, 2, 3])('works with each skipped', (num) => {
+    expect(Number.isInteger(num)).toBe(true)
+  })
+
+  it.runIf(shouldSkip).each([1, 2, 3])('works with each not skipped', (num) => {
+    expect(Number.isInteger(num)).toBe(true)
+  })
+  */
+})