Promote dev to master (#939)

* Remove leftover TODOs * Remove text based locators * Add `Known problems with MetaMask` section * Remove Promise wrap from `cy.setupMetamask()` (#927) * Fix localized Chrome's extension id (#928) * Fix localized Chrome's extension id * Improve id handling --------- Co-authored-by: Piotr Frankowski <piotr@f-dev.io> * Lint * Feature/revoke permission to all (#932) * Fix typo in Permission word * Add permission revoking actions * Add tests for permission revoking actions * Regenerate synpress commands file --------- Co-authored-by: Peter F <pietras93@gmail.com> Co-authored-by: Piotr Frankowski <piotr@f-dev.io> Co-authored-by: Rafał Majchrzak <rafal2228@gmail.com>
Synthetixio · Oct 18, 2023 · f94c34d · f94c34d
1 parent 81faa92
commit f94c34d
Show file tree

Hide file tree

Showing 9 changed files with 273 additions and 115 deletions.
diff --git a/README.md b/README.md
@@ -441,6 +441,15 @@ Options:
  -h, --help display help for command
 ```
 
+## 👨‍⚕️ Known problems with MetaMask
+
+If your MetaMask is stuck on the loading screen, check what's happening under the hood in the console. You can find vital information about why it's stuck on this step.
+
+#### ⭐ Sentry.io HTTP error 499 (Request has been forbidden by antivirus)
+
+- Kaspersky antivirus sometimes blocks encrypted requests to Sentry.io. You can disable
+ this feature in Kaspersky advanced settings by toggling on `"Do not scan encrypted connections"`.
+
 ## 📃 Environmental variables
 
 | Variable | Description |

diff --git a/commands/metamask.js b/commands/metamask.js
@@ -1221,11 +1221,11 @@ const metamask = {
 
  // 120 seconds
  while (retries < retiresLimit) {
- const pendingTxs = await playwright // TODO rename
+ const pendingTxs = await playwright
  .metamaskWindow()
  .getByText('Pending')
  .count();
- const queuedTxs = await playwright // TODO rename
+ const queuedTxs = await playwright
  .metamaskWindow()
  .getByText('Queued')
  .count();
@@ -1266,13 +1266,19 @@ const metamask = {
  .locator(
  `${mainPageElements.activityTab.completedTransactionsList} > div`,
  )
- .filter({ hasNotText: 'History' })
- .filter({ hasNotText: 'View more' })
+ .filter({
+ has: playwright.metamaskWindow().locator('div.list-item__heading'),
+ })
  .all();
 
  while (txIndex >= visibleTxs.length) {
  try {
- await playwright.metamaskWindow().getByText('View more').click();
+ await playwright
+ .metamaskWindow()
+ .locator(
+ `${mainPageElements.activityTab.completedTransactionsList} > button`,
+ )
+ .click();
  } catch (error) {
  log('[openTransactionDetails] Clicking "View more" failed!');
  throw new Error(
@@ -1285,8 +1291,9 @@ const metamask = {
  .locator(
  `${mainPageElements.activityTab.completedTransactionsList} > div`,
  )
- .filter({ hasNotText: 'History' })
- .filter({ hasNotText: 'View more' })
+ .filter({
+ has: playwright.metamaskWindow().locator('div.list-item__heading'),
+ })
  .all();
  }
 
@@ -1341,7 +1348,7 @@ const metamask = {
  );
  return true;
  },
- async confirmPermisionToApproveAll() {
+ async confirmPermissionToApproveAll() {
  const notificationPage = await playwright.switchToMetamaskNotification();
  await playwright.waitAndClick(
  notificationPageElements.allowToSpendButton,
@@ -1354,7 +1361,7 @@ const metamask = {
  );
  return true;
  },
- async rejectPermisionToApproveAll() {
+ async rejectPermissionToApproveAll() {
  const notificationPage = await playwright.switchToMetamaskNotification();
  await playwright.waitAndClick(
  notificationPageElements.allowToSpendButton,
@@ -1367,6 +1374,24 @@ const metamask = {
  );
  return true;
  },
+ async confirmRevokePermissionToAll() {
+ const notificationPage = await playwright.switchToMetamaskNotification();
+ await playwright.waitAndClick(
+ notificationPageElements.allowToSpendButton,
+ notificationPage,
+ { waitForEvent: 'close' },
+ );
+ return true;
+ },
+ async rejectRevokePermissionToAll() {
+ const notificationPage = await playwright.switchToMetamaskNotification();
+ await playwright.waitAndClick(
+ notificationPageElements.rejectToSpendButton,
+ notificationPage,
+ { waitForEvent: 'close' },
+ );
+ return true;
+ },
  async allowToAddNetwork({ waitForEvent } = {}) {
  const notificationPage = await playwright.switchToMetamaskNotification();
  if (waitForEvent) {

diff --git a/commands/playwright.js b/commands/playwright.js
@@ -57,6 +57,11 @@ module.exports = {
  activeTabName() {
  return activeTabName;
  },
+ async metamaskExtensionId() {
+ const metamaskExtensionData = (await module.exports.getExtensionsData())
+ .metamask;
+ return metamaskExtensionData.id;
+ },
  async setExpectInstance(expect) {
  expectInstance = expect;
  },
@@ -87,8 +92,7 @@ module.exports = {
  return true;
  },
  async assignWindows() {
- const metamaskExtensionData = (await module.exports.getExtensionsData())
- .metamask;
+ const metamaskExtensionId = await module.exports.metamaskExtensionId();
 
  let pages = await browser.contexts()[0].pages();
  for (const page of pages) {
@@ -97,21 +101,21 @@ module.exports = {
  } else if (
  page
  .url()
- .includes(`chrome-extension://${metamaskExtensionData.id}/home.html`)
+ .includes(`chrome-extension://${metamaskExtensionId}/home.html`)
  ) {
  metamaskWindow = page;
  } else if (
  page
  .url()
  .includes(
- `chrome-extension://${metamaskExtensionData.id}/notification.html`,
+ `chrome-extension://${metamaskExtensionId}/notification.html`,
  )
  ) {
  metamaskNotificationWindow = page;
  } else if (
  page
  .url()
- .includes(`chrome-extension://${metamaskExtensionData.id}/popup.html`)
+ .includes(`chrome-extension://${metamaskExtensionId}/popup.html`)
  ) {
  metamaskPopupWindow = page;
  }
@@ -161,16 +165,15 @@ module.exports = {
  return true;
  },
  async switchToMetamaskNotification() {
- const metamaskExtensionData = (await module.exports.getExtensionsData())
- .metamask;
+ const metamaskExtensionId = await module.exports.metamaskExtensionId();
 
  let pages = await browser.contexts()[0].pages();
  for (const page of pages) {
  if (
  page
  .url()
  .includes(
- `chrome-extension://${metamaskExtensionData.id}/notification.html`,
+ `chrome-extension://${metamaskExtensionId}/notification.html`,
  )
  ) {
  metamaskNotificationWindow = page;
@@ -337,16 +340,13 @@ module.exports = {
  }
  },
  async waitUntilStable(page) {
- const metamaskExtensionData = (await module.exports.getExtensionsData())
- .metamask;
+ const metamaskExtensionId = await module.exports.metamaskExtensionId();
 
  if (
  page &&
  page
  .url()
- .includes(
- `chrome-extension://${metamaskExtensionData.id}/notification.html`,
- )
+ .includes(`chrome-extension://${metamaskExtensionId}/notification.html`)
  ) {
  await page.waitForLoadState('load');
  await page.waitForLoadState('domcontentloaded');
@@ -477,7 +477,7 @@ module.exports = {
 
  const extensionId = (
  await extensionData.locator('#extension-id').textContent()
- ).replace('ID: ', '');
+ ).split(': ')[1];
 
  extensionsData[extensionName] = {
  version: extensionVersion,