Set up integration tests over webpack extension bundle

Author: xsburg

client/.vscode/launch.json

@@ -7,24 +7,27 @@
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
-            "args": ["--extensionDevelopmentPath=${workspaceRoot}"],
+            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outFiles": ["${workspaceRoot}/dist/**/*.js"],
+            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
             "preLaunchTask": "npm: compile:dev"
         },
         {
             "name": "Extension Tests",
             "type": "extensionHost",
             "request": "launch",
             "runtimeExecutable": "${execPath}",
+            "env": {
+                "TEST_WORKSPACES_DIR": "${workspaceFolder}/dist/test-workspaces"
+            },
             "args": [
-                "--extensionDevelopmentPath=${workspaceRoot}/out",
-                "--extensionTestsPath=${workspaceRoot}/out/tests"
+                "--extensionDevelopmentPath=${workspaceFolder}",
+                "--extensionTestsPath=${workspaceFolder}/tests/runtime"
             ],
             "stopOnEntry": false,
             "sourceMaps": true,
-            "outFiles": ["${workspaceRoot}/out/**/*.js"],
+            "outFiles": ["${workspaceFolder}/dist/**/*.js"],
             "preLaunchTask": "npm: compile:test"
         }
     ]

client/.vscode/tasks.json

@@ -5,15 +5,18 @@
     "tasks": [
         {
             "type": "npm",
-            "script": "compile:watch",
-            "problemMatcher": "$tsc-watch",
-            "isBackground": true,
+            "script": "compile:dev",
+            "problemMatcher": "$tsc",
+            "presentation": {
+                "reveal": "never"
+            }
+        },
+        {
+            "type": "npm",
+            "script": "compile:test",
+            "problemMatcher": "$tsc",
             "presentation": {
                 "reveal": "never"
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
             }
         }
     ]

client/package.json

@@ -31,11 +31,10 @@
     "scripts": {
         "postinstall": "node ./node_modules/vscode/bin/install",
         "clean": "rimraf out && rimraf dist",
-        "compile:dev": "webpack --mode none && cpx ./tests/__simple-workspace__/**/* ./dist/tests/__simple-workspace__",
-        "compile:prod": "webpack --mode production && cpx ./tests/__simple-workspace__/**/* ./dist/tests/__simple-workspace__",
-        "compile:watch": "webpack --mode none --watch",
-        "compile:test": "tsc -p ./ && cpx ./tests/__simple-workspace__/**/* ./out/tests/__simple-workspace__",
-        "test": "CODE_TESTS_PATH=${PWD}/out/tests node ./node_modules/vscode/bin/test"
+        "compile:dev": "webpack --mode none",
+        "compile:test": "webpack --mode none && cpx ./tests/__simple-workspace__/**/* ./dist/test-workspaces/__simple-workspace__",
+        "compile:prod": "webpack --mode production",
+        "test": "npm run compile:test && TEST_WORKSPACES_DIR=${PWD}/dist/test-workspaces CODE_TESTS_PATH=${PWD}/tests/runtime CODE_EXTENSIONS_PATH=${PWD} node ./node_modules/vscode/bin/test"
     },
     "main": "./dist/extension",
     "activationEvents": [

client/src/extension.ts

@@ -23,3 +23,12 @@ export async function activate(context: ExtensionContext) {
 }
 
 export function deactivate() {}
+
+if (process.env.NODE_ENV !== 'production') {
+    // tslint:disable-next-line:no-var-requires
+    const testRunnerExports = require('../tests/index');
+    module.exports.testRunnerExports = testRunnerExports;
+    module.exports.defineIntegrationTests = function defineTests() {
+        require('../tests/integration.test');
+    };
+}

client/tests/integration.test.ts

@@ -6,7 +6,11 @@ import { executeCodeActionCommand } from '../src/executeCodeActionCommand';
 import langService from '../src/services/langService';
 
 function getWorkspaceFilePath(workspaceName: string, relativeFilePath: string) {
-    return path.join(__dirname, `__${workspaceName}__`, relativeFilePath);
+    const testWorkspacesDir = process.env.TEST_WORKSPACES_DIR;
+    if (!testWorkspacesDir) {
+        throw new Error('TEST_WORSPACES_DIR variable is not set.');
+    }
+    return path.join(testWorkspacesDir, `__${workspaceName}__`, relativeFilePath);
 }
 
 function createDiagnosticsMock(): vscode.CodeActionContext {

client/tests/runtime/index.js

@@ -0,0 +1,3 @@
+const extension = require('../../dist/extension.js');
+
+module.exports = extension.testRunnerExports;

client/tests/runtime/integration.test.js

@@ -0,0 +1,3 @@
+const extension = require('../../dist/extension.js');
+
+extension.defineIntegrationTests();

client/webpack.config.js

@@ -10,7 +10,6 @@ const config = {
 
     entry: {
         extension: './src/extension.ts'
-        //tests: './tests/index.ts'
     },
     output: {
         path: path.resolve(__dirname, 'dist'),

server/.vscode/tasks.json

@@ -15,6 +15,11 @@
                 "kind": "build",
                 "isDefault": true
             }
+        },
+        {
+            "type": "npm",
+            "script": "compile:dev",
+            "problemMatcher": "$tsc"
         }
     ]
 }

server/src/services/codeModService.ts

@@ -22,10 +22,9 @@ function parseCodeMod(id: string, modFn: CodeModExports): CodeModDefinition {
 }
 
 export function requireFiles() {
-    debugger;
     let result: CodeModDefinition[];
     if (typeof __webpack_require__ === 'function') {
-        let context = (require as any).context('../codemods');
+        let context = (require as any).context('../codemods', true, /\.ts$/);
         result = context.keys().map((k: any) => parseCodeMod(k, context(k)));
     } else {
         const embeddedCodeModDir = path.join(__dirname, '..', 'codemods');