HP-2804: refactor e2e tests and models to improve code consistency and strictness

tafid · tafid · commit 2276daaf872e · 2025-11-26T18:47:44.000+02:00
diff --git a/tests/playwright/e2e/client/account-recharging.spec.ts b/tests/playwright/e2e/client/account-recharging.spec.ts
@@ -1,13 +1,12 @@
-import { test } from "@hipanel-core/fixtures";
-import { expect } from "@playwright/test";
+import { expect, test } from "@hipanel-core/fixtures";
 
 test("Test the Account recharging page works @hipanel-module-finance @client @seller", async ({ clientPage, sellerPage }) => {
   const pageUrl = "/merchant/pay/deposit";
   for (let page of [clientPage, sellerPage]) {
     await page.goto(pageUrl);
     await expect(page).toHaveTitle("Account recharging");
     await expect(page.locator("//input[@id='depositform-amount']")).toBeVisible();
-    await expect(page.getByRole('button', { name: 'Proceed' })).toBeVisible();
+    await expect(page.getByRole("button", { name: "Proceed" })).toBeVisible();
     await expect(page.locator("h4:text('Important information')")).toBeVisible();
     await expect(page.locator("p:text('Remember to return to the site after successful payment!')")).toBeVisible();
   }
diff --git a/tests/playwright/e2e/manager/currency-exchange.spec.ts b/tests/playwright/e2e/manager/currency-exchange.spec.ts
@@ -1,33 +1,36 @@
 import { test } from "@hipanel-core/fixtures";
 import { expect } from "@playwright/test";
 import Select2 from "@hipanel-core/input/Select2";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
+import AdvancedSearch from "@hipanel-core/helper/AdvancedSearch";
 
-test("Test the currency exchange operation are works and creates a bill @hipanel-module-finance @manager", async ({ managerPage }) => {
-  await managerPage.goto("/finance/bill/index");
-  await expect(managerPage).toHaveTitle("Bills");
+test("the currency exchange operation works and creates a bill @hipanel-module-finance @manager", async ({ page }) => {
+  const advancedSearch = new AdvancedSearch(page);
 
-  await managerPage.locator("a:has-text(\"Currency exchange\")").click();
-  await expect(managerPage).toHaveTitle("Create currency exchange");
+  await page.goto("/finance/bill/index");
+  await expect(page).toHaveTitle("Bills");
+
+  await page.locator("a:has-text(\"Currency exchange\")").click();
+  await expect(page).toHaveTitle("Create currency exchange");
 
   await Promise.all([
-    managerPage.waitForResponse(response => response.status() === 200 && response.url().includes("get-exchange-rates")),
-    Select2.field(managerPage, "#currencyexchangeform-client_id").setValue("hipanel_test_user"),
+    page.waitForResponse(response => response.status() === 200 && response.url().includes("get-exchange-rates")),
+    Select2.field(page, "#currencyexchangeform-client_id").setValue("hipanel_test_user"),
   ]);
 
-  await Select2.field(managerPage, "#currencyexchangeform-from").setValue("USD");
-  await Select2.field(managerPage, "#currencyexchangeform-to").setValue("UAH");
-  await managerPage.locator("input[name=\"CurrencyExchangeForm\\[sum\\]\"]").fill("200");
-
-  await managerPage.locator("button:has-text(\"Create\")").click();
+  await Select2.field(page, "#currencyexchangeform-from").setValue("USD");
+  await Select2.field(page, "#currencyexchangeform-to").setValue("UAH");
+  await page.locator("input[name=\"CurrencyExchangeForm\\[sum\\]\"]").fill("200");
 
-  await Alert.on(managerPage).hasText("Currency was exchanged successfully");
+  await page.locator("button:has-text(\"Create\")").click();
 
-  await Select2.field(managerPage, "#billsearch-client_id").setValue("hipanel_test_user");
+  await Alert.on(page).hasText("Currency was exchanged successfully");
 
-  await managerPage.goto(managerPage.url() + "&sort=-time");
+  await advancedSearch.setFilter("client_id", "hipanel_test_user");
+  await advancedSearch.setFilter("descr", "Exchanging 200.00 USD");
+  await advancedSearch.submitButton();
 
-  await managerPage.locator("div[role=grid] a:has-text(\"-$200.00\")").first().click();
+  await page.locator("div[role=grid] a:has-text(\"-$200.00\")").first().click();
 
-  await expect(managerPage).toHaveTitle(/^hipanel_test_user: -200.00 usd Exchanging 200.00 USD.*/);
+  await expect(page).toHaveTitle(/^hipanel_test_user: -200.00 usd Exchanging 200.00 USD.*/);
 });
diff --git a/tests/playwright/e2e/sales.spec.ts b/tests/playwright/e2e/sales.spec.ts
@@ -5,7 +5,7 @@ import ServerView from "@hipanel-module-finance/page/bill/ServerView";
 import SaleHelper from "@hipanel-module-finance/Helper/SaleHelper";
 import Index from "@hipanel-core/page/Index";
 import SaleUpdate from "@hipanel-module-finance/page/bill/SaleUpdate";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 import DateHelper from "@hipanel-core/helper/DateHelper";
 
 const sales: Array<Sale> = [
diff --git a/tests/playwright/e2e/seller/bill-copy.spec.ts b/tests/playwright/e2e/seller/bill-copy.spec.ts
@@ -4,7 +4,7 @@ import BillForm from "@hipanel-module-finance/page/bill/BillForm";
 import BillHelper from "@hipanel-module-finance/Helper/BillHelper";
 import Bill from "@hipanel-module-finance/model/Bill";
 import Index from "@hipanel-core/page/Index";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 
 const bill: Bill = {
   client: "hipanel_test_user",
@@ -48,4 +48,3 @@ test("Create and copy bill with charges @hipanel-module-finance @seller", async
   await billHelper.ensureBillDidntChange(bill, billId);
 
 });
-
diff --git a/tests/playwright/e2e/seller/bill-creation.spec.ts b/tests/playwright/e2e/seller/bill-creation.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@hipanel-core/fixtures";
 import BillForm from "@hipanel-module-finance/page/bill/BillForm";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 
 let billId;
 
@@ -92,4 +92,3 @@ test.describe("Bill creation", () => {
     await expect(page.locator(`table >> text=${chargeDescr}`)).toBeVisible();
   });
 });
-
diff --git a/tests/playwright/e2e/seller/bill-with-charges.spec.ts b/tests/playwright/e2e/seller/bill-with-charges.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from "@hipanel-core/fixtures";
 import BillForm from "@hipanel-module-finance/page/bill/BillForm";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 import BillView from "@hipanel-module-finance/page/bill/BillView";
 
 test("Test we add the charges to created bill @hipanel-module-finance @seller", async ({ page }) => {
diff --git a/tests/playwright/e2e/seller/generate-invoice.spec.ts b/tests/playwright/e2e/seller/generate-invoice.spec.ts
@@ -1,11 +1,13 @@
-import { test, expect } from "@hipanel-core/fixtures";
+import { expect, test } from "@hipanel-core/fixtures";
+import { Page } from "@playwright/test";
 import BillForm from "@hipanel-module-finance/page/bill/BillForm";
 import BillView from "@hipanel-module-finance/page/bill/BillView";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 import Index from "@hipanel-core/page/Index";
 import Select2 from "@hipanel-core/input/Select2";
+import Bill from "@hipanel-module-finance/model/Bill";
 
-const bill = {
+const bill: Bill = {
   client: "hipanel_test_user",
   type: "Positive balance correction",
   requisite: "Test Reseller",
@@ -14,7 +16,7 @@ const bill = {
   quantity: 1,
 };
 
-async function createBill(page) {
+async function createBill(page: Page) {
   await page.goto("/finance/bill/create");
   const form = new BillForm(page);
   await form.fill([bill]);
@@ -24,24 +26,24 @@ async function createBill(page) {
   return await form.getSavedBillId();
 }
 
-async function deleteBill(page, billId) {
+async function deleteBill(page: Page, billId) {
   await page.goto("/finance/bill/view?id=" + billId);
-  const viewPage = await new BillView(page);
+  const viewPage = new BillView(page);
   await viewPage.detailMenuItem("Delete", true).click();
 
   // Handle the confirmation alert
-  await page.once("dialog", async (dialog) => {
+  page.once("dialog", async (dialog) => {
     await dialog.accept();
   });
 
   await Alert.on(page).hasText("Payment was deleted successfully");
 }
 
 test("Test 'Generate invoice' button is work and the form opens @hipanel-module-finance @seller", {
-  tag: '@missing-requisites',
+  tag: "@missing-requisites",
 }, async ({ page }) => {
   const billId = await createBill(page);
-  const action = '/finance/bill/index';
+  const action = "/finance/bill/index";
 
   await page.goto(action);
   const index = new Index(page);
diff --git a/tests/playwright/e2e/seller/internal-transfer.spec.ts b/tests/playwright/e2e/seller/internal-transfer.spec.ts
@@ -4,7 +4,7 @@ import BillHelper from "@hipanel-module-finance/Helper/BillHelper";
 import Bill from "@hipanel-module-finance/model/Bill";
 import TransferForm from "@hipanel-module-finance/page/bill/TransferForm";
 import Transfer from "@hipanel-module-finance/model/Transfer";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 
 const transfer: Transfer = {
   sum: 100,
@@ -52,4 +52,3 @@ test("Ensure transfer is working correctly @hipanel-module-finance @seller", asy
   await transferForm.submit();
   await Alert.on(sellerPage).hasText('Transfer was completed');
 });
-
diff --git a/tests/playwright/e2e/seller/toggle-sign.spec.ts b/tests/playwright/e2e/seller/toggle-sign.spec.ts
@@ -1,7 +1,7 @@
 import { test } from "@hipanel-core/fixtures";
 import { expect } from "@playwright/test";
 import BillForm from "@hipanel-module-finance/page/bill/BillForm";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 
 const bill = {
   client: "hipanel_test_user",
diff --git a/tests/playwright/model/Bill.ts b/tests/playwright/model/Bill.ts
@@ -1,15 +1,15 @@
-import Charge from "@hipanel-module-finance/model/Charge";
+import Charge from "./Charge";
 
-export default class Bill {
-  public client: string;
-  public type: string;
-  public currency: string;
-  public sum: number;
-  public quantity: number;
-  public requisite?: string;
-  public time?: string | null;
-  public description?: string | null;
-  public class?: string | null;
-  public object?: string | null;
-  public charges?: Array<Charge> | null;
+export default interface Bill {
+  client: string;
+  type: string;
+  currency: string;
+  sum: number;
+  quantity: number;
+  requisite?: string;
+  time?: string | null;
+  description?: string | null;
+  class?: string | null;
+  object?: string | null;
+  charges?: Array<Charge> | null;
 }
diff --git a/tests/playwright/model/Charge.ts b/tests/playwright/model/Charge.ts
@@ -1,9 +1,9 @@
-export default class Charge {
-  public class: string;
-  public object: string;
-  public type: string;
-  public quantity: number;
-  public sum: number;
-  public description?: string | null;
-  public time?: string | null;
+export default interface Charge {
+  class: string;
+  object: string;
+  type: string;
+  quantity: number;
+  sum: number;
+  description?: string | null;
+  time?: string | null;
 }
diff --git a/tests/playwright/model/Sale.ts b/tests/playwright/model/Sale.ts
@@ -1,7 +1,7 @@
-export default class Sale {
-  public client: string;
-  public tariff: string;
-  public column: string;
-  public server: string;
-  public type: string;
+export default interface Sale {
+  client: string;
+  tariff: string;
+  column: string;
+  server: string;
+  type: string;
 }
diff --git a/tests/playwright/model/Transfer.ts b/tests/playwright/model/Transfer.ts
@@ -1,8 +1,6 @@
-import Bill from "@hipanel-module-finance/model/Bill";
-
-export default class Transfer {
-    sum: number;
-    client: string;
-    receiverId: string;
-    currency: string;
+export default interface Transfer {
+  sum: number;
+  client: string;
+  receiverId: string;
+  currency: string;
 }
diff --git a/tests/playwright/page/bill/BillForm.ts b/tests/playwright/page/bill/BillForm.ts
@@ -4,7 +4,7 @@ import TreeSelect from "@hipanel-core/input/TreeSelect";
 import SumWithCurrency from "@hipanel-core/input/SumWithCurrency";
 import Bill from "@hipanel-module-finance/model/Bill";
 import Charge from "@hipanel-module-finance/model/Charge";
-import Alert from "@hipanel-core/ui/Alert";
+import { Alert } from "@hipanel-core/shared/ui/components";
 
 export default class BillForm {
   private page: Page;
@@ -30,7 +30,7 @@ export default class BillForm {
     await SumWithCurrency.field(this.page, "billform", k).setSumAndCurrency(bill.sum, bill.currency);
     await this.page.locator(`#billform-${k}-quantity`).fill(bill.quantity.toString());
     if (bill.requisite) {
-      await Select2.field(this.page, `#billform-${k}-requisite_id`).setValue(bill.requisite)
+      await Select2.field(this.page, `#billform-${k}-requisite_id`).setValue(bill.requisite);
     }
 
     if (bill.charges) {
diff --git a/tests/playwright/page/bill/BillView.ts b/tests/playwright/page/bill/BillView.ts
@@ -7,26 +7,26 @@ export default class BillView {
   private page: Page;
   private detailMenuFunctionsLocator: Locator;
 
-  public constructor(page: Page) {
+  constructor(page: Page) {
     this.page = page;
     this.detailMenuFunctionsLocator = page.locator(".widget-user-2 .nav");
   }
 
-  public async checkCharge(charge: Charge) {
+  async checkCharge(charge: Charge) {
     await expect(this.page.locator(`tr td a:text("${charge.object}")`).first()).toBeVisible();
     await expect(this.page.locator(`tr td b:text("${charge.type}")`).first()).toBeVisible();
     await expect(this.page.locator(`tr td a >> text=/.*${charge.sum}.*/i`).first()).toBeVisible();
   }
 
-  public detailMenuItem(item: string, withAcceptDialog: boolean = false): Locator {
+  detailMenuItem(item: string, withAcceptDialog: boolean = false): Locator {
     if (withAcceptDialog) {
       this.page.on("dialog", dialog => dialog.accept());
     }
 
     return this.detailMenuFunctionsLocator.locator(`:scope a:text("${item}")`);
   }
 
-  public async checkBillData(bill: Bill) {
+  async checkBillData(bill: Bill) {
     // TODO: Implement
   }
 }
diff --git a/tests/playwright/page/bill/SaleUpdate.ts b/tests/playwright/page/bill/SaleUpdate.ts
@@ -1,19 +1,19 @@
-import { expect, Page } from "@playwright/test";
+import { Page } from "@playwright/test";
 import Sale from "@hipanel-module-finance/model/Sale";
 import Select2 from "@hipanel-core/input/Select2";
 
 export default class SaleUpdate {
   private page: Page;
 
-  public constructor(page: Page) {
+  constructor(page: Page) {
     this.page = page;
   }
 
   async changeTariff(sales: Array<Sale>) {
     for (let i = 0; i < sales.length; i++) {
       await Select2.field(this.page, `select[id*='sale-${i}-tariff_id']`).setValue(sales[i].tariff);
     }
-    await this.page.locator('button:has-text("Save")').click();
+    await this.page.locator("button:has-text(\"Save\")").click();
   }
 
 }
diff --git a/tests/playwright/page/bill/ServerView.ts b/tests/playwright/page/bill/ServerView.ts
@@ -1,17 +1,17 @@
-import { expect, Page } from "@playwright/test";
+import { Page } from "@playwright/test";
 import Sale from "@hipanel-module-finance/model/Sale";
 import Select2 from "@hipanel-core/input/Select2";
 
 
 export default class ServerView {
   private page: Page;
 
-  public constructor(page: Page) {
+  constructor(page: Page) {
     this.page = page;
   }
 
   async changeTariff(sale: Sale) {
-    await this.page.locator('a:has-text("Change tariff")').click();
+    await this.page.locator("a:has-text(\"Change tariff\")").click();
     await Select2.field(this.page, "select[id*='server-client_id']").setValue(sale.client);
     await Select2.field(this.page, "select[id*='server-tariff_id']").setValue(sale.tariff);
     await this.page.locator("button:has-text('Sell')").first().click();
diff --git a/tests/playwright/page/bill/TransferForm.ts b/tests/playwright/page/bill/TransferForm.ts
