test: add docker sample

OfficeDev · Apr 29, 2024 · 0adff00 · 0adff00
1 parent 6f439b9
commit 0adff00
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/packages/tests/README.md b/packages/tests/README.md
@@ -49,6 +49,7 @@ CI_ENABLED=true
 - (**Required**) Run `npx extest get-chromedriver --storage .test-resources --type stable --code_version 1.88.1` to download chromedriver
 - (**Required**) Download TeamsFx vsix file to this project root folder. You can download it from the [artifacts of TeamsFx CD action](https://github.com/OfficeDev/TeamsFx/actions/workflows/cd.yml). Remember to unzip.
 - (**Required**) Run `npx extest install-vsix --storage .test-resources --extensions_dir .test-resources --type stable --vsix_file ${{ YOUR VSIX FILE NAME }} ` to install Teams Toolkit
+- (**OPTIONAL**) If local test docker cases, Run `npx extest install-from-marketplace --storage .test-resources --extensions_dir .test-resources --type stable ms-azuretools.vscode-docker` to install docker extension.
 - (**Required**) Run `npx extest run-tests --storage .test-resources --extensions_dir .test-resources --type stable --code_version 1.88.1 --code_settings ./settings.json ./out/ui-test/**/${{ YOUR TEST CASE }}.test.js` to execute your case
 - (**OPTIONAL**) If you want to debug your case via vscode, replace "YOUR TEST CASE" with your case name in .vscode/launch.json and click F5
 

diff --git a/packages/tests/src/ui-test/samples/sample-localdebug-bot-sso-docker.test.ts b/packages/tests/src/ui-test/samples/sample-localdebug-bot-sso-docker.test.ts
@@ -31,5 +31,5 @@ new BotSSODockerTestCase(
   26577671,
   "[email protected]",
   "local",
-  [LocalDebugTaskLabel.StartLocalTunnel, LocalDebugTaskLabel.StartApplication]
+  [LocalDebugTaskLabel.StartLocalTunnel, LocalDebugTaskLabel.DockerRun]
 ).test();
diff --git a/packages/tests/src/ui-test/samples/sampleCaseFactory.ts b/packages/tests/src/ui-test/samples/sampleCaseFactory.ts
@@ -98,6 +98,12 @@ const debugMap: Record<LocalDebugTaskLabel, () => Promise<void>> = {
       LocalDebugTaskResult.WebServerSuccess
     );
   },
+  [LocalDebugTaskLabel.DockerRun]: async () => {
+    await waitForTerminal(
+      LocalDebugTaskLabel.DockerRun,
+      LocalDebugTaskResult.WebServerSuccess
+    );
+  },
 };
 
 export abstract class CaseFactory {

diff --git a/packages/tests/src/utils/constants.ts b/packages/tests/src/utils/constants.ts
@@ -382,6 +382,7 @@ export enum LocalDebugTaskLabel {
   Azurite = "Start Azurite emulator",
   Compile = "Compile typescript",
   StartWebServer = "Start web server",
+  DockerRun = "docker-run: debug",
 }
 
 export class LocalDebugTaskResult {
@@ -396,6 +397,7 @@ export class LocalDebugTaskResult {
   static readonly Error = "error";
   static readonly DebuggerAttached = "Debugger attached";
   static readonly WebServerSuccess = "press h to show help";
+  static readonly DockerRunFinish = "press any key to close it";
 }
 
 export enum LocalDebugTaskLabel2 {

diff --git a/packages/tests/src/utils/vscodeOperation.ts b/packages/tests/src/utils/vscodeOperation.ts
@@ -220,6 +220,7 @@ export async function execCommandIfExist(
 ): Promise<void> {
   const driver = VSBrowser.instance.driver;
   await VSBrowser.instance.waitForWorkbench();
+  console.log("[start] run vsc command: ", commandName);
   if (os.type() === "Darwin") {
     // command + P
     await driver.actions().keyDown(Key.COMMAND).keyDown("P").perform();
@@ -245,6 +246,7 @@ export async function execCommandIfExist(
       if (timeout) {
         await driver.sleep(timeout);
       }
+      console.log("[finish] run vsc command successfully");
       return;
     }
   }