web tests

Author: hayemaxi

packages/amazonq/.vscode/launch.json

@@ -108,11 +108,11 @@
                 "--disable-extension=amazonwebservices.aws-toolkit-vscode",
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "--extensionDevelopmentKind=web",
-                "--extensionTestsPath=${workspaceFolder}/dist/test/web/index",
-                "${workspaceRoot}/dist/src/testFixtures/workspaceFolder"
+                "--extensionTestsPath=${workspaceFolder}/dist/test/web/testRunnerWebCore",
+                "${workspaceFolder}/../core/dist/src/testFixtures/workspaceFolder"
             ],
             "outFiles": ["${workspaceFolder}/dist/**/*.js", "${workspaceFolder}/../core/dist/**/*.js"],
-            "preLaunchTask": "testsBuildWatch",
+            "preLaunchTask": "webRun",
             "presentation": {
                 "group": "3_ExtensionTests",
                 "order": 3

packages/amazonq/package.json

@@ -52,15 +52,15 @@
         "syncPackageJson": "ts-node ./scripts/build/syncPackageJson.ts",
         "clean": "ts-node ../../scripts/clean.ts dist/ LICENSE NOTICE",
         "compile": "npm run clean && npm run buildScripts && webpack",
-        "compileDev": "npm run compile -- --mode development",
+        "compileDev": "npm run testCompile && webpack --mode development",
         "compileOnly": "tsc -p ./",
         "package": "ts-node ../../scripts/package.ts",
         "lint": "true",
         "watch": "npm run clean && npm run buildScripts && tsc -watch -p ./",
         "testCompile": "npm run clean && npm run buildScripts && npm run compileOnly",
         "test": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts unit dist/test/unit/index.js ../core/dist/src/testFixtures/workspaceFolder",
         "testE2E": "npm run testCompile && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts e2e dist/test/e2e/index.js ../core/dist/src/testFixtures/workspaceFolder",
-        "testWeb": "npm run compileDev && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts web dist/src/extensionWebTest.js ../core/dist/src/testFixtures/workspaceFolder",
+        "testWeb": "npm run compileDev && c8 --allowExternal ts-node ../core/scripts/test/launchTest.ts web dist/test/web/testRunnerWebCore.js",
         "webRun": "npx @vscode/test-web --open-devtools --browserOption=--disable-web-security --waitForDebugger=9222 --extensionDevelopmentPath=. .",
         "webWatch": "npm run clean && npm run buildScripts && webpack --mode development --watch",
         "serve": "webpack serve --config-name mainServe --mode development",

packages/amazonq/test/web/extension.test.ts

@@ -4,10 +4,15 @@
  */
 
 import assert from 'assert'
-import globals, { ToolkitGlobals } from 'aws-core-vscode/shared'
+import { ToolkitGlobals } from 'aws-core-vscode/shared'
 
 describe('activation', async () => {
     it('defines a region provider that can provide regions when in web mode', async () => {
+        // For some reason, a top-level import will result in undefined.
+        // Other tests don't seem to have this issue.
+        // TODO: why?
+        const { globals } = require('aws-core-vscode/shared')
+
         assert((globals as unknown as ToolkitGlobals).regionProvider.getRegions().length > 0)
     })
 })

packages/amazonq/test/web/shared/utilities/timeoutUtils.test.ts

@@ -9,5 +9,5 @@
  *
  * Any web specific tests should be made within their own `describe()`.
  */
-import { timeoutUtilsDescribe } from 'aws-core-vscode/test'
+import { timeoutUtilsDescribe } from 'aws-core-vscode/testWeb'
 timeoutUtilsDescribe

packages/amazonq/test/web/testRunner.ts

@@ -12,7 +12,7 @@ import 'mocha' // Imports mocha for the browser, defining the `mocha` global.
 import * as vscode from 'vscode'
 
 export async function run(): Promise<void> {
-    await activateToolkitExtension()
+    await activateExtension()
     return new Promise(async (resolve, reject) => {
         setupMocha()
         gatherTestFiles()
@@ -45,7 +45,12 @@ function gatherTestFiles() {
  *
  * So this function ensures the extension has fully activated.
  */
-async function activateToolkitExtension() {
+async function activateExtension() {
+    const extId = VSCODE_EXTENSION_ID.amazonq
+    const ext = vscode.extensions.getExtension(extId)
+    if (!ext) {
+        throw new Error(`Extension '${extId}' not found, can't activate it to run tests.`)
+    }
     await vscode.extensions.getExtension(VSCODE_EXTENSION_ID.amazonq)?.activate()
 }
 

packages/amazonq/webpack.config.js

@@ -18,7 +18,7 @@ module.exports = (env, argv) => {
         ...baseWebConfigsFactory(env, argv),
         entry: {
             'src/extensionWeb': './src/extensionWeb.ts',
-            'src/extensionWebTest': './test/web/testRunner.ts',
+            'test/web/testRunnerWebCore': './test/web/testRunner.ts',
         },
     }
 

packages/core/.vscode/tasks.json

@@ -22,14 +22,6 @@
             "isBackground": true,
             "problemMatcher": "$ts-webpack-watch"
         },
-        {
-            "label": "testsBuildWatch",
-            "command": "npm run compileDev -- --watch",
-            "detail": "Build that is sufficient for Web mode tests",
-            "type": "shell",
-            "isBackground": true,
-            "problemMatcher": "$ts-webpack-watch"
-        },
         /**
         After we stop debugging our browser, we also want to stop the web server.
         When this task is ran it will stop the web server.

packages/core/package.json

@@ -41,6 +41,7 @@
         "./amazonqFeatureDev": "./dist/src/amazonqFeatureDev/index.js",
         "./codewhispererChat": "./dist/src/codewhispererChat/index.js",
         "./test": "./dist/src/test/index.js",
+        "./testWeb": "./dist/src/testWeb/index.js",
         "./login": "./dist/src/login/webview/index.js",
         "./utils": "./dist/src/shared/utilities/index.js",
         "./feedback": "./dist/src/feedback/index.js",

packages/core/src/test/index.ts

@@ -3,6 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+/**
+ * Some imports in this file are node compatible only.
+ * For web-based test imports, see {@link file://./../testWeb/index.ts}
+ */
+
 export { registerAuthHook, using } from './setupUtil'
 export { runTests } from './testRunner'
 export { MockDocument } from './fake/fakeDocument'
@@ -14,7 +19,6 @@ export { getTestLogger } from './globalSetup.test'
 export { testCommand } from './shared/vscode/testUtils'
 export { FakeAwsContext } from './utilities/fakeAwsContext'
 export { getTestWorkspaceFolder } from '../testInteg/integrationTestsUtilities'
-export { timeoutUtilsDescribe } from './shared/utilities/timeoutUtils.test'
 export * from './codewhisperer/testUtil'
 export * from './credentials/testUtil'
 export * from './testUtil'

packages/core/src/testWeb/index.ts

@@ -0,0 +1,8 @@
+/*!
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/** Web-compatible tests and test utilities. */
+
+export { timeoutUtilsDescribe } from '../test/shared/utilities/timeoutUtils.test'