feat: support changeNetwork in e2e tests

Synthetixio · Oct 28, 2021 · 927ea8e · 927ea8e
1 parent 5260b44
commit 927ea8e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/commands/metamask.js b/commands/metamask.js
@@ -163,7 +163,15 @@ module.exports = {
     return true;
   },
   changeNetwork: async network => {
+    let switchBackToCypressWindow;
+
     setNetwork(network);
+
+    if (await puppeteer.isCypressWindowActive()) {
+      await puppeteer.switchToMetamaskWindow();
+      switchBackToCypressWindow = true;
+    }
+
     await puppeteer.waitAndClick(mainPageElements.networkSwitcher.button);
     if (network === 'main' || network === 'mainnet') {
       await puppeteer.waitAndClick(
@@ -213,6 +221,11 @@ module.exports = {
       );
     }
 
+    if (switchBackToCypressWindow) {
+      await puppeteer.switchToCypressWindow();
+      switchBackToCypressWindow = false;
+    }
+
     return true;
   },
   addNetwork: async network => {
@@ -426,6 +439,7 @@ module.exports = {
 
     await puppeteer.init();
     await puppeteer.assignWindows();
+    await puppeteer.assignActiveTabName('metamask');
     await puppeteer.metamaskWindow().waitForTimeout(1000);
     if (
       (await puppeteer.metamaskWindow().$(unlockPageElements.unlockPage)) ===

diff --git a/plugins/index.js b/plugins/index.js
@@ -104,7 +104,7 @@ module.exports = (on, config) => {
     changeMetamaskNetwork: async network => {
       if (process.env.NETWORK_NAME) {
         network = process.env.NETWORK_NAME;
-      } else {
+      } else if (!network) {
         network = 'kovan';
       }
       const networkChanged = await metamask.changeNetwork(network);