Merge branch 'dev'

commands/keplr.js

@@ -98,6 +98,7 @@ const keplr = {
     password,
     newAccount,
     walletName,
+    selectedChains,
   ) {
     await module.exports.goToRegistration();
     await playwright.waitAndClickByText(
@@ -158,7 +159,7 @@ const keplr = {
       await playwright.keplrWindow(),
     );
 
-    await module.exports.handleSelectChain();
+    await module.exports.handleSelectChain(selectedChains);
 
     await playwright.waitForByText(
       onboardingElements.phraseAccountCreated,
@@ -167,20 +168,22 @@ const keplr = {
 
     return true;
   },
-  async handleSelectChain() {
-    const chainNameExists = await playwright.waitForAndCheckElementExistence(
-      onboardingElements.chainNameSelector,
-    );
-
-    if (chainNameExists) {
+  async handleSelectChain(selectedChains) {
+    for (const chain of selectedChains) {
       await playwright.waitAndClickByText(
-        onboardingElements.chainName,
-        playwright.keplrWindow(),
-      );
-      await playwright.waitAndClick(
-        onboardingElements.submitChainButton,
+        chain,
         playwright.keplrWindow(),
+        true,
       );
+    }
+
+    await playwright.waitAndClick(
+      onboardingElements.submitChainButton,
+      playwright.keplrWindow(),
+    );
+
+    // eslint-disable-next-line no-unused-vars
+    for (const _ of selectedChains) {
       const importButtonExists =
         await playwright.waitForAndCheckElementExistence(
           onboardingElements.importButtonSelector,
@@ -191,12 +194,9 @@ const keplr = {
           onboardingElements.importButtonSelector,
           playwright.keplrWindow(),
         );
+      } else {
+        break;
       }
-    } else {
-      await playwright.waitAndClick(
-        onboardingElements.submitChainButton,
-        playwright.keplrWindow(),
-      );
     }
   },
   async importWalletWithPhrase(secretWords) {
@@ -291,7 +291,13 @@ const keplr = {
 
   async initialSetup(
     playwrightInstance,
-    { secretWordsOrPrivateKey, password, newAccount, walletName },
+    {
+      secretWordsOrPrivateKey,
+      password,
+      newAccount,
+      walletName,
+      selectedChains,
+    },
   ) {
     if (playwrightInstance) {
       await playwright.init(playwrightInstance);
@@ -307,6 +313,7 @@ const keplr = {
       password,
       newAccount,
       walletName,
+      selectedChains,
     );
     await playwright.switchToCypressWindow();
   },

pages/keplr/first-time-flow-page.js

@@ -14,16 +14,13 @@ const phraseAccountCreated = 'Account Created!';
 const finishButton = 'button[type="button"]';
 const textAreaSelector = 'textbox';
 const submitPhraseButton = 'button[type="submit"]';
-const chainName = 'Agoric local';
-const chainNameSelector = 'text=Agoric local';
 const importButtonSelector = 'button:has-text("Import")';
 
 module.exports.onboardingElements = {
   existingWalletButton,
   createWalletButton,
   importRecoveryPhraseButton,
   useRecoveryPhraseButton,
-  chainNameSelector,
   importButtonSelector,
   phraseCount24,
   phrasePrivateKey,
@@ -37,5 +34,4 @@ module.exports.onboardingElements = {
   finishButton,
   textAreaSelector,
   submitPhraseButton,
-  chainName,
 };

plugins/keplr-plugin.js

@@ -1,3 +1,4 @@
+const { exec, execSync } = require('child_process');
 const helpers = require('../helpers');
 const playwright = require('../commands/playwright-keplr');
 const keplr = require('../commands/keplr');
@@ -50,6 +51,23 @@ module.exports = (on, config) => {
       console.warn('\u001B[33m', 'WARNING:', message, '\u001B[0m');
       return true;
     },
+    info(message) {
+      console.log('\u001B[36m', 'INFO:', message, '\u001B[0m');
+      return true;
+    },
+
+    async execute(command) {
+      return new Promise((resolve, reject) => {
+        exec(command, (error, stdout, stderr) => {
+          if (error) {
+            reject({ error, stdout, stderr });
+          } else {
+            resolve({ stdout, stderr });
+          }
+        });
+      });
+    },
+
     // playwright commands for Keplr
     initPlaywright: playwright.init,
     assignWindows: playwright.assignWindows,
@@ -77,12 +95,14 @@ module.exports = (on, config) => {
       password,
       newAccount,
       walletName,
+      selectedChains,
     }) => {
       await keplr.initialSetup(null, {
         secretWordsOrPrivateKey,
         password,
         newAccount,
         walletName,
+        selectedChains,
       });
       return true;
     },

support/commands.js

@@ -417,6 +417,7 @@ Cypress.Commands.add('setupWallet', (args = {}) => {
     password = 'Test1234',
     newAccount = false,
     walletName = 'My Wallet',
+    selectedChains = [],
   } = args;
   return cy.task('setupWallet', {
     secretWordsOrPrivateKey:
@@ -426,6 +427,7 @@ Cypress.Commands.add('setupWallet', (args = {}) => {
     password,
     newAccount,
     walletName,
+    selectedChains,
   });
 });
 
@@ -474,3 +476,7 @@ Cypress.Commands.add('addNewTokensFound', () => {
 Cypress.Commands.add('getTokenAmount', tokenName => {
   return cy.task('getTokenAmount', { tokenName });
 });
+
+Cypress.Commands.add('execute', command => {
+  return cy.task('execute', command);
+});

support/index.d.ts

@@ -520,6 +520,7 @@ declare namespace Cypress {
       password?: string;
       newAccount?: boolean;
       walletName?: string;
+      selectedChains?: Array<string>;
     }): Chainable<Subject>;
   }
 }

tests/e2e/specs/keplr/keplr-spec.js

@@ -2,6 +2,16 @@
 
 describe('Keplr', () => {
   context('Test commands', () => {
+    it('Executes a command and verifies stdout and stderr', () => {
+      const command = 'echo "Hello, stdout!" && echo "Error occurred" >&2';
+
+      cy.execute(command).then(({ stdout, stderr, error }) => {
+        expect(stdout.trim()).to.equal('Hello, stdout!');
+        expect(stderr.trim()).to.equal('Error occurred');
+        expect(error).to.be.undefined;
+      });
+    });
+
     it(`should complete Keplr setup by  importing an existing wallet using 24 word phrase`, () => {
       cy.setupWallet().then(setupFinished => {
         expect(setupFinished).to.be.true;
@@ -62,6 +72,7 @@ describe('Keplr', () => {
         password: 'Test1234',
         newAccount: true,
         walletName: 'My Wallet 2',
+        selectedChains: ['Agoric localhost', 'Secret Network'],
       }).then(setupFinished => {
         expect(setupFinished).to.be.true;
       });
@@ -71,6 +82,7 @@ describe('Keplr', () => {
         privateKey:
           'A9C09B6E4AF70DE1F1B621CB1AA66CFD0B4AA977E4C18497C49132DD9E579485',
         walletName: 'My wallet 3',
+        selectedChains: ['Agoric localhost'],
       }).then(setupFinished => {
         expect(setupFinished).to.be.true;
       });