Merge pull request #262 from Synthetixio/master

keep dev up to date
Synthetixio · Nov 1, 2021 · a78db26 · a78db26
2 parents e3ff82e + 98704f1
commit a78db26
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/commands/metamask.js b/commands/metamask.js
@@ -1,6 +1,5 @@
 const puppeteer = require('./puppeteer');
 
-const { pageElements } = require('../pages/metamask/page');
 const {
   welcomePageElements,
   firstTimeFlowPageElements,
@@ -79,7 +78,7 @@ module.exports = {
     await puppeteer.waitAndClick(firstTimeFlowFormPageElements.termsCheckbox);
     await puppeteer.waitAndClick(firstTimeFlowFormPageElements.importButton);
 
-    await puppeteer.waitFor(pageElements.loadingSpinner);
+    await puppeteer.waitFor(endOfFlowPageElements.endOfFlowPage);
     await puppeteer.waitAndClick(endOfFlowPageElements.allDoneButton);
     await puppeteer.waitFor(mainPageElements.walletOverview);
 
@@ -108,7 +107,7 @@ module.exports = {
     );
     await puppeteer.waitAndClick(firstTimeFlowFormPageElements.importButton);
 
-    await puppeteer.waitFor(pageElements.loadingSpinner);
+    await puppeteer.waitFor(secureYourWalletPageElements.secureYourWalletPage);
     await puppeteer.waitAndClick(secureYourWalletPageElements.nextButton);
     await puppeteer.waitAndClick(revealSeedPageElements.remindLaterButton);
     await puppeteer.waitFor(mainPageElements.walletOverview);
@@ -262,14 +261,21 @@ module.exports = {
       addNetworkPageElements.chainIdInput,
       network.chainId,
     );
-    await puppeteer.waitAndType(
-      addNetworkPageElements.symbolInput,
-      network.symbol,
-    );
-    await puppeteer.waitAndType(
-      addNetworkPageElements.blockExplorerInput,
-      network.blockExplorer,
-    );
+
+    if (network.symbol) {
+      await puppeteer.waitAndType(
+        addNetworkPageElements.symbolInput,
+        network.symbol,
+      );
+    }
+
+    if (network.blockExplorer) {
+      await puppeteer.waitAndType(
+        addNetworkPageElements.blockExplorerInput,
+        network.blockExplorer,
+      );
+    }
+
     await puppeteer.waitAndClick(addNetworkPageElements.saveButton);
     await puppeteer.waitAndClick(settingsPageElements.closeButton);
     await puppeteer.waitForText(

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@synthetixio/synpress",
-  "version": "1.0.0",
+  "version": "1.0.1-beta.2",
   "description": "Synpress in an wrapper around Cypress test runner which extends its capabilities with conjunction of Puppeteer. It's used used across Synthetix projects.",
   "keywords": [
     "Synpress",