Merge branch 'main' into fix-empty-test-cases-issue

Author: Danielku15

.github/workflows/build.yml

@@ -50,6 +50,22 @@ jobs:
         run: npm test
         if: runner.os != 'Linux'
 
+      - name: Pack for VSIX Tests
+        run: npm run package:test
+        env:
+          TEST_TEMP: ${{ runner.temp }}        
+
+      - name: Run VSIX Tests (Linux)
+        run: xvfb-run -a npm run test:vsix
+        env:
+          TEST_TEMP: ${{ runner.temp }}
+        if: runner.os == 'Linux'
+      - name: Run VSIX Tests (Win/MacOS)
+        run: npm run test:vsix
+        env:
+          TEST_TEMP: ${{ runner.temp }}        
+        if: runner.os != 'Linux'
+
       - name: Run Linter
         if: always()
         run: npm run lint

.gitignore

@@ -134,3 +134,4 @@ dist
 out
 *.vsix
 vscode*.d.ts
+tmp

.vscode-test.mjs

@@ -3,48 +3,54 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { fileURLToPath } from 'url';
 
+
 const dirname = fileURLToPath(new URL('.', import.meta.url));
 const integrationTestDir = path.join(dirname, 'out/test/integration');
 const workspaceBaseDir = path.join(dirname, 'test-workspaces');
 
 const vsCodeVersion = process.env.VSCODE_TEST_VERSION ?? 'stable';
 const vsCodePlatform = process.env.VSCODE_TEST_PLATFORM ?? 'desktop';
 
-let createCommonOptions = (label) => {
-  if (process.env.GITHUB_ACTIONS) {
-    return {
-      platform: vsCodePlatform,
-      version: vsCodeVersion,
-      env: {
-        MOCHA_COLORS: 'true',
-        MOCHA_VSCODE_TEST: 'true'
-      },
-      mocha: {
-        ui: 'bdd',
+let extensionDevelopmentPath = '';
 
-        reporter: path.join(dirname, '.vscode-ci-test-reporter.js'),
-        reporterOption: {
-          jsonReporterOption: {
-            output: path.join(dirname, 'test-results', `${label}.json`),
-          },
-        },
-        timeout: 60_000,
-      },
-    };
-  } else {
-    return {
-      platform: vsCodePlatform,
-      version: vsCodeVersion,
-      env: {
-        MOCHA_VSCODE_TEST: 'true'
-      },
-      mocha: {
-        ui: 'bdd',
-        timeout: 60_000,
+const testMode = process.env.TEST_MODE ?? 'normal';
+
+if (testMode === 'vsix') {
+  const tempDir = process.env.TEST_TEMP ?? path.join(dirname, 'tmp')
+  extensionDevelopmentPath = path.resolve(path.join(tempDir, 'vsix', 'extension'));
+}
+
+function createCommonOptions(label) {
+  /**@type {import('@vscode/test-cli').TestConfiguration} */
+  const options = {
+    platform: vsCodePlatform,
+    version: vsCodeVersion,
+    env: {
+      MOCHA_VSCODE_TEST: 'true',
+    },
+    mocha: {
+      ui: 'bdd',
+      timeout: 60_000,
+    },
+  };
+
+  if (process.env.GITHUB_ACTIONS) {
+    options.mocha.reporter = path.join(dirname, '.vscode-ci-test-reporter.js');
+    options.mocha.reporterOption = {
+      jsonReporterOption: {
+        output: path.join(dirname, 'test-results', `${testMode}-${label}.json`),
       },
     };
+    options.env.MOCHA_COLORS = 'true';
+  }
+
+  if (extensionDevelopmentPath) {
+    options.extensionDevelopmentPath = extensionDevelopmentPath;
   }
-};
+
+
+  return options;
+}
 
 const config = [
   {