Skip to content

test(e2e-desktop): fix swap webview race condition #15624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
martijnhjk wants to merge 1 commit into
base: develop
Choose a base branch
from
+37 −46
Open

test(e2e-desktop): fix swap webview race condition #15624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions e2e/desktop/tests/page/swap.page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ export class SwapPage extends WebViewAppPage {
private insufficientFundsWarning = "insufficient-funds-warning";
private executeButtonDisabled = "execute-button-disabled";

// Exchange Drawer Components
readonly swapId = this.page.getByTestId("swap-id");

// History Components
readonly historyButton = this.page.getByTestId("History-tab-button");
private operationRows = this.page.locator("[data-testid^='operation-row-']");
Expand Down Expand Up @@ -333,17 +330,16 @@ export class SwapPage extends WebViewAppPage {
return await webview.getByTestId(this.fromAccountAmountInput).inputValue();
}

@step("Check currency to swap from is $0")
async switchYouSendAndYouReceive(electronApp: ElectronApplication) {
const [, webview] = electronApp.windows();
@step("Click switch button")
async switchYouSendAndYouReceive() {
const webview = await this.getWebView();
await webview.getByTestId(this.switchButton).click();
}

@step("Check currency to swap from is $1")
async checkAssetFrom(electronApp: ElectronApplication, currency: string) {
const [, webview] = electronApp.windows();
const fromAccount = webview.getByTestId(this.fromAccountCoinSelector);
await expect(fromAccount).toContainText(currency);
@step("Check currency to swap from contains $0")
async checkAssetFromContains(expected: string) {
const webview = await this.getWebView();
await expect(webview.getByTestId(this.fromAccountCoinSelector)).toContainText(expected);
}

@step("Expect asset or account selected $0 to be displayed")
Expand Down Expand Up @@ -424,15 +420,10 @@ export class SwapPage extends WebViewAppPage {
await webview.getByTestId(this.fromAccountCoinSelector).click();
}

@step("Check currency to swap to is $1")
async checkAssetTo(electronApp: ElectronApplication, currency: string) {
const [, webview] = electronApp.windows();
const assetTo = webview.getByTestId(this.toAccountCoinSelector);
if (currency === "") {
await expect(assetTo).toContainText("Choose asset");
} else {
await expect(assetTo).toContainText(currency);
}
@step("Check currency to swap to contains $0")
async checkAssetToContains(expected: string) {
const webview = await this.getWebView();
await expect(webview.getByTestId(this.toAccountCoinSelector)).toContainText(expected);
}

@step("Verify swap amount error message match: $1")
Expand Down
28 changes: 14 additions & 14 deletions e2e/desktop/tests/specs/accounts.swap.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,14 @@ test.describe("Swap - Default currency when landing on swap", () => {
],
annotation: { type: "TMS", description: "B2CQA-3079" },
},
async ({ app, electronApp }) => {
async ({ app }) => {
await addTmsLink(getDescription(test.info().annotations, "TMS").split(", "));

await app.swap.goAndWaitForSwapToBeReady(() =>
app.mainNavigation.openTargetFromMainNavigation("swap"),
);
await app.swap.checkAssetFrom(electronApp, "BTC");
await app.swap.checkAssetTo(electronApp, "");
await app.swap.checkAssetFromContains("BTC");
await app.swap.checkAssetToContains("Choose asset");
},
);

Expand Down Expand Up @@ -107,8 +107,8 @@ test.describe("Swap - Default currency when landing on swap", () => {
await app.swap.goAndWaitForSwapToBeReady(() =>
app.mainNavigation.openTargetFromMainNavigation("swap"),
);
await app.swap.checkAssetFrom(electronApp, swap.accountToDebit.currency.ticker);
await app.swap.checkAssetTo(electronApp, swap.accountToCredit.currency.ticker);
await app.swap.checkAssetFromContains(swap.accountToDebit.currency.ticker);
await app.swap.checkAssetToContains(swap.accountToCredit.currency.ticker);
},
);
});
Expand Down Expand Up @@ -359,8 +359,8 @@ test.describe("Swap a coin for which you have no account yet - from present to n
await app.addAccount.done();
await app.swapDrawer.selectAccountByName(account2);
}
await app.swap.checkAssetFrom(electronApp, account1.currency.name);
await app.swap.checkAssetTo(electronApp, account2.currency.name);
await app.swap.checkAssetFromContains(account1.currency.name);
await app.swap.checkAssetToContains(account2.currency.name);
},
);
});
Expand Down Expand Up @@ -431,8 +431,8 @@ test.describe("Swap a coin for which you have no account yet - from not present
await app.swap.selectAssetTo(electronApp, account2.currency.name);
await app.swapDrawer.selectAccountByName(account2);
}
await app.swap.checkAssetFrom(electronApp, account1.currency.name);
await app.swap.checkAssetTo(electronApp, account2.currency.name);
await app.swap.checkAssetFromContains(account1.currency.name);
await app.swap.checkAssetToContains(account2.currency.name);
},
);
});
Expand Down Expand Up @@ -489,8 +489,8 @@ test.describe("Swap a coin for which you have no account yet - both not present"

await app.scanAccountsDrawer.selectFirstAccount();
await app.scanAccountsDrawer.clickContinueButton();
await app.swap.checkAssetFrom(electronApp, account1.currency.name);
await app.swap.checkAssetTo(electronApp, account2.currency.name);
await app.swap.checkAssetFromContains(account1.currency.name);
await app.swap.checkAssetToContains(account2.currency.name);
}
},
);
Expand Down Expand Up @@ -541,9 +541,9 @@ test.describe("Swap - Switch You send and You receive currency", () => {
await addTmsLink(getDescription(test.info().annotations, "TMS").split(", "));

await performSwapUntilQuoteSelectionStep(app, electronApp, swap, swap.amount ?? "0");
await app.swap.switchYouSendAndYouReceive(electronApp);
await app.swap.checkAssetFrom(electronApp, swap.accountToCredit.currency.ticker);
await app.swap.checkAssetTo(electronApp, swap.accountToDebit.currency.ticker);
await app.swap.switchYouSendAndYouReceive();
await app.swap.checkAssetFromContains(swap.accountToCredit.currency.ticker);
await app.swap.checkAssetToContains(swap.accountToDebit.currency.ticker);
},
);
});
20 changes: 10 additions & 10 deletions e2e/desktop/tests/specs/entrypoint.swap.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,13 +98,13 @@ test.describe("Swap flow from different entry point", () => {
description: "B2CQA-2986",
},
},
async ({ app, electronApp }) => {
async ({ app }) => {
await addTmsLink(getDescription(test.info().annotations, "TMS").split(", "));
await app.mainNavigation.openTargetFromMainNavigation("home");
await app.portfolio.clickOnSelectedAssetRow(swapEntryPoint.swap.accountToDebit.currency.name);

await app.swap.goAndWaitForSwapToBeReady(() => app.assetPage.startSwapFlow());
await app.swap.checkAssetTo(electronApp, swapEntryPoint.swap.accountToDebit.currency.name);
await app.swap.checkAssetToContains(swapEntryPoint.swap.accountToDebit.currency.name);
},
);

Expand All @@ -128,7 +128,7 @@ test.describe("Swap flow from different entry point", () => {
description: "B2CQA-2987",
},
},
async ({ app, electronApp }) => {
async ({ app }) => {
await addTmsLink(getDescription(test.info().annotations, "TMS").split(", "));

if (await isWallet40Enabled(app.getPage())) {
Expand All @@ -140,8 +140,8 @@ test.describe("Swap flow from different entry point", () => {
await app.swap.goAndWaitForSwapToBeReady(() =>
app.market.startSwapForSelectedTicker(swapEntryPoint.swap.accountToDebit.currency.ticker),
);
await app.swap.checkAssetTo(electronApp, swapEntryPoint.swap.accountToDebit.currency.name);
await app.swap.checkAssetTo(electronApp, swapEntryPoint.swap.accountToDebit.accountName);
await app.swap.checkAssetToContains(swapEntryPoint.swap.accountToDebit.currency.name);
await app.swap.checkAssetToContains(swapEntryPoint.swap.accountToDebit.accountName);
},
);

Expand All @@ -165,7 +165,7 @@ test.describe("Swap flow from different entry point", () => {
description: "B2CQA-2988",
},
},
async ({ app, electronApp }) => {
async ({ app }) => {
await addTmsLink(getDescription(test.info().annotations, "TMS").split(", "));

if (await isWallet40Enabled(app.getPage())) {
Expand All @@ -176,7 +176,7 @@ test.describe("Swap flow from different entry point", () => {

await app.market.openCoinPage(swapEntryPoint.swap.accountToDebit.currency.ticker);
await app.swap.goAndWaitForSwapToBeReady(() => app.market.clickOnSwapButtonOnAsset());
await app.swap.checkAssetTo(electronApp, swapEntryPoint.swap.accountToDebit.currency.name);
await app.swap.checkAssetToContains(swapEntryPoint.swap.accountToDebit.currency.name);
},
);

Expand All @@ -200,15 +200,15 @@ test.describe("Swap flow from different entry point", () => {
description: "B2CQA-2989",
},
},
async ({ app, electronApp }) => {
async ({ app }) => {
await addTmsLink(getDescription(test.info().annotations, "TMS").split(", "));
await app.mainNavigation.openTargetFromMainNavigation("accounts");
await app.accounts.navigateToAccountByName(
getParentAccountName(swapEntryPoint.swap.accountToDebit),
);
await app.swap.goAndWaitForSwapToBeReady(() => app.account.navigateToSwap());
await app.swap.checkAssetTo(electronApp, swapEntryPoint.swap.accountToDebit.currency.name);
await app.swap.checkAssetTo(electronApp, swapEntryPoint.swap.accountToDebit.accountName);
await app.swap.checkAssetToContains(swapEntryPoint.swap.accountToDebit.currency.name);
await app.swap.checkAssetToContains(swapEntryPoint.swap.accountToDebit.accountName);
},
);

Expand Down
4 changes: 2 additions & 2 deletions e2e/desktop/tests/utils/swapUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ async function selectAccountFrom(app: Application, electronApp: ElectronApplicat
const selector = await getModularSelector(app, "ASSET");
if (selector) {
await selectAccountMAD(selector, swap.accountToDebit);
await app.swap.checkAssetFrom(electronApp, swap.accountToDebit.currency.ticker);
await app.swap.checkAssetFromContains(swap.accountToDebit.currency.ticker);
}
}

Expand All @@ -73,7 +73,7 @@ async function selectAccountTo(app: Application, electronApp: ElectronApplicatio
const selector = await getModularSelector(app, "ASSET");
if (selector) {
await selectAccountMAD(selector, swap.accountToCredit);
await app.swap.checkAssetTo(electronApp, swap.accountToCredit.currency.ticker);
await app.swap.checkAssetToContains(swap.accountToCredit.currency.ticker);
}
}

Expand Down
Loading