demo3 swap e2e tests adjustments

LedgerHQ · Oct 15, 2024 · a4a3792 · a4a3792
1 parent 0453aaa
commit a4a3792
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 41 deletions.
diff --git a/apps/ledger-live-desktop/tests/page/speculos.page.ts b/apps/ledger-live-desktop/tests/page/speculos.page.ts
@@ -89,13 +89,12 @@ export class SpeculosPage extends AppPage {
   }
 
   verifySwapFeesAmountScreen(swap: Swap, feesAmountScreen: string[]) {
-    let speculosFeesAmount = "";
-    speculosFeesAmount =
+    const feesAmount =
       extractNumberFromString(swap.feesAmount).length < 19
         ? extractNumberFromString(swap.feesAmount)
         : extractNumberFromString(swap.feesAmount).substring(0, 18);
     expect(
-      verifySwapFeesAmount(swap.accountToDebit.currency.name, speculosFeesAmount, feesAmountScreen),
+      verifySwapFeesAmount(swap.accountToDebit.currency.name, feesAmount, feesAmountScreen),
     ).toBeTruthy();
   }
 
@@ -156,36 +155,4 @@ export class SpeculosPage extends AppPage {
         throw new Error(`Unsupported currency: ${currencyName}`);
     }
   }
-
-  verifySwapGetAmountScreen(swap: Swap, getAmountScreen: string[]) {
-    if (swap.accountToCredit.currency.name === "Solana") {
-      expect(
-        verifyAmount(
-          `${extractNumberFromString(swap.amountToReceive)} ${swap.accountToCredit.currency.ticker}`,
-          getAmountScreen,
-        ),
-      ).toBeTruthy();
-    } else {
-      expect(
-        verifyAmount(
-          `${swap.accountToCredit.currency.ticker} ${extractNumberFromString(swap.amountToReceive)}`,
-          getAmountScreen,
-        ),
-      ).toBeTruthy();
-    }
-  }
-
-  verifySwapFeesAmountScreen(swap: Swap, feesAmountScreen: string[]) {
-    let speculosFeesAmount = "";
-    if (swap.feesAmount) {
-      //max number of chars on the screen
-      speculosFeesAmount =
-        extractNumberFromString(swap.feesAmount).length < 18
-          ? extractNumberFromString(swap.feesAmount)
-          : extractNumberFromString(swap.feesAmount).substring(0, 17);
-    }
-    expect(
-      verifySwapFeesAmount(swap.accountToDebit.currency.name, speculosFeesAmount, feesAmountScreen),
-    ).toBeTruthy();
-  }
 }
diff --git a/apps/ledger-live-desktop/tests/page/swap.page.ts b/apps/ledger-live-desktop/tests/page/swap.page.ts
@@ -5,7 +5,6 @@ import { ElectronApplication, expect } from "@playwright/test";
 import { capitalizeFirstLetter } from "tests/utils/textParserUtils";
 import { Account } from "tests/enum/Account";
 import { ChooseAssetDrawer } from "tests/page/drawer/choose.asset.drawer";
-import { ChooseAccountDrawer } from "tests/page/drawer/choose.account.drawer";
 
 export class SwapPage extends AppPage {
   private currencyByName = (accountName: string) => this.page.getByText(accountName); // TODO: this is rubbish. Changed this
@@ -45,7 +44,6 @@ export class SwapPage extends AppPage {
   // Quote Components
   private quoteContainer = (providerName: string, exchangeType: string) =>
     this.page.getByTestId(`quote-container-${providerName}-${exchangeType}`);
-  //private quoteSelector = (providerName: string) => `quote-container-${providerName}`;
   private quoteSelector = (providerName: string, rate: string) =>
     `quote-container-${providerName}-${rate}`;
 

diff --git a/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts b/apps/ledger-live-desktop/tests/specs/speculos/swap.spec.ts
@@ -18,7 +18,7 @@ const swaps = [
       Provider.CHANGELLY,
       Rate.FLOAT,
     ),
-    xrayTicket: "B2CQA-2750",
+    xrayTicket: "B2CQA-2750, B2CQA-600",
   },
   {
     swap: new Swap(
@@ -29,7 +29,7 @@ const swaps = [
       Provider.CHANGELLY,
       Rate.FLOAT,
     ),
-    xrayTicket: "B2CQA-2744",
+    xrayTicket: "B2CQA-2744, B2CQA-2432",
   },
   {
     swap: new Swap(
@@ -40,7 +40,7 @@ const swaps = [
       Provider.CHANGELLY,
       Rate.FLOAT,
     ),
-    xrayTicket: "B2CQA-2752",
+    xrayTicket: "B2CQA-2752, B2CQA-2048",
   },
   {
     swap: new Swap(
@@ -106,7 +106,7 @@ const swaps = [
       Provider.CHANGELLY,
       Rate.FLOAT,
     ),
-    xrayTicket: "B2CQA-2751",
+    xrayTicket: "B2CQA-2751, B2CQA-2212",
   },
 ];