chore: addressing PR comments

agoric-labs · Mar 6, 2024 · 0cff640 · 0cff640
1 parent aee18bf
commit 0cff640
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/commands/keplr.js b/commands/keplr.js
@@ -279,7 +279,7 @@ const keplr = {
     }
 
     await playwright.waitAndClickByText(notificationPageElements.copyAddress);
-    await playwright.waitAndClick(notificationPageElements.walletSelectors[chainName])
+    await playwright.waitAndClick(notificationPageElements.walletSelectors(chainName))
 
     walletAddress = clipboardy.readSync();
     await playwright.switchToCypressWindow();

diff --git a/commands/playwright-keplr.js b/commands/playwright-keplr.js
@@ -328,8 +328,9 @@ module.exports = {
     throw new Error(`Failed to click element after ${maxRetries} attempts`);
   },
   async waitAndClickWithDelay(selector, options, delay) {
-    await new Promise(resolve => setTimeout(resolve, delay));
-    await module.exports.waitAndClick(selector, module.exports.keplrWindow(), options);
+    const page = module.exports.keplrWindow()
+    await page.waitForTimeout(delay)
+    await module.exports.waitAndClick(selector, page, options);
   },
   async switchToKeplrNotification() {
     const keplrExtensionData = (await module.exports.getExtensionsData()).keplr;

diff --git a/pages/keplr/notification-page.js b/pages/keplr/notification-page.js
@@ -1,15 +1,9 @@
 const approveButton = `button`;
 const copyAddress = 'Copy Address';
-const copyWalletAddressSelector =
-  'div.sc-dkzDqf div.sc-hKMtZM.sc-kDDrLX.cyoEAq.dkJSBQ';
-const walletSelectors = {
-  AGORIC: 'img[alt="Agoric local"]',
-  COSMOS: 'img[alt="Cosmos Hub"]',
-};
+const walletSelectors = chainName => `img[alt="${chainName}"]`;
 
 module.exports.notificationPageElements = {
   approveButton,
   copyAddress,
-  copyWalletAddressSelector,
   walletSelectors
 };
diff --git a/tests/e2e/specs/keplr/keplr-spec.js b/tests/e2e/specs/keplr/keplr-spec.js
@@ -77,11 +77,11 @@ describe('Keplr', () => {
     });
 
     it(`should get wallet address while running addNewTokensFound flow`, () => {
-      cy.getWalletAddress('AGORIC').then(walletAddress => {
+      cy.getWalletAddress('Agoric local').then(walletAddress => {
         expect(walletAddress.length).to.be.equal(45);
       });
 
-      cy.getWalletAddress('COSMOS').then(walletAddress => {
+      cy.getWalletAddress('Cosmos Hub').then(walletAddress => {
         expect(walletAddress.length).to.be.equal(45);
       });
     });
@@ -113,11 +113,11 @@ describe('Keplr', () => {
     });
 
     it(`should get wallet address without running addNewTokensFound flow`, () => {
-      cy.getWalletAddress('AGORIC').then(walletAddress => {
+      cy.getWalletAddress('Agoric local').then(walletAddress => {
         expect(walletAddress.length).to.be.equal(45);
       });
 
-      cy.getWalletAddress('COSMOS').then(walletAddress => {
+      cy.getWalletAddress('Cosmos Hub').then(walletAddress => {
         expect(walletAddress.length).to.be.equal(45);
       });
     });