Fixing issues with Jest and the new version of LanguageClient

microsoft · Sep 14, 2024 · 62d4265 · 62d4265
1 parent d4f3858
commit 62d4265
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/extension.ts b/src/extension.ts
@@ -40,10 +40,12 @@ import {
 import { LaunchConfigManager, providedHeadlessDebugConfig, providedLaunchDevToolsConfig } from './launchConfigManager';
 import { ErrorReporter } from './errorReporter';
 import { ErrorCodes } from './common/errorCodes';
-import {
-    LanguageClient,
+import type {
     LanguageClientOptions,
     ServerOptions,
+} from 'vscode-languageclient/node';
+import {
+    LanguageClient,
     TransportKind,
 } from 'vscode-languageclient/node';
 import type { installFailed, showOutput } from 'vscode-webhint/dist/src/utils/notifications';

diff --git a/test/extension.test.ts b/test/extension.test.ts
@@ -3,7 +3,7 @@
 
 import { ExtensionContext, Uri} from "vscode";
 import TelemetryReporter from "vscode-extension-telemetry";
-import { createFakeExtensionContext, createFakeTelemetryReporter, createFakeVSCode, Mocked } from "./helpers/helpers";
+import { createFakeExtensionContext, createFakeTelemetryReporter, createFakeVSCode, createFakeLanguageClient, Mocked } from "./helpers/helpers";
 import {
     buttonCode,
     IRemoteTargetJson,
@@ -14,6 +14,7 @@ import {
 } from "../src/utils";
 
 jest.mock("vscode", () => createFakeVSCode(), { virtual: true });
+jest.mock("vscode-languageclient/node", () => createFakeLanguageClient(), { virtual: true });
 
 describe("extension", () => {
     const fakeRuntimeConfig: Partial<IRuntimeConfig> = {};
@@ -60,6 +61,9 @@ describe("extension", () => {
                 };
             });
 
+            const mockLanguageClient = createFakeLanguageClient()
+            jest.doMock("vscode-languageclient/node", () => mockLanguageClient, { virtual: true });
+
             // Mock out vscode command registration
             const mockVSCode = createFakeVSCode();
             commandMock = mockVSCode.commands.registerCommand;

diff --git a/test/helpers/helpers.ts b/test/helpers/helpers.ts
@@ -212,3 +212,19 @@ export function getFirstCallback(mock: jest.Mock, callbackArgIndex: number = 0):
     { callback: Function, thisObj: object } {
     return { callback: mock.mock.calls[0][callbackArgIndex], thisObj: mock.mock.instances[0] };
 }
+
+export function createFakeLanguageClient() {
+    const createFakeLanguageClient = jest.fn().mockImplementation(() => {
+        return {
+            LanguageClient: function LanguageClient() { /* constructor */ }
+        }
+    });
+    const createFakeLTransportKind = jest.fn().mockImplementation(() => {
+        return {
+            TransportKind: function TransportKind() { /* constructor */ }
+        }
+    });
+    return { LanguageClient: createFakeLanguageClient,
+            TransportKind: createFakeLTransportKind
+     }
+}