fix(runner): resolve CI regressions and type errors in mergeTests

Author: Ujjwaljain16

packages/runner/src/fixture.ts

@@ -17,10 +17,10 @@ export interface TestFixtureItem extends FixtureOptions {
 export type UserFixtures = Record<string, unknown>
 export type FixtureRegistrations = Map<string, TestFixtureItem>
 
-const kPropsSymbol = Symbol('$vitest:fixture-props')
+const kPropsSymbol = Symbol('vitest:fixture-props')
 
 interface FixturePropsOptions {
-  original?: Function
+  original: any
   index?: number
 }
 

packages/runner/src/suite.ts

@@ -615,11 +615,11 @@ function createSuite() {
       options.shuffle = shuffle
     }
 
-    let mode: RunMode = (this.only ?? options.only)
+    let mode: RunMode = (this.only || options.only)
       ? 'only'
-      : (this.skip ?? options.skip)
+      : (this.skip || options.skip)
           ? 'skip'
-          : (this.todo ?? options.todo)
+          : (this.todo || options.todo)
               ? 'todo'
               : 'run'