fix: remove hoist from test (#84)

Signed-off-by: lstocchi <lstocchi@redhat.com>
podman-desktop · Jul 25, 2024 · aa1534f · aa1534f
1 parent 52c33f4
commit aa1534f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/util.spec.ts b/src/util.spec.ts
@@ -25,16 +25,6 @@ import type { MinikubeInstaller } from './minikube-installer';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 
-const { config } = vi.hoisted(() => {
-  return {
-    config: {
-      get: vi.fn(),
-      has: vi.fn(),
-      update: vi.fn(),
-    },
-  };
-});
-
 vi.mock('@podman-desktop/api', async () => {
   return {
     window: {
@@ -52,7 +42,7 @@ vi.mock('@podman-desktop/api', async () => {
       isLinux: vi.fn(),
     },
     configuration: {
-      getConfiguration: (): extensionApi.Configuration => config,
+      getConfiguration: vi.fn(),
     },
     ProgressLocation: {
       APP_ICON: 1,
@@ -73,9 +63,13 @@ vi.mock('node:fs', async () => {
 });
 
 const originalProcessEnv = process.env;
+const configGetMock = vi.fn();
 beforeEach(() => {
   vi.resetAllMocks();
   process.env = {};
+  vi.mocked(extensionApi.configuration.getConfiguration).mockReturnValue({
+    get: configGetMock,
+  } as unknown as extensionApi.Configuration);
 });
 
 afterEach(() => {
@@ -103,8 +97,7 @@ test('getMinikubeHome with empty configuration property', async () => {
   const existingConfigHome = '';
   process.env.MINIKUBE_HOME = existingEnvHome;
 
-  const spyGetConfiguration = vi.spyOn(config, 'get');
-  spyGetConfiguration.mockReturnValue(existingConfigHome);
+  configGetMock.mockReturnValue(existingConfigHome);
 
   const computedHome = getMinikubeHome();
 
@@ -117,8 +110,7 @@ test('getMinikubeHome with empty configuration property', async () => {
   const existingConfigHome = '/my-another-existing-minikube-home';
   process.env.MINIKUBE_HOME = existingEnvHome;
 
-  const spyGetConfiguration = vi.spyOn(config, 'get');
-  spyGetConfiguration.mockReturnValue(existingConfigHome);
+  configGetMock.mockReturnValue(existingConfigHome);
 
   const computedHome = getMinikubeHome();
 

diff --git a/src/util.ts b/src/util.ts
@@ -33,7 +33,6 @@ export interface RunOptions {
   logger?: extensionApi.Logger;
 }
 
-const minikubeConfiguration = extensionApi.configuration.getConfiguration('minikube');
 const macosExtraPath = '/usr/local/bin:/opt/homebrew/bin:/opt/local/bin:/opt/podman/bin';
 
 export function getMinikubePath(): string {
@@ -50,6 +49,7 @@ export function getMinikubePath(): string {
 }
 
 export function getMinikubeHome(): string | undefined {
+  const minikubeConfiguration = extensionApi.configuration.getConfiguration('minikube');
   const minikubeHome = minikubeConfiguration.get<string>('home');
   // Check env if configuration is not applied in UI
   if (!minikubeHome) {