fix: fixed implementation of waitAndClickByText to perform exact matc…

…hing
agoric-labs · Mar 1, 2024 · d3be1b9 · d3be1b9
1 parent e48a42b
commit d3be1b9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/commands/keplr.js b/commands/keplr.js
@@ -35,7 +35,7 @@ const keplr = {
     };
   },
 
-  async importWallet(secretWords, password, newAccount) {
+  async importWallet(secretWordsOrPrivateKey, password, newAccount) {
     await playwright.waitAndClickByText(
       newAccount
         ? onboardingElements.createWalletButton
@@ -56,10 +56,16 @@ const keplr = {
         await playwright.keplrWindow(),
       ));
 
-    if (secretWords.includes(' ')) {
-      await module.exports.importWalletWithPhrase(secretWords, password);
+    if (secretWordsOrPrivateKey.includes(' ')) {
+      await module.exports.importWalletWithPhrase(
+        secretWordsOrPrivateKey,
+        password,
+      );
     } else {
-      await module.exports.importWalletWithPrivateKey(secretWords, password);
+      await module.exports.importWalletWithPrivateKey(
+        secretWordsOrPrivateKey,
+        password,
+      );
     }
 
     await playwright.waitAndType(
@@ -128,7 +134,11 @@ const keplr = {
     );
   },
   async importWalletWithPrivateKey(privateKey) {
-    await playwright.clickByText(onboardingElements.phrasePrivateKey);
+    await playwright.waitAndClickByText(
+      onboardingElements.phrasePrivateKey,
+      await playwright.keplrWindow(),
+      true,
+    );
 
     await playwright.waitAndTypeByLocator(
       onboardingElements.textAreaSelector,

diff --git a/commands/playwright-keplr.js b/commands/playwright-keplr.js
@@ -79,13 +79,9 @@ module.exports = {
     return keplrNotificationWindow;
   },
 
-  async clickByText(text, page = keplrWindow) {
-    await page.click(`text="${text}"`);
-  },
-
-  async waitAndClickByText(text, page = keplrWindow) {
+  async waitAndClickByText(text, page = keplrWindow, exact = false) {
     await module.exports.waitForByText(text, page);
-    const element = `:is(:text-is("${text}"), :text("${text}"))`;
+    const element = `:is(:text-is("${text}")${exact ? '' : `, :text("${text}")`})`;
     await page.click(element);
     await module.exports.waitUntilStable();
   },
@@ -362,7 +358,9 @@ module.exports = {
     const keplrExtensionData = (await module.exports.getExtensionsData()).keplr;
     const browserContext = await browser.contexts()[0];
     keplrRegistrationWindow = await browserContext.newPage();
-    await keplrRegistrationWindow.goto(`chrome-extension://${keplrExtensionData.id}/register.html`); 
+    await keplrRegistrationWindow.goto(
+      `chrome-extension://${keplrExtensionData.id}/register.html`,
+    );
     return true;
   },
   async switchToKeplrNotification() {