Ugly (temp) TypeScript fixes

paescuj · paescuj · commit 71c76d7eb366 · 2022-08-24T13:25:39.000+02:00
diff --git a/src/command-parser/expand-npm-wildcard.spec.ts b/src/command-parser/expand-npm-wildcard.spec.ts
@@ -5,20 +5,19 @@ import { CommandInfo } from '../command.js';
 import { ExpandNpmWildcard } from './expand-npm-wildcard.js';
 
 let parser: ExpandNpmWildcard;
-let readPkg: jest.Mock;
+const readPkg = jest.fn();
 
 const createCommandInfo = (command: string): CommandInfo => ({
     command,
     name: '',
 });
 
 beforeEach(() => {
-    readPkg = jest.fn();
     parser = new ExpandNpmWildcard(readPkg);
 });
 
 afterEach(() => {
-    jest.restoreAllMocks();
+    readPkg.mockClear();
 });
 
 describe('ExpandNpmWildcard#readPackage', () => {
diff --git a/src/command.spec.ts b/src/command.spec.ts
@@ -31,7 +31,7 @@ beforeEach(() => {
             },
         });
     })();
-    spawn = jest.fn().mockReturnValue(process);
+    spawn = jest.fn().mockReturnValue(process) as jest.Mocked<SpawnCommand>;
     killProcess = jest.fn();
 });
 
diff --git a/src/concurrently.spec.ts b/src/concurrently.spec.ts
@@ -29,7 +29,7 @@ beforeEach(() => {
     controllers = [
         { handle: jest.fn((commands) => ({ commands, onFinish: onFinishHooks[0] })) },
         { handle: jest.fn((commands) => ({ commands, onFinish: onFinishHooks[1] })) },
-    ];
+    ] as jest.Mocked<FlowController>[];
 });
 
 it('fails if commands is not an array', () => {
diff --git a/src/fixtures/fake-command.ts b/src/fixtures/fake-command.ts
@@ -21,7 +21,7 @@ export class FakeCommand extends Command {
                 ...info,
             },
             {},
-            jest.fn(),
+            jest.fn() as jest.Mock<ChildProcess>,
             jest.fn()
         );
 
diff --git a/src/logger.spec.ts b/src/logger.spec.ts
@@ -4,7 +4,7 @@ import chalk from 'chalk';
 import { FakeCommand } from './fixtures/fake-command.js';
 import { Logger } from './logger.js';
 
-let emitSpy: jest.SpyInstance;
+let emitSpy: unknown;
 
 beforeEach(() => {
     // Force chalk to use colours, otherwise tests may pass when they were supposed to be failing.
@@ -40,7 +40,7 @@ describe('#log()', () => {
     it('does not prepend prefix if last call did not finish with a LF', () => {
         const logger = createLogger({});
         logger.log('foo', 'bar');
-        emitSpy.mockClear();
+        (emitSpy as jest.SpyInstance).mockClear();
         logger.log('foo', 'baz');
 
         expect(logger.emit).toHaveBeenCalledTimes(1);
