fixup types

microsoft · Aug 20, 2020 · e077d04 · e077d04
1 parent 4712b55
commit e077d04
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 20 deletions.
diff --git a/test-runner/src/builtin.fixtures.ts b/test-runner/src/builtin.fixtures.ts
@@ -40,15 +40,15 @@ declare global {
   const describe: DescribeFunction;
   const fdescribe: DescribeFunction;
   const xdescribe: DescribeFunction;
-  const it: ItFunction<FixtureState & WorkerState>;
-  const fit: ItFunction<FixtureState & WorkerState>;
-  const dit: ItFunction<FixtureState & WorkerState>;
-  const xit: ItFunction<FixtureState & WorkerState>;
+  const it: ItFunction<TestState & WorkerState & FixtureParameters>;
+  const fit: ItFunction<TestState & WorkerState & FixtureParameters>;
+  const dit: ItFunction<TestState & WorkerState & FixtureParameters>;
+  const xit: ItFunction<TestState & WorkerState & FixtureParameters>;
 
-  const beforeEach: (inner: (state: FixtureState & WorkerState) => Promise<void>) => void;
-  const afterEach: (inner: (state: FixtureState & WorkerState) => Promise<void>) => void;
-  const beforeAll: (inner: (state: WorkerState) => Promise<void>) => void;
-  const afterAll: (inner: (state: WorkerState) => Promise<void>) => void;
+  const beforeEach: (inner: (state: TestState & WorkerState & FixtureParameters) => Promise<void>) => void;
+  const afterEach: (inner: (state: TestState & WorkerState & FixtureParameters) => Promise<void>) => void;
+  const beforeAll: (inner: (state: WorkerState & FixtureParameters) => Promise<void>) => void;
+  const afterAll: (inner: (state: WorkerState & FixtureParameters) => Promise<void>) => void;
 }
 
 const mkdtempAsync = promisify(fs.mkdtemp);
@@ -58,7 +58,7 @@ declare global {
   interface FixtureParameters {
     parallelIndex: number;
   }
-  interface FixtureState {
+  interface TestState {
     tmpDir: string;
   }
 }

diff --git a/test-runner/src/cli.js b/test-runner/src/cli.js
@@ -25,9 +25,9 @@ let beforeFunction;
 let afterFunction;
 let matrix = {};
 
-global.before = (fn => beforeFunction = fn);
-global.after = (fn => afterFunction = fn);
-global.matrix = (m => matrix = m);
+global['before'] = (fn => beforeFunction = fn);
+global['after'] = (fn => afterFunction = fn);
+global['matrix'] = (m => matrix = m);
 
 program
   .version('Version ' + /** @type {any} */ (require)('../package.json').version)

diff --git a/test-runner/src/fixtures.ts b/test-runner/src/fixtures.ts
@@ -20,7 +20,7 @@ declare global {
   interface WorkerState {
   }
 
-  interface FixtureState {
+  interface TestState {
   }
 
   interface FixtureParameters {
@@ -32,10 +32,10 @@ const registrationsByFile = new Map();
 export let parameters: FixtureParameters = {} as FixtureParameters;
 export const parameterRegistrations = new Map();
 
-export function setParameters(params) {
+export function setParameters(params: any) {
   parameters = Object.assign(parameters, params);
   for (const name of Object.keys(params))
-    registerWorkerFixture(name, async ({}, test) => await test(parameters[name]));
+    registerWorkerFixture(name as keyof WorkerState, async ({}, test) => await test(parameters[name] as never));
 }
 
 
@@ -159,8 +159,8 @@ export class FixturePool {
   }
 }
 
-export function fixturesForCallback(callback: any) {
-  const names = new Set();
+export function fixturesForCallback(callback: any): string[] {
+  const names = new Set<string>();
   const visit  = (callback: any) => {
     for (const name of fixtureParameterNames(callback)) {
       if (name in names)
@@ -210,11 +210,11 @@ function innerRegisterFixture(name: any, scope: string, fn: any, caller: Functio
   registrationsByFile.get(file).push(registration);
 };
 
-export function registerFixture<T extends keyof FixtureState>(name: T, fn: (params: WorkerState & FixtureState, test: (arg: FixtureState[T]) => Promise<void>) => Promise<void>) {
+export function registerFixture<T extends keyof TestState>(name: T, fn: (params: FixtureParameters & WorkerState & TestState, test: (arg: TestState[T]) => Promise<void>) => Promise<void>) {
   innerRegisterFixture(name, 'test', fn, registerFixture);
 };
 
-export function registerWorkerFixture<T extends keyof WorkerState>(name: T, fn: (params: WorkerState, test: (arg: WorkerState[T]) => Promise<void>) => Promise<void>) {
+export function registerWorkerFixture<T extends keyof (WorkerState & FixtureParameters)>(name: T, fn: (params: FixtureParameters & WorkerState, test: (arg: (WorkerState & FixtureParameters)[T]) => Promise<void>) => Promise<void>) {
   innerRegisterFixture(name, 'worker', fn, registerWorkerFixture);
 };
 

diff --git a/test-runner/src/testCollector.js b/test-runner/src/testCollector.js
@@ -25,6 +25,7 @@ class TestCollector {
   constructor(files, matrix, options) {
     this._matrix = matrix;
     for (const name of Object.keys(matrix))
+      //@ts-ignore
       registerWorkerFixture(name, async ({}, test) => test());
     this._options = options;
     this.suite = new Mocha.Suite('', new Mocha.Context(), true);

diff --git a/test-runner/src/testRunner.ts b/test-runner/src/testRunner.ts
@@ -76,6 +76,7 @@ export class TestRunner extends EventEmitter {
     this._parsedGeneratorConfiguration = {};
     for (const {name, value} of this._configurationObject) {
       this._parsedGeneratorConfiguration[name] = value;
+      // @ts-ignore
       registerWorkerFixture(name, async ({}, test) => await test(value));
     }
     this._parsedGeneratorConfiguration['parallelIndex'] = workerId;

diff --git a/test-runner/tsconfig.json b/test-runner/tsconfig.json
@@ -12,6 +12,7 @@
     "declaration": true,
     "allowJs": true,
     "checkJs": true,
+    "declarationMap": true
   },
   "compileOnSave": true,
   "include": ["src"],

diff --git a/test/playwright.fixtures.ts b/test/playwright.fixtures.ts
@@ -54,7 +54,7 @@ declare global {
     browserName: string;
     headless: boolean;
     wire: boolean;
-    slowMo: boolean;
+    slowMo: number;
   }
 }