From 31c6bfc64adfc7e33ae66438b9d028962cfac665 Mon Sep 17 00:00:00 2001
From: Jakub Mucha <jakub.mucha@icloud.com>
Date: Sun, 30 Oct 2022 21:17:33 +0000
Subject: [PATCH] chore: use pageobjects for loaders, spinners, etc

Signed-off-by: Jakub Mucha <jakub.mucha@icloud.com>
---
 commands/playwright.js | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/commands/playwright.js b/commands/playwright.js
index 29d95ca64..0c73f9ab6 100644
--- a/commands/playwright.js
+++ b/commands/playwright.js
@@ -1,5 +1,9 @@
 const fetch = require('node-fetch');
 const { chromium } = require('@playwright/test');
+const {
+  notificationPageElements,
+} = require('../pages/metamask/notification-page');
+const { pageElements } = require('../pages/metamask/page');
 const sleep = require('util').promisify(setTimeout);
 
 let browser;
@@ -236,8 +240,14 @@ module.exports = {
     await page.waitForLoadState('load');
     await page.waitForLoadState('domcontentloaded');
     await page.waitForLoadState('networkidle');
-    await module.exports.waitToBeHidden('#loading__logo', page);
-    await module.exports.waitToBeHidden('#loading__spinner', page);
+    await module.exports.waitToBeHidden(
+      notificationPageElements.loadingLogo,
+      page,
+    );
+    await module.exports.waitToBeHidden(
+      notificationPageElements.loadingSpinner,
+      page,
+    );
   },
   waitUntilMainWindowIsStable: async (page = mainWindow) => {
     await page.waitForLoadState('load');
@@ -248,19 +258,21 @@ module.exports = {
     await page.waitForLoadState('load');
     await page.waitForLoadState('domcontentloaded');
     await page.waitForLoadState('networkidle');
-    await module.exports.waitToBeHidden('.loading-logo', page); // on reload
-    await module.exports.waitToBeHidden('.loading-spinner', page); // on reload
-    await module.exports.waitToBeHidden('.loading-overlay', page); // on change network
-    await module.exports.waitToBeHidden('.loading-overlay__spinner', page); // on balance load
-
+    await module.exports.waitToBeHidden(pageElements.loadingLogo, page); // shown on reload
+    await module.exports.waitToBeHidden(pageElements.loadingSpinner, page); // shown on reload
+    await module.exports.waitToBeHidden(pageElements.loadingOverlay, page); // shown on change network
+    await module.exports.waitToBeHidden(
+      pageElements.loadingOverlaySpinner,
+      page,
+    ); // shown on balance load
     // network error handler
-    const networkError = await page.$('.loading-overlay__error-buttons');
+    const networkError = await page.$(pageElements.loadingOverlayErrorButtons);
     if (networkError) {
       await module.exports.waitAndClick(
-        '.loading-overlay__error-buttons .btn-primary',
+        pageElements.loadingOverlayErrorButtonsRetryButton,
         page,
       );
-      await module.exports.waitToBeHidden('.loading-overlay', page);
+      await module.exports.waitToBeHidden(pageElements.loadingOverlay, page);
     }
   },
 };