test: refactoring

matter-labs · Aug 7, 2023 · 572697b · 572697b
1 parent 1a6db57
commit 572697b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/tests/e2e/src/pages/main.page.ts b/tests/e2e/src/pages/main.page.ts
@@ -77,6 +77,10 @@ export class MainPage extends BasePage {
     return `${this.byTestId}network-switcher`;
   }
 
+  get confirmFeeChange() {
+    return "//*[@class='alert-body']//*[contains(string(), 'Confirm')]";
+  }
+
   async selectTransaction(transactionType: string) {
     try {
       let route: string;

diff --git a/tests/e2e/src/pages/metamask.page.ts b/tests/e2e/src/pages/metamask.page.ts
@@ -2,6 +2,7 @@
 import { setTimeout } from "timers/promises";
 
 import { BasePage } from "./base.page";
+import { MainPage } from "./main.page";
 import { Extension } from "../data/data";
 import { depositTag, Helper } from "../helpers/helper";
 import { config, wallet } from "../support/config";
@@ -39,9 +40,6 @@ export class MetamaskPage extends BasePage {
     return "//*[@class='alert-body']//*[contains(text(), 'Fee has changed')]";
   }
 
-  get confirmFeeChange() {
-    return "//*[@class='alert-body']//*[contains(., 'Confirm')]";
-  }
   get saveFeeBtn() {
     return "//*[@class='popover-container']//button";
   }
@@ -214,10 +212,11 @@ export class MetamaskPage extends BasePage {
   }
 
   async isFeeAlert(helper: Helper, element: string) {
+    const mainPage = new MainPage(this.world);
     const feeAlert = await helper.checkElementVisible(this.feeChangerAlert);
     if (feeAlert) {
-      await helper.checkElementVisible(this.confirmFeeChange);
-      await this.world.page?.locator(this.confirmFeeChange).first().click();
+      await helper.checkElementVisible(mainPage.confirmFeeChange);
+      await this.world.page?.locator(mainPage.confirmFeeChange).first().click();
       await this.catchPopUpByClick(element);
       return true;
     }