From aaf2b1661c743293038450f1fb2fd1599c018ba9 Mon Sep 17 00:00:00 2001 From: yurydubinin <62520712+yury-dubinin@users.noreply.github.com> Date: Thu, 28 Nov 2024 14:40:40 +0100 Subject: [PATCH] apply AI comment --- packages/e2e/pages/transactions-page.ts | 186 ++++++++++++------------ 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/packages/e2e/pages/transactions-page.ts b/packages/e2e/pages/transactions-page.ts index 735f1001a3..ce2327e76a 100644 --- a/packages/e2e/pages/transactions-page.ts +++ b/packages/e2e/pages/transactions-page.ts @@ -3,175 +3,175 @@ import { type Locator, type Page, expect, -} from '@playwright/test' +} from "@playwright/test"; -import { BasePage } from './base-page' -const TRANSACTION_CONFIRMATION_TIMEOUT = 2000 +import { BasePage } from "./base-page"; +const TRANSACTION_CONFIRMATION_TIMEOUT = 2000; export class TransactionsPage extends BasePage { - readonly transactionRow: Locator - readonly viewExplorerLink: Locator - readonly closeTransactionBtn: Locator - readonly page: Page - readonly claimAndClose: Locator - readonly claimAllBtn: Locator + readonly transactionRow: Locator; + readonly viewExplorerLink: Locator; + readonly closeTransactionBtn: Locator; + readonly page: Page; + readonly claimAndClose: Locator; + readonly claimAllBtn: Locator; constructor(page: Page) { - super(page) - this.page = page - this.transactionRow = page.locator('//div/p[.="Swapped"]') - this.viewExplorerLink = page.locator('//a/span["View on explorer"]/..') - this.closeTransactionBtn = page.locator('//button[@data-testid="close"]') - this.claimAndClose = page.getByRole('button', { - name: 'Claim and close', + super(page); + this.page = page; + this.transactionRow = page.locator('//div/p[.="Swapped"]'); + this.viewExplorerLink = page.locator('//a/span["View on explorer"]/..'); + this.closeTransactionBtn = page.locator('//button[@data-testid="close"]'); + this.claimAndClose = page.getByRole("button", { + name: "Claim and close", exact: true, - }) - this.claimAllBtn = page.getByRole('button', { - name: 'Claim all', + }); + this.claimAllBtn = page.getByRole("button", { + name: "Claim all", exact: true, - }) + }); } async open() { - await this.page.goto('/transactions') - return this + await this.page.goto("/transactions"); + return this; } async viewTransactionByNumber(number: number) { - await this.transactionRow.nth(number).click() - await this.page.waitForTimeout(1000) + await this.transactionRow.nth(number).click(); + await this.page.waitForTimeout(1000); } async viewBySwapAmount(amount: string | number) { // Transactions need some time to get loaded, wait for 30 seconds. - await this.page.waitForTimeout(30000) - await this.page.reload() - const loc = `//div/div[@class="subtitle1 text-osmoverse-100" and contains(text(), "${amount}")]` + await this.page.waitForTimeout(30000); + await this.page.reload(); + const loc = `//div/div[@class="subtitle1 text-osmoverse-100" and contains(text(), "${amount}")]`; const isTransactionVisible = await this.page .locator(loc) - .isVisible({ timeout: 3000 }) + .isVisible({ timeout: 3000 }); if (!isTransactionVisible) { - await this.page.waitForTimeout(30000) - await this.page.reload() + await this.page.waitForTimeout(30000); + await this.page.reload(); } - await this.page.waitForTimeout(1000) - await this.page.locator(loc).click({ timeout: 3000 }) + await this.page.waitForTimeout(1000); + await this.page.locator(loc).click({ timeout: 3000 }); } async closeTransaction() { - await this.closeTransactionBtn.click() + await this.closeTransactionBtn.click(); } async viewOnExplorerIsVisible() { - expect(this.viewExplorerLink.isVisible).toBeTruthy() + await expect(this.viewExplorerLink).toBeVisible(); } async getOnExplorerLink() { - const trxUrl = await this.viewExplorerLink.getAttribute('href') - console.log(`Trx url: ${trxUrl}`) - return trxUrl + const trxUrl = await this.viewExplorerLink.getAttribute("href"); + console.log(`Trx url: ${trxUrl}`); + return trxUrl; } async takeScreenshot(name: string) { await this.page.screenshot({ path: `screenshot-transactions-${name}.png`, fullPage: true, - }) + }); } async cancelLimitOrder( amount: string, price: string, - context: BrowserContext, + context: BrowserContext ) { - const cancelBtn = `//td//span[.='${amount}']/../../../../..//td//p[.='$${price}']/../../..//button` - console.log(`Use locator for a cancel btn: ${cancelBtn}`) - await this.page.locator(cancelBtn).first().click() - const pageApprove = context.waitForEvent('page') - const approvePage = await pageApprove - await approvePage.waitForLoadState() - const approveBtn = approvePage.getByRole('button', { - name: 'Approve', - }) - await expect(approveBtn).toBeEnabled() + const cancelBtn = `//td//span[.='${amount}']/../../../../..//td//p[.='$${price}']/../../..//button`; + console.log(`Use locator for a cancel btn: ${cancelBtn}`); + await this.page.locator(cancelBtn).first().click(); + const pageApprove = context.waitForEvent("page"); + const approvePage = await pageApprove; + await approvePage.waitForLoadState(); + const approveBtn = approvePage.getByRole("button", { + name: "Approve", + }); + await expect(approveBtn).toBeEnabled(); const msgContentAmount = await approvePage - .getByText('Execute contract') - .textContent() - console.log(`Wallet is approving this msg: \n${msgContentAmount}`) + .getByText("Execute contract") + .textContent(); + console.log(`Wallet is approving this msg: \n${msgContentAmount}`); // Approve trx - await approveBtn.click() + await approveBtn.click(); // Expect that this is a cancel limit call - expect(msgContentAmount).toContain('cancel_limit') + expect(msgContentAmount).toContain("cancel_limit"); // wait for trx confirmation - await this.page.waitForTimeout(TRANSACTION_CONFIRMATION_TIMEOUT) + await this.page.waitForTimeout(TRANSACTION_CONFIRMATION_TIMEOUT); } async isFilledByLimitPrice(price: string | number) { - const loc = `//td//span[.='Filled']/../../..//td//p[.='$${price}']` - console.log(`Use Limit Order locator: ${loc}`) + const loc = `//td//span[.='Filled']/../../..//td//p[.='$${price}']`; + console.log(`Use Limit Order locator: ${loc}`); await expect(this.page.locator(loc).first()).toBeVisible({ timeout: 120_000, visible: true, - }) + }); } async claimAndCloseAny(context: BrowserContext) { const isClaimable = await this.claimAndClose .first() - .isVisible({ timeout: 3000 }) + .isVisible({ timeout: 3000 }); if (!isClaimable) { - console.log('No partially filled orders to claim.') - return + console.log("No partially filled orders to claim."); + return; } - await this.claimAndClose.first().click() - const pageApprove = context.waitForEvent('page') - const approvePage = await pageApprove - await approvePage.waitForLoadState() - const approveBtn = approvePage.getByRole('button', { - name: 'Approve', - }) - await expect(approveBtn).toBeEnabled() + await this.claimAndClose.first().click(); + const pageApprove = context.waitForEvent("page"); + const approvePage = await pageApprove; + await approvePage.waitForLoadState(); + const approveBtn = approvePage.getByRole("button", { + name: "Approve", + }); + await expect(approveBtn).toBeEnabled(); const msgContentAmount1 = await approvePage - .getByText('Execute contract') + .getByText("Execute contract") .first() - .textContent() + .textContent(); const msgContentAmount2 = await approvePage - .getByText('Execute contract') + .getByText("Execute contract") .last() - .textContent() + .textContent(); console.log( - `Wallet is approving this msg: \n${msgContentAmount1}---- \n${msgContentAmount2}`, - ) + `Wallet is approving this msg: \n${msgContentAmount1}---- \n${msgContentAmount2}` + ); // Approve trx - await approveBtn.click() - expect(msgContentAmount1).toContain('claim_limit') - expect(msgContentAmount2).toContain('cancel_limit') + await approveBtn.click(); + expect(msgContentAmount1).toContain("claim_limit"); + expect(msgContentAmount2).toContain("cancel_limit"); // wait for trx confirmation - await this.page.waitForTimeout(TRANSACTION_CONFIRMATION_TIMEOUT) + await this.page.waitForTimeout(TRANSACTION_CONFIRMATION_TIMEOUT); } async claimAll(context: BrowserContext) { - await this.claimAllBtn.click() - const pageApprove = context.waitForEvent('page') - const approvePage = await pageApprove - await approvePage.waitForLoadState() - const approveBtn = approvePage.getByRole('button', { - name: 'Approve', - }) - await expect(approveBtn).toBeEnabled() + await this.claimAllBtn.click(); + const pageApprove = context.waitForEvent("page"); + const approvePage = await pageApprove; + await approvePage.waitForLoadState(); + const approveBtn = approvePage.getByRole("button", { + name: "Approve", + }); + await expect(approveBtn).toBeEnabled(); // Approve trx - await approveBtn.click() + await approveBtn.click(); // wait for trx confirmation - await this.page.waitForTimeout(TRANSACTION_CONFIRMATION_TIMEOUT) + await this.page.waitForTimeout(TRANSACTION_CONFIRMATION_TIMEOUT); } async claimAllIfPresent(context: BrowserContext) { - const isClaimable = await this.claimAllBtn.isVisible({ timeout: 4000 }) + const isClaimable = await this.claimAllBtn.isVisible({ timeout: 4000 }); if (isClaimable) { - console.log('Claim All filled limit orders!') - await this.claimAll(context) + console.log("Claim All filled limit orders!"); + await this.claimAll(context); } else { - console.log('No Claim All button.') + console.log("No Claim All button."); } } }