From 38b2a6e293bc018ecce4b7b6957f3f8f773bf179 Mon Sep 17 00:00:00 2001 From: Victor Alber Date: Thu, 19 Dec 2024 14:38:04 +0100 Subject: [PATCH] Addressing PR comments --- .../ledger-live-desktop/tests/page/asset.page.ts | 4 ++++ apps/ledger-live-desktop/tests/page/swap.page.ts | 8 +------- .../tests/specs/speculos/delegate.spec.ts | 11 +++++++++-- .../tests/specs/speculos/swap.spec.ts | 16 +++++++--------- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/apps/ledger-live-desktop/tests/page/asset.page.ts b/apps/ledger-live-desktop/tests/page/asset.page.ts index 625a9f818f0..aac5014e2ff 100644 --- a/apps/ledger-live-desktop/tests/page/asset.page.ts +++ b/apps/ledger-live-desktop/tests/page/asset.page.ts @@ -1,3 +1,4 @@ +import { step } from "tests/misc/reporters/step"; import { AppPage } from "tests/page/abstractClasses"; export class AssetPage extends AppPage { @@ -5,15 +6,18 @@ export class AssetPage extends AppPage { private buyButton = this.page.getByTestId("asset-page-buy-button"); private swapButton = this.page.getByTestId("asset-page-swap-button"); + @step("Start stake flow") async startStakeFlow() { await this.stakeButton.click(); await this.page.getByText("Choose Account").waitFor({ state: "visible" }); } + @step("Start buy flow") async startBuyFlow() { await this.buyButton.click(); } + @step("Start swap flow") async startSwapFlow() { await this.swapButton.click(); } diff --git a/apps/ledger-live-desktop/tests/page/swap.page.ts b/apps/ledger-live-desktop/tests/page/swap.page.ts index 6468326a89e..65b4696078c 100644 --- a/apps/ledger-live-desktop/tests/page/swap.page.ts +++ b/apps/ledger-live-desktop/tests/page/swap.page.ts @@ -208,16 +208,10 @@ export class SwapPage extends AppPage { await this.chooseAssetDrawer.chooseFromAsset(accountToSwapFrom.currency.name); } - @step("Expect Highest market cap currency to be selected") - async expectHighestMcapToBeSelected(electronApp: ElectronApplication) { - const [, webview] = electronApp.windows(); - expect(webview.getByTestId(this.fromAccountCoinSelector)).toContainText("BTC"); - } - @step("Expect asset or account selected $0 to be displayed") async expectSelectedAssetDisplayed(asset: string, electronApp: ElectronApplication) { const [, webview] = electronApp.windows(); - expect(webview.getByTestId(this.fromAccountCoinSelector)).toContainText(asset); + await expect(webview.getByTestId(this.fromAccountCoinSelector)).toContainText(asset); } @step("Fill in amount: $1") diff --git a/apps/ledger-live-desktop/tests/specs/speculos/delegate.spec.ts b/apps/ledger-live-desktop/tests/specs/speculos/delegate.spec.ts index fccfb0658f0..eceb91be039 100644 --- a/apps/ledger-live-desktop/tests/specs/speculos/delegate.spec.ts +++ b/apps/ledger-live-desktop/tests/specs/speculos/delegate.spec.ts @@ -1,7 +1,7 @@ import { test } from "../../fixtures/common"; import { Account } from "@ledgerhq/live-common/e2e/enum/Account"; import { Delegate } from "../../models/Delegate"; -import { addTmsLink } from "tests/utils/allureUtils"; +import { addTmsLink, addBugLink } from "tests/utils/allureUtils"; import { getDescription } from "../../utils/customJsonReporter"; import { CLI } from "tests/utils/cliUtils"; import { Currency } from "@ledgerhq/live-common/e2e/enum/Currency"; @@ -10,6 +10,7 @@ const e2eDelegationAccounts = [ { delegate: new Delegate(Account.ATOM_1, "0.001", "Ledger"), xrayTicket: "B2CQA-2740, B2CQA-2770", + bugLing: "LIVE-14501", }, { delegate: new Delegate(Account.SOL_1, "0.001", "Ledger by Figment"), @@ -69,10 +70,16 @@ test.describe("Delegate flows", () => { test( `[${account.delegate.account.currency.name}] Delegate`, { - annotation: { type: "TMS", description: account.xrayTicket }, + annotation: [ + { type: "TMS", description: account.xrayTicket }, + { type: "BUG", description: account.bugLing }, + ], }, async ({ app }) => { await addTmsLink(getDescription(test.info().annotations, "TMS").split(", ")); + if (account.bugLing) { + await addBugLink(getDescription(test.info().annotations, "BUG").split(", ")); + } await app.layout.goToAccounts(); await app.accounts.navigateToAccountByName(account.delegate.account.accountName); diff --git a/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts b/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts index b04ea615721..4db95b8fa03 100644 --- a/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts +++ b/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts @@ -121,7 +121,7 @@ const swaps = [ Provider.CHANGELLY, Rate.FLOAT, ), - xrayTicket: "B2CQA-2828", + xrayTicket: "B2CQA-2775", }, { swap: new Swap( @@ -132,7 +132,7 @@ const swaps = [ Provider.CHANGELLY, Rate.FLOAT, ), - xrayTicket: "B2CQA-2827", + xrayTicket: "B2CQA-2776", }, { swap: new Swap( @@ -143,7 +143,7 @@ const swaps = [ Provider.CHANGELLY, Rate.FLOAT, ), - xrayTicket: "B2CQA-2829", + xrayTicket: "B2CQA-2777", }, { swap: new Swap( @@ -436,13 +436,11 @@ test.describe("Swap flow from different entry point", () => { test.beforeAll(async () => { process.env.SWAP_DISABLE_APPS_INSTALL = "true"; process.env.SWAP_API_BASE = "https://swap-stg.ledger-test.com/v5"; - process.env.DISABLE_TRANSACTION_BROADCAST = "1"; }); test.afterAll(async () => { delete process.env.SWAP_DISABLE_APPS_INSTALL; delete process.env.SWAP_API_BASE; - delete process.env.DISABLE_TRANSACTION_BROADCAST; }); test.use({ @@ -463,7 +461,7 @@ test.describe("Swap flow from different entry point", () => { await app.layout.goToPortfolio(); await app.portfolio.clickSwapButton(); await app.swap.waitForPageNetworkIdleState(); - await app.swap.expectHighestMcapToBeSelected(electronApp); + await app.swap.expectSelectedAssetDisplayed("BTC", electronApp); }, ); @@ -489,7 +487,7 @@ test.describe("Swap flow from different entry point", () => { ); test( - "Entry Point - Market page - 1", + "Entry Point - Market page - Click on swap for any coin", { annotation: { type: "TMS", @@ -515,7 +513,7 @@ test.describe("Swap flow from different entry point", () => { ); test( - "Entry Point - Market page - 2", + "Entry Point - Market page - More than one account for an asset", { annotation: { type: "TMS", @@ -572,7 +570,7 @@ test.describe("Swap flow from different entry point", () => { await addTmsLink(getDescription(test.info().annotations, "TMS").split(", ")); await app.layout.goToSwap(); await app.swap.waitForPageNetworkIdleState(); - await app.swap.expectHighestMcapToBeSelected(electronApp); + await app.swap.expectSelectedAssetDisplayed("BTC", electronApp); }, ); });