test: migration remote debug use cli (#11288)

OfficeDev · Apr 7, 2024 · d2300f3 · d2300f3
1 parent a0ea763
commit d2300f3
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 8 deletions.
diff --git a/...tests/src/ui-test/migration/basic-tab/basic-tab-provision-upgrade-provision-debug.test.ts b/...tests/src/ui-test/migration/basic-tab/basic-tab-provision-upgrade-provision-debug.test.ts
@@ -70,8 +70,14 @@ describe("Migration Tests", function () {
       CliHelper.setV3Enable();
 
       // v3 provision
-      await reRunProvision();
-      await reRunDeploy(Timeout.botDeploy);
+      await mirgationDebugTestContext.provisionProject(
+        mirgationDebugTestContext.appName,
+        mirgationDebugTestContext.projectPath
+      );
+      await mirgationDebugTestContext.deployProject(
+        mirgationDebugTestContext.projectPath,
+        Timeout.botDeploy
+      );
 
       // UI verify
       const teamsAppId = await mirgationDebugTestContext.getTeamsAppId("dev");

diff --git a/packages/tests/src/ui-test/migration/basic-tab/basic-tab-upgrade-provision-debug.test.ts b/packages/tests/src/ui-test/migration/basic-tab/basic-tab-upgrade-provision-debug.test.ts
@@ -64,8 +64,14 @@ describe("Migration Tests", function () {
       CliHelper.setV3Enable();
 
       // v3 provision
-      await runProvision(mirgationDebugTestContext.appName);
-      await runDeploy(Timeout.botDeploy);
+      await mirgationDebugTestContext.provisionProject(
+        mirgationDebugTestContext.appName,
+        mirgationDebugTestContext.projectPath
+      );
+      await mirgationDebugTestContext.deployProject(
+        mirgationDebugTestContext.projectPath,
+        Timeout.botDeploy
+      );
 
       // UI verify
       const teamsAppId = await mirgationDebugTestContext.getTeamsAppId("dev");

diff --git a/packages/tests/src/ui-test/migration/bot/bot-provision-upgrade-provision-debug.test.ts b/packages/tests/src/ui-test/migration/bot/bot-provision-upgrade-provision-debug.test.ts
@@ -67,8 +67,14 @@ describe("Migration Tests", function () {
       CliHelper.setV3Enable();
 
       // v3 provision
-      await reRunProvision();
-      await reRunDeploy(Timeout.botDeploy);
+      await mirgationDebugTestContext.provisionProject(
+        mirgationDebugTestContext.appName,
+        mirgationDebugTestContext.projectPath
+      );
+      await mirgationDebugTestContext.deployProject(
+        mirgationDebugTestContext.projectPath,
+        Timeout.botDeploy
+      );
 
       // UI verify
       const teamsAppId = await mirgationDebugTestContext.getTeamsAppId("dev");

diff --git a/packages/tests/src/ui-test/migration/bot/bot-upgrade-provision-debug.test.ts b/packages/tests/src/ui-test/migration/bot/bot-upgrade-provision-debug.test.ts
@@ -59,8 +59,14 @@ describe("Migration Tests", function () {
       CliHelper.setV3Enable();
 
       // v3 provision
-      await runProvision(mirgationDebugTestContext.appName);
-      await runDeploy(Timeout.botDeploy);
+      await mirgationDebugTestContext.provisionProject(
+        mirgationDebugTestContext.appName,
+        mirgationDebugTestContext.projectPath
+      );
+      await mirgationDebugTestContext.deployProject(
+        mirgationDebugTestContext.projectPath,
+        Timeout.botDeploy
+      );
 
       // UI verify
       const teamsAppId = await mirgationDebugTestContext.getTeamsAppId("dev");

diff --git a/packages/tests/src/ui-test/migration/migrationContext.ts b/packages/tests/src/ui-test/migration/migrationContext.ts
@@ -8,6 +8,7 @@ import {
   Trigger,
   Framework,
   TestFilePath,
+  Timeout,
 } from "../../utils/constants";
 import { TestContext } from "../testContext";
 import { CliHelper } from "../cliHelper";
@@ -18,9 +19,11 @@ import {
   cleanAppStudio,
   cleanTeamsApp,
   GraphApiCleanHelper,
+  createResourceGroup,
 } from "../../utils/cleanHelper";
 import { isV3Enabled } from "@microsoft/teamsfx-core";
 import { AzSqlHelper } from "../../utils/azureCliHelper";
+import { runProvision, runDeploy } from "../remotedebug/remotedebugContext";
 
 export class MigrationTestContext extends TestContext {
   public testName: Capability;
@@ -252,4 +255,88 @@ export class MigrationTestContext extends TestContext {
     await cleanTeamsApp(this.appName);
     await cleanAppStudio(this.appName);
   }
+
+  public async provisionProject(
+    appName: string,
+    projectPath = "",
+    createRg = true,
+    tool: "ttk" | "cli" = "cli",
+    option = "",
+    env: "dev" | "local" = "dev",
+    processEnv?: NodeJS.ProcessEnv
+  ) {
+    if (tool === "cli") {
+      await this.runCliProvision(
+        projectPath,
+        appName,
+        createRg,
+        option,
+        env,
+        processEnv
+      );
+    } else {
+      await runProvision(appName);
+    }
+  }
+
+  public async deployProject(
+    projectPath: string,
+    waitTime: number = Timeout.tabDeploy,
+    tool: "ttk" | "cli" = "cli",
+    option = "",
+    env: "dev" | "local" = "dev",
+    processEnv?: NodeJS.ProcessEnv,
+    retries?: number,
+    newCommand?: string
+  ) {
+    if (tool === "cli") {
+      await this.runCliDeploy(
+        projectPath,
+        option,
+        env,
+        processEnv,
+        retries,
+        newCommand
+      );
+    } else {
+      await runDeploy(waitTime);
+    }
+  }
+
+  public async runCliProvision(
+    projectPath: string,
+    appName: string,
+    createRg = true,
+    option = "",
+    env: "dev" | "local" = "dev",
+    processEnv?: NodeJS.ProcessEnv
+  ) {
+    if (createRg) {
+      await createResourceGroup(appName, env, "westus");
+    }
+    const resourceGroupName = `${appName}-${env}-rg`;
+    await CliHelper.showVersion(projectPath, processEnv);
+    await CliHelper.provisionProject2(projectPath, option, env, {
+      ...process.env,
+      AZURE_RESOURCE_GROUP_NAME: resourceGroupName,
+    });
+  }
+
+  public async runCliDeploy(
+    projectPath: string,
+    option = "",
+    env: "dev" | "local" = "dev",
+    processEnv?: NodeJS.ProcessEnv,
+    retries?: number,
+    newCommand?: string
+  ) {
+    await CliHelper.deployAll(
+      projectPath,
+      option,
+      env,
+      processEnv,
+      retries,
+      newCommand
+    );
+  }
 }