From 29a2158e3d5ad4e7855e63a296592682b054c388 Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Sun, 20 Dec 2020 14:01:06 +0200 Subject: [PATCH] fix tests Signed-off-by: Jari Kolehmainen --- src/extensions/__tests__/extension-discovery.test.ts | 6 +++--- src/extensions/extension-discovery.ts | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/extensions/__tests__/extension-discovery.test.ts b/src/extensions/__tests__/extension-discovery.test.ts index 0317319329..d0066c3a7e 100644 --- a/src/extensions/__tests__/extension-discovery.test.ts +++ b/src/extensions/__tests__/extension-discovery.test.ts @@ -10,7 +10,7 @@ jest.mock("chokidar", () => ({ jest.mock("../extension-installer", () => ({ extensionInstaller: { extensionPackagesRoot: "", - installPackages: jest.fn() + installPackage: jest.fn() } })); @@ -41,7 +41,7 @@ describe("ExtensionDiscovery", () => { // Need to force isLoaded to be true so that the file watching is started extensionDiscovery.isLoaded = true; - await extensionDiscovery.initMain(); + await extensionDiscovery.watchExtensions(); extensionDiscovery.events.on("add", (extension: InstalledExtension) => { expect(extension).toEqual({ @@ -81,7 +81,7 @@ describe("ExtensionDiscovery", () => { // Need to force isLoaded to be true so that the file watching is started extensionDiscovery.isLoaded = true; - await extensionDiscovery.initMain(); + await extensionDiscovery.watchExtensions(); const onAdd = jest.fn(); diff --git a/src/extensions/extension-discovery.ts b/src/extensions/extension-discovery.ts index 306515f2da..c9d7b76a9c 100644 --- a/src/extensions/extension-discovery.ts +++ b/src/extensions/extension-discovery.ts @@ -170,7 +170,7 @@ export class ExtensionDiscovery { await this.removeSymlinkByManifestPath(manifestPath); // Install dependencies for the new extension - await extensionInstaller.installPackage(extension.absolutePath); + await this.installPackage(extension.absolutePath); this.extensions.set(extension.id, extension); logger.info(`${logModule} Added extension ${extension.manifest.name}`); @@ -369,6 +369,10 @@ export class ExtensionDiscovery { return await extensionInstaller.installPackages(packageJsonPath, packagesJson); } + async installPackage(name: string) { + return extensionInstaller.installPackage(name); + } + async loadBundledExtensions() { const extensions: InstalledExtension[] = []; const folderPath = this.bundledFolderPath;