Merge pull request #495 from Synthetixio/dev

promote dev to master

Author: drptbl

.github/workflows/audit_and_lint.yml

@@ -124,7 +124,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Archive e2e artifacts
-        uses: actions/upload-artifact@27121b0bdffd731efa15d66772be8dc71245d074 # pin@v2
+        uses: actions/upload-artifact@3cea5372237819ed00197afe530f5a7ea3e805c8 # pin@v2
         if: always()
         with:
           name: e2e-artifacts

README.md

@@ -63,7 +63,12 @@ To see in which direction Synpress is headed to, take a look at
 - etherscan API helpers in place which for ex. allows to compare your
   transaction results with etherscan and check tx status
 - synthetix helpers in place which allows to interact with synthetix protocol
-  programatically ...
+  programatically
+- supports codespaces
+  - run your tests in docker
+  - get your feedback remotely thanks to ngrok
+  - use mpeg-4 preview plugin to watch videos from inside codespaces :)
+...
 
 ## 👷 Example setup for eslint and tsconfig
 
@@ -255,10 +260,11 @@ Docker is awesome for CI and local development. Give it a try.
 All examples of setup are present in this repository. Just take a look around.
 
 **Warning: M2 is not supported with docker.**
+As a workaround - you can use codespaces, they're fully supported! :)
 
 ## CI tips & tricks
 
-- use [docker-e2e](https://github.com/Synthetixio/docker-e2e) ❤
+- use [docker-e2e](https://github.com/Synthetixio/docker-e2e)
 - stick to bigger resolutions (to make sure that whole extension is visible on
   screen when opened)
   - synpress is tested on 1920x1080

commands/metamask.js

@@ -519,7 +519,7 @@ module.exports = {
         waitForEvent: 'navi',
       },
     );
-    await playwright.waitFor(mainPageElements.walletOverview);
+    // await playwright.waitFor(mainPageElements.walletOverview);
 
     await switchToCypressIfNotActive();
     return true;
@@ -756,9 +756,11 @@ module.exports = {
     await playwright.init();
     await playwright.assignWindows();
     await playwright.assignActiveTabName('metamask');
+    await module.exports.fixBlankPage();
     if (
-      (await playwright.metamaskWindow().$(unlockPageElements.unlockPage)) ===
-      null
+      (await playwright
+        .metamaskWindow()
+        .$(welcomePageElements.confirmButton)) !== null
     ) {
       await module.exports.confirmWelcomePage();
       if (secretWordsOrPrivateKey.includes(' ')) {
@@ -777,11 +779,29 @@ module.exports = {
       walletAddress = await module.exports.getWalletAddress();
       await playwright.switchToCypressWindow();
       return true;
-    } else {
+    } else if (
+      (await playwright
+        .metamaskWindow()
+        .$(unlockPageElements.passwordInput)) !== null
+    ) {
       await module.exports.unlock(password);
       walletAddress = await module.exports.getWalletAddress();
       await playwright.switchToCypressWindow();
       return true;
+    } else {
+      if (
+        (await playwright
+          .metamaskWindow()
+          .$(mainPageElements.walletOverview)) !== null &&
+        !process.env.RESET_METAMASK
+      ) {
+        await playwright.switchToMetamaskWindow();
+        walletAddress = await module.exports.getWalletAddress();
+        await playwright.switchToCypressWindow();
+        return true;
+      } else {
+        // todo: reset metamask state
+      }
     }
   },
 };