Use jest.MockedFunction

Author: robertbrignull

extensions/ql-vscode/test/vscode-tests/cli-integration/local-queries/skeleton-query-wizard.test.ts

@@ -56,7 +56,9 @@ describe("SkeletonQueryWizard", () => {
   let createExampleQlFileSpy: jest.SpiedFunction<
     typeof QlPackGenerator.prototype.createExampleQlFile
   >;
-  let promptImportGithubDatabaseMock: jest.Mock<DatabaseItem | undefined>;
+  let promptImportGithubDatabaseMock: jest.MockedFunction<
+    DatabaseFetcher["promptImportGithubDatabase"]
+  >;
   let openTextDocumentSpy: jest.SpiedFunction<
     typeof workspace.openTextDocument
   >;

extensions/ql-vscode/test/vscode-tests/no-workspace/databases/github-databases/download.test.ts

@@ -10,7 +10,6 @@ import {
   askForGitHubDatabaseDownload,
   downloadDatabaseFromGitHub,
 } from "../../../../../src/databases/github-databases/download";
-import type { DatabaseItem } from "../../../../../src/databases/local-databases";
 import type { GitHubDatabaseConfig } from "../../../../../src/config";
 import type { DatabaseFetcher } from "../../../../../src/databases/database-fetcher";
 import * as dialog from "../../../../../src/common/vscode/dialog";
@@ -113,7 +112,9 @@ describe("downloadDatabaseFromGitHub", () => {
   ];
 
   let showQuickPickSpy: jest.SpiedFunction<typeof window.showQuickPick>;
-  let downloadGitHubDatabaseFromUrlMock: jest.Mock<DatabaseItem | undefined>;
+  let downloadGitHubDatabaseFromUrlMock: jest.MockedFunction<
+    DatabaseFetcher["downloadGitHubDatabaseFromUrl"]
+  >;
 
   beforeEach(() => {
     octokit = mockedObject<Octokit>({});

extensions/ql-vscode/test/vscode-tests/no-workspace/databases/github-databases/updates.test.ts

@@ -8,10 +8,7 @@ import {
   mockedQuickPickItem,
 } from "../../../utils/mocking.helpers";
 import type { CodeqlDatabase } from "../../../../../src/databases/github-databases/api";
-import type {
-  DatabaseItem,
-  DatabaseManager,
-} from "../../../../../src/databases/local-databases";
+import type { DatabaseManager } from "../../../../../src/databases/local-databases";
 import type { GitHubDatabaseConfig } from "../../../../../src/config";
 import type { DatabaseFetcher } from "../../../../../src/databases/database-fetcher";
 import * as dialog from "../../../../../src/common/vscode/dialog";
@@ -368,7 +365,9 @@ describe("downloadDatabaseUpdateFromGitHub", () => {
   ];
 
   let showQuickPickSpy: jest.SpiedFunction<typeof window.showQuickPick>;
-  let downloadGitHubDatabaseFromUrlMock: jest.Mock<DatabaseItem | undefined>;
+  let downloadGitHubDatabaseFromUrlMock: jest.MockedFunction<
+    DatabaseFetcher["downloadGitHubDatabaseFromUrl"]
+  >;
 
   beforeEach(() => {
     octokit = mockedObject<Octokit>({});