test: optimize the use of just-mock-vscode

Author: mato533

tests/__mocks__/vscode.ts tests/__mocks__/vscode.ctstests/__mocks__/vscode.ts renamed to tests/__mocks__/vscode.cts

@@ -3,4 +3,4 @@ import { vi } from 'vitest'
 
 const vscode = createVSCodeMock(vi)
 
-module.exports = { ...vscode }
+module.exports = vscode

tests/api/run.test.ts

@@ -3,14 +3,12 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
 import { TestRunner } from '../../src/api/run.js'
 import { TEST_ID_SEPARATOR } from '../../src/constants.js'
 import { createTestItem } from '../utils.js'
-// import type * as vscode from 'vscode'
+
 import type { WdioExtensionWorkerInterface } from '../../src/api/types.js'
 import type { ResultSet } from '../../src/reporter/types.js'
 
 // Mock dependencies
-vi.mock('vscode', () => {
-    return {}
-})
+vi.mock('vscode', () => import('../__mocks__/vscode.cjs'))
 
 vi.mock('../../src/utils/logger', () => ({
     log: {

tests/api/utils.test.ts

@@ -4,9 +4,7 @@ import { loggingFn } from '../../src/api/utils.js'
 import { LOG_LEVEL } from '../../src/constants.js'
 import { log } from '../../src/utils/logger.js'
 
-vi.mock('vscode', () => {
-    return {}
-})
+vi.mock('vscode', () => import('../__mocks__/vscode.cjs'))
 
 vi.mock('../../src/utils/logger.js', () => ({
     log: {

tests/api/worker.test.ts

@@ -12,7 +12,6 @@ import type * as WebSocket from 'ws'
 import type { ExtensionApi } from '../../src/api/types.js'
 
 // Mock dependencies
-vi.mock('vscode')
 vi.mock('node:child_process')
 vi.mock('node:http')
 vi.mock('ws', () => {

tests/config/index.test.ts

@@ -6,19 +6,10 @@ import { ExtensionConfigManager } from '../../src/config/index.js'
 import { DEFAULT_CONFIG_VALUES, EXTENSION_ID } from '../../src/constants.js'
 import { log } from '../../src/utils/logger.js'
 
+import type { MockWorkspace } from 'jest-mock-vscode'
+
 // Mock dependencies
-vi.mock('vscode', () => {
-    return {
-        workspace: {
-            getConfiguration: vi.fn(),
-            workspaceFolders: undefined,
-        },
-        ConfigurationChangeEvent: vi.fn(),
-        WorkspaceFolder: vi.fn(),
-        EventEmitter: vi.fn(),
-        Disposable: vi.fn(),
-    }
-})
+vi.mock('vscode', async () => import('../__mocks__/vscode.cjs'))
 vi.mock('../../src/config/find.js')
 vi.mock('../../src/config/watcher.js', () => {
     return {}
@@ -180,9 +171,6 @@ describe('ExtensionConfigManager', () => {
 
     describe('initialize', () => {
         it('should return empty array when no workspace folders', async () => {
-            // Setup
-            Object.defineProperty(vscode.workspace, 'workspaceFolders', { value: [] })
-
             // Execute
             const result = await configManager.initialize()
 
@@ -194,12 +182,9 @@ describe('ExtensionConfigManager', () => {
 
         it('should initialize workspaces and find config files', async () => {
             // Setup
-            const mockWorkspaceFolder1 = { uri: { fsPath: '/workspace1' } } as vscode.WorkspaceFolder
-            const mockWorkspaceFolder2 = { uri: { fsPath: '/workspace2' } } as vscode.WorkspaceFolder
-
-            Object.defineProperty(vscode.workspace, 'workspaceFolders', {
-                value: [mockWorkspaceFolder1, mockWorkspaceFolder2],
-            })
+            const mockWorkspaceFolder1 = { uri: vscode.Uri.file('/workspace1') } as vscode.WorkspaceFolder
+            const mockWorkspaceFolder2 = { uri: vscode.Uri.file('/workspace2') } as vscode.WorkspaceFolder
+            ;(vscode.workspace as MockWorkspace).setWorkspaceFolders([mockWorkspaceFolder1, mockWorkspaceFolder2])
 
             const wdioConfigFiles1 = ['/workspace1/wdio.conf.js', '/workspace1/wdio.e2e.conf.js']
             const wdioConfigFiles2 = ['/workspace2/wdio.conf.js']
@@ -229,8 +214,9 @@ describe('ExtensionConfigManager', () => {
 
         it('should handle workspaces with no config files', async () => {
             // Setup
-            const mockWorkspaceFolder = { uri: { fsPath: '/workspace' } } as vscode.WorkspaceFolder
-            Object.defineProperty(vscode.workspace, 'workspaceFolders', { value: [mockWorkspaceFolder] })
+            const mockWorkspaceFolder = { uri: vscode.Uri.file('/workspace') } as vscode.WorkspaceFolder
+            ;(vscode.workspace as MockWorkspace).setWorkspaceFolders([mockWorkspaceFolder])
+
             vi.mocked(findWdioConfig).mockResolvedValueOnce([])
 
             // Execute
@@ -255,8 +241,8 @@ describe('ExtensionConfigManager', () => {
 
         it('should return all config paths after initialization', async () => {
             // Setup
-            const mockWorkspaceFolder = { uri: { fsPath: '/workspace' } } as vscode.WorkspaceFolder
-            Object.defineProperty(vscode.workspace, 'workspaceFolders', { value: [mockWorkspaceFolder] })
+            const mockWorkspaceFolder = { uri: vscode.Uri.file('/workspace') } as vscode.WorkspaceFolder
+            ;(vscode.workspace as MockWorkspace).setWorkspaceFolders([mockWorkspaceFolder])
 
             const wdioConfigFiles = ['/workspace/wdio.conf.js', '/workspace/wdio.e2e.conf.js']
             vi.mocked(findWdioConfig).mockResolvedValueOnce(wdioConfigFiles)
@@ -279,13 +265,6 @@ describe('ExtensionConfigManager', () => {
 
     describe('dispose', () => {
         it('should clear workspaces data', async () => {
-            // Setup
-            const mockWorkspaceFolder = { uri: { fsPath: '/workspace' } } as vscode.WorkspaceFolder
-            Object.defineProperty(vscode.workspace, 'workspaceFolders', { value: [mockWorkspaceFolder] })
-
-            const wdioConfigFiles = ['/workspace/wdio.conf.js']
-            vi.mocked(findWdioConfig).mockResolvedValueOnce(wdioConfigFiles)
-
             await configManager.initialize()
             expect(configManager.workspaces).toBeDefined()
 

tests/config/watcher.test.ts

@@ -1,15 +1,15 @@
 import { normalize } from 'node:path'
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
+import * as vscode from 'vscode'
 
 import { ConfigFileWatcher } from '../../src/config/watcher.js'
 import { FileWatcherManager } from '../../src/utils/watcher.js'
-import type * as vscode from 'vscode'
 import type { ServerManager } from '../../src/api/index.js'
 import type { ExtensionConfigManager } from '../../src/config/index.js'
 import type { RepositoryManager } from '../../src/test/index.js'
 
-vi.mock('vscode')
+vi.mock('vscode', async () => await import('../__mocks__/vscode.cjs'))
 
 // Mock dependencies
 vi.mock('../../src/utils/logger.js', () => ({
@@ -20,13 +20,13 @@ vi.mock('../../src/utils/logger.js', () => ({
 
 // Mock functions from test/index.js
 vi.mock('../../src/test/index.js', () => {
-    const TestfileWatcher=vi.fn()
+    const TestfileWatcher = vi.fn()
     TestfileWatcher.prototype.enable = vi.fn()
     TestfileWatcher.prototype.refreshWatchers = vi.fn()
-    return ({
+    return {
         TestfileWatcher,
         convertUriToPath: vi.fn((uri) => uri.fsPath),
-    })
+    }
 })
 
 // Mock normalizePath function
@@ -58,9 +58,7 @@ describe('ConfigFileWatcher', () => {
         vi.clearAllMocks()
 
         // Create mock URI
-        mockUri = {
-            fsPath: '/path/to/wdio.conf.js',
-        } as unknown as vscode.Uri
+        mockUri = vscode.Uri.file('/path/to/wdio.conf.js')
 
         // Create mock repositories
         mockRepo1 = {
@@ -150,7 +148,7 @@ describe('ConfigFileWatcher', () => {
             const result = watcher['getFilePatterns']()
 
             // Verify
-            expect(result).toEqual([{ pattern:'**/wdio.conf.{js,ts}' }])
+            expect(result).toEqual([{ pattern: '**/wdio.conf.{js,ts}' }])
         })
 
         it('should return empty array if no patterns are defined', () => {

tests/test/reporter.test.ts

@@ -9,10 +9,10 @@ import type { TestRepository } from '../../src/test/repository.js'
 
 // Mock dependencies
 vi.mock('vscode', async () => {
-    const mockModule = await import('../__mocks__/vscode.js')
+    const mockModule = await import('../__mocks__/vscode.cjs')
     return {
-        TestMessage: vi.fn(),
         ...mockModule,
+        TestMessage: vi.fn(),
     }
 })
 vi.mock('../../src/test/repository')

tests/test/runHandler.test.ts

@@ -11,7 +11,9 @@ import type { ExtensionConfigManager } from '../../src/config/index.js'
 import type { RepositoryManager } from '../../src/test/index.js'
 
 vi.mock('vscode', async () => {
+    const mockVscode = await import('../__mocks__/vscode.cjs')
     return {
+        ...mockVscode,
         TestMessage: vi.fn(),
     }
 })

tests/test/utils.test.ts

@@ -6,7 +6,9 @@ import type * as vscode from 'vscode'
 import type { RepositoryManager } from '../../src/test/manager.js'
 
 vi.mock('vscode', async () => {
+    const mockVscode = await import('../__mocks__/vscode.cjs')
     return {
+        ...mockVscode,
         TestRunProfileKind: {
             Run: 1,
         },

tests/test/watcher.test.ts

@@ -8,13 +8,7 @@ import { FileWatcherManager } from '../../src/utils/watcher.js'
 import type * as vscode from 'vscode'
 import type { RepositoryManager } from '../../src/test/manager.js'
 
-vi.mock('vscode', () => {
-    return {
-        Uri: {
-            file: vi.fn((f) => ({ fsPath: f })),
-        },
-    }
-})
+vi.mock('vscode', () => import('../__mocks__/vscode.cjs'))
 
 // Mock dependencies
 vi.mock('../../src/utils/logger.js', () => ({