test: update linkunfurling validate (#11940)

OfficeDev · Jul 2, 2024 · 88b09fb · 88b09fb
1 parent 7f213fd
commit 88b09fb
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 19 deletions.
diff --git a/packages/tests/src/ui-test/localdebug/localdebug-link-unfurling-ts.test.ts b/packages/tests/src/ui-test/localdebug/localdebug-link-unfurling-ts.test.ts
@@ -58,7 +58,7 @@ describe("Local Debug Tests", function () {
         Env.password
       );
       await localDebugTestContext.validateLocalStateForBot();
-      await validateUnfurlCard(page);
+      await validateUnfurlCard(page, localDebugTestContext.appName);
     }
   );
 });
diff --git a/packages/tests/src/ui-test/localdebug/localdebug-link-unfurling.test.ts b/packages/tests/src/ui-test/localdebug/localdebug-link-unfurling.test.ts
@@ -63,7 +63,7 @@ describe("Local Debug Tests", function () {
         Env.password
       );
       await localDebugTestContext.validateLocalStateForBot();
-      await validateUnfurlCard(page);
+      await validateUnfurlCard(page, localDebugTestContext.appName);
     }
   );
 });
diff --git a/packages/tests/src/ui-test/localdebug/localdebug-msgsa-ts.test.ts b/packages/tests/src/ui-test/localdebug/localdebug-msgsa-ts.test.ts
@@ -6,7 +6,7 @@
  */
 import * as path from "path";
 import { startDebugging, waitForTerminal } from "../../utils/vscodeOperation";
-import { initPage, validateMsg } from "../../utils/playwrightOperation";
+import { initPage, validateNpm } from "../../utils/playwrightOperation";
 import { LocalDebugTestContext } from "./localdebugContext";
 import { Timeout, LocalDebugTaskLabel } from "../../utils/constants";
 import { Env } from "../../utils/env";
@@ -52,7 +52,10 @@ describe("Local Debug Tests", function () {
         Env.password
       );
       await localDebugTestContext.validateLocalStateForBot();
-      await validateMsg(page);
+      await validateNpm(page, {
+        npmName: "axios",
+        appName: localDebugTestContext.appName,
+      });
     }
   );
 });
diff --git a/packages/tests/src/ui-test/localdebug/localdebug-msgsa.test.ts b/packages/tests/src/ui-test/localdebug/localdebug-msgsa.test.ts
@@ -6,7 +6,7 @@
  */
 import * as path from "path";
 import { startDebugging, waitForTerminal } from "../../utils/vscodeOperation";
-import { initPage, validateMsg } from "../../utils/playwrightOperation";
+import { initPage, validateNpm } from "../../utils/playwrightOperation";
 import { LocalDebugTestContext } from "./localdebugContext";
 import { Timeout, LocalDebugTaskLabel } from "../../utils/constants";
 import { Env } from "../../utils/env";
@@ -52,7 +52,10 @@ describe("Local Debug Tests", function () {
         Env.password
       );
       await localDebugTestContext.validateLocalStateForBot();
-      await validateMsg(page);
+      await validateNpm(page, {
+        npmName: "axios",
+        appName: localDebugTestContext.appName,
+      });
     }
   );
 });
diff --git a/packages/tests/src/ui-test/remotedebug/remotedebug-link-unfurling-ts-win-only.test.ts b/packages/tests/src/ui-test/remotedebug/remotedebug-link-unfurling-ts-win-only.test.ts
@@ -77,7 +77,7 @@ describe("Remote debug Tests", function () {
         Env.username,
         Env.password
       );
-      await validateUnfurlCard(page);
+      await validateUnfurlCard(page, remoteDebugTestContext.appName);
     }
   );
 });
diff --git a/packages/tests/src/ui-test/remotedebug/remotedebug-link-unfurling-win-only.test.ts b/packages/tests/src/ui-test/remotedebug/remotedebug-link-unfurling-win-only.test.ts
@@ -77,7 +77,7 @@ describe("Remote debug Tests", function () {
         Env.username,
         Env.password
       );
-      await validateUnfurlCard(page);
+      await validateUnfurlCard(page, remoteDebugTestContext.appName);
     }
   );
 });
diff --git a/packages/tests/src/ui-test/remotedebug/remotedebug-msgsa-ts-win-only.test.ts b/packages/tests/src/ui-test/remotedebug/remotedebug-msgsa-ts-win-only.test.ts
@@ -17,7 +17,7 @@ import {
   createNewProject,
 } from "../../utils/vscodeOperation";
 import { it } from "../../utils/it";
-import { initPage, validateMsg } from "../../utils/playwrightOperation";
+import { initPage, validateNpm } from "../../utils/playwrightOperation";
 import { Env } from "../../utils/env";
 
 describe("Remote debug Tests", function () {
@@ -76,7 +76,10 @@ describe("Remote debug Tests", function () {
         Env.username,
         Env.password
       );
-      await validateMsg(page);
+      await validateNpm(page, {
+        npmName: "axios",
+        appName: remoteDebugTestContext.appName,
+      });
     }
   );
 });
diff --git a/packages/tests/src/ui-test/remotedebug/remotedebug-msgsa-win-only.test.ts b/packages/tests/src/ui-test/remotedebug/remotedebug-msgsa-win-only.test.ts
@@ -18,7 +18,7 @@ import {
   createNewProject,
 } from "../../utils/vscodeOperation";
 import { it } from "../../utils/it";
-import { initPage, validateMsg } from "../../utils/playwrightOperation";
+import { initPage, validateNpm } from "../../utils/playwrightOperation";
 import { Env } from "../../utils/env";
 
 describe("Remote debug Tests", function () {
@@ -77,7 +77,10 @@ describe("Remote debug Tests", function () {
         Env.username,
         Env.password
       );
-      await validateMsg(page);
+      await validateNpm(page, {
+        npmName: "axios",
+        appName: remoteDebugTestContext.appName,
+      });
     }
   );
 });
diff --git a/packages/tests/src/utils/playwrightOperation.ts b/packages/tests/src/utils/playwrightOperation.ts
@@ -1464,7 +1464,8 @@ export async function validateNpm(
         `span:has-text("${searchPack}")`
       );
       await targetItem?.click();
-      await page?.waitForSelector(`card span:has-text("${searchPack}")`);
+      await page.waitForTimeout(Timeout.shortTimeWait);
+      await page?.waitForSelector(`card:has-text("${searchPack}")`);
       const sendBtn = await frame?.waitForSelector('button[name="send"]');
       await sendBtn?.click();
       console.log("verify npm search successfully!!!");
@@ -2530,15 +2531,12 @@ export async function validateCreatedCard(page: Page, appName: string) {
   }
 }
 
-export async function validateUnfurlCard(page: Page) {
+export async function validateUnfurlCard(page: Page, appName: string) {
   try {
-    const frameElementHandle = await page.waitForSelector(
-      "iframe.embedded-page-content"
-    );
-    const frame = await frameElementHandle?.contentFrame();
+    const frame = await page.waitForSelector("div#app");
     console.log("start to validate unfurl an adaptive card");
     const unfurlurl = "https://www.botframework.com/";
-    await frame?.press("div.ui-box input.ui-box", "Escape");
+    //await frame?.press("div.ui-box input.ui-box", "Escape");
     const msgTxtbox = await frame?.waitForSelector("div[data-tid='ckeditor']");
     await msgTxtbox?.focus();
     await msgTxtbox?.fill(unfurlurl);