From 5292af5a9afa0430890b6b3c90c8344b4ceb3fa4 Mon Sep 17 00:00:00 2001 From: CW Date: Wed, 26 Jul 2023 08:32:51 -0700 Subject: [PATCH 1/3] add Basepage to extend views form --- e2e/pages/AddCustomTokenView.js | 5 ++++- e2e/pages/BasePage.js | 11 +++++++++++ e2e/pages/TransactionConfirmView.js | 4 +++- e2e/specs/send-ERC-token.spec.js | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 e2e/pages/BasePage.js diff --git a/e2e/pages/AddCustomTokenView.js b/e2e/pages/AddCustomTokenView.js index aae69268402..dbbc8ff8b19 100644 --- a/e2e/pages/AddCustomTokenView.js +++ b/e2e/pages/AddCustomTokenView.js @@ -16,12 +16,15 @@ import { } from '../../wdio/screen-objects/testIDs/Screens/NFTImportScreen.testIds'; import messages from '../../locales/languages/en.json'; +import BasePage from './BasePage'; const TOKEN_SYMBOL_TEXT = messages.token.token_symbol; -export default class AddCustomTokenView { + +export default class AddCustomTokenView extends BasePage { static async tapImportButton() { //await TestHelpers.swipe(TOKEN_ADDRESS_SYMBOL_ID, 'up', 'slow', 0.6); await TestHelpers.waitAndTapText('IMPORT'); + await this.waitForToastMessageVisible('Imported Token'); } static async tapCustomTokenTab() { diff --git a/e2e/pages/BasePage.js b/e2e/pages/BasePage.js new file mode 100644 index 00000000000..3f50162cfe7 --- /dev/null +++ b/e2e/pages/BasePage.js @@ -0,0 +1,11 @@ +import TestHelpers from '../helpers'; + +export default class BasePage { + static async waitForToastMessageVisible(text) { + await TestHelpers.checkIfElementByTextIsVisible(text); + } + + static async waitForToastMessageToGoAway(text){ + await TestHelpers.checkIfElementWithTextIsNotVisible(text); + } +} diff --git a/e2e/pages/TransactionConfirmView.js b/e2e/pages/TransactionConfirmView.js index 6af4437fbca..5772a922280 100644 --- a/e2e/pages/TransactionConfirmView.js +++ b/e2e/pages/TransactionConfirmView.js @@ -13,6 +13,7 @@ import { } from '../../wdio/screen-objects/testIDs/Screens/EditGasFeeScreen.testids.js'; import messages from '../../locales/languages/en.json'; +import BasePage from './BasePage'; const EDIT_GAS_FEE_AGGRESSIVE_TEXT = messages.edit_gas_fee_eip1559.aggressive; const EDIT_GAS_FEE_ADVANCE_OPTIONS_TEXT = @@ -23,7 +24,7 @@ const EDIT_GAS_FEE_LOW_TEXT = messages.edit_gas_fee_eip1559.low; const TRANSACTION_CONFIRMATION_CANCEL_BUTTON_TEXT = messages.transaction.cancel; -export default class TransactionConfirmationView { +export default class TransactionConfirmationView extends BasePage { static async tapConfirmButton() { if (device.getPlatform() === 'ios') { await TestHelpers.waitAndTap(CONFIRM_TRANSACTION_BUTTON_ID); @@ -31,6 +32,7 @@ export default class TransactionConfirmationView { await TestHelpers.delay(5000); await TestHelpers.waitAndTapByLabel(CONFIRM_TRANSACTION_BUTTON_ID); } + await this.waitForToastMessageToGoAway('Transaction submitted'); } static async tapCancelButton() { diff --git a/e2e/specs/send-ERC-token.spec.js b/e2e/specs/send-ERC-token.spec.js index 61f8bd02f7f..c911ed4bec0 100644 --- a/e2e/specs/send-ERC-token.spec.js +++ b/e2e/specs/send-ERC-token.spec.js @@ -66,6 +66,6 @@ describe(Smoke('Send ERC Token'), () => { await AmountView.tapNextButton(); await TransactionConfirmationView.isAmountVisible('< 0.00001 LINK'); await TransactionConfirmationView.tapConfirmButton(); - TestHelpers.checkIfElementWithTextIsNotVisible('Transaction submitted'); + // TestHelpers.checkIfElementWithTextIsNotVisible('Transaction submitted'); }); }); From 9b23f65f8d6a4e74fa12cd9841f5dd9a383fe234 Mon Sep 17 00:00:00 2001 From: CW Date: Wed, 26 Jul 2023 09:12:59 -0700 Subject: [PATCH 2/3] fix lint issues --- e2e/pages/BasePage.js | 2 +- e2e/specs/send-ERC-token.spec.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e/pages/BasePage.js b/e2e/pages/BasePage.js index 3f50162cfe7..49b9b431290 100644 --- a/e2e/pages/BasePage.js +++ b/e2e/pages/BasePage.js @@ -5,7 +5,7 @@ export default class BasePage { await TestHelpers.checkIfElementByTextIsVisible(text); } - static async waitForToastMessageToGoAway(text){ + static async waitForToastMessageToGoAway(text) { await TestHelpers.checkIfElementWithTextIsNotVisible(text); } } diff --git a/e2e/specs/send-ERC-token.spec.js b/e2e/specs/send-ERC-token.spec.js index c911ed4bec0..a37fdd3230a 100644 --- a/e2e/specs/send-ERC-token.spec.js +++ b/e2e/specs/send-ERC-token.spec.js @@ -66,6 +66,5 @@ describe(Smoke('Send ERC Token'), () => { await AmountView.tapNextButton(); await TransactionConfirmationView.isAmountVisible('< 0.00001 LINK'); await TransactionConfirmationView.tapConfirmButton(); - // TestHelpers.checkIfElementWithTextIsNotVisible('Transaction submitted'); }); }); From d6cc8b3cd597584a2059f6e79da03f461ed04fae Mon Sep 17 00:00:00 2001 From: CW Date: Thu, 27 Jul 2023 08:30:20 -0700 Subject: [PATCH 3/3] moved wait for toast to test steps --- e2e/pages/AddCustomTokenView.js | 1 - e2e/pages/TransactionConfirmView.js | 1 - e2e/specs/send-ERC-token.spec.js | 1 + 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/e2e/pages/AddCustomTokenView.js b/e2e/pages/AddCustomTokenView.js index dbbc8ff8b19..3586cb3bfca 100644 --- a/e2e/pages/AddCustomTokenView.js +++ b/e2e/pages/AddCustomTokenView.js @@ -24,7 +24,6 @@ export default class AddCustomTokenView extends BasePage { static async tapImportButton() { //await TestHelpers.swipe(TOKEN_ADDRESS_SYMBOL_ID, 'up', 'slow', 0.6); await TestHelpers.waitAndTapText('IMPORT'); - await this.waitForToastMessageVisible('Imported Token'); } static async tapCustomTokenTab() { diff --git a/e2e/pages/TransactionConfirmView.js b/e2e/pages/TransactionConfirmView.js index 5772a922280..76d481f1266 100644 --- a/e2e/pages/TransactionConfirmView.js +++ b/e2e/pages/TransactionConfirmView.js @@ -32,7 +32,6 @@ export default class TransactionConfirmationView extends BasePage { await TestHelpers.delay(5000); await TestHelpers.waitAndTapByLabel(CONFIRM_TRANSACTION_BUTTON_ID); } - await this.waitForToastMessageToGoAway('Transaction submitted'); } static async tapCancelButton() { diff --git a/e2e/specs/send-ERC-token.spec.js b/e2e/specs/send-ERC-token.spec.js index a37fdd3230a..b4da87124db 100644 --- a/e2e/specs/send-ERC-token.spec.js +++ b/e2e/specs/send-ERC-token.spec.js @@ -48,6 +48,7 @@ describe(Smoke('Send ERC Token'), () => { await AddCustomTokenView.tapTokenSymbolText(); await AddCustomTokenView.scrollDownOnImportCustomTokens(); await AddCustomTokenView.tapImportButton(); + await AddCustomTokenView.waitForToastMessageVisible('Imported Token'); await WalletView.isVisible(); });