diff --git a/packages/e2e-tests/src/elements/newTransaction/coinConfigure.ts b/packages/e2e-tests/src/elements/newTransaction/coinConfigure.ts index b3192c53b..4e7305f5e 100644 --- a/packages/e2e-tests/src/elements/newTransaction/coinConfigure.ts +++ b/packages/e2e-tests/src/elements/newTransaction/coinConfigure.ts @@ -74,12 +74,6 @@ export class CoinConfigure { if (loseFocus) await this.clickToLoseFocus(); }; - fillTokenValueUsingKeys = async (valueToEnter: number): Promise => { - await this.input.waitForClickable(); - await this.input.click(); - await browser.keys(String(valueToEnter)); - }; - fillTokenValueWithoutClearingField = async (valueToEnter: number): Promise => { await this.input.waitForClickable(); await this.input.click(); diff --git a/packages/e2e-tests/src/features/SendTransactionBundlesExtended.part2.feature b/packages/e2e-tests/src/features/SendTransactionBundlesExtended.part2.feature index ab3a1157f..e280aa409 100644 --- a/packages/e2e-tests/src/features/SendTransactionBundlesExtended.part2.feature +++ b/packages/e2e-tests/src/features/SendTransactionBundlesExtended.part2.feature @@ -42,13 +42,11 @@ Feature: Send - Extended Browser View (Advanced Tx) And I click "Send" button on page header And I enter a valid "shelley" address in the bundle 1 recipient's address And I enter a 51% of total "tADA" asset in bundle 1 - And I open cancel modal to trigger button validation Then I do not see insufficient balance error in bundle 1 for "tADA" asset And "Review transaction" button is enabled on "Send" page When I click "Add bundle" button on "Send" page And I enter a valid "shelley" address in the bundle 2 recipient's address And I enter a 51% of total "tADA" asset in bundle 2 - And I open cancel modal to trigger button validation Then I see insufficient balance error in bundle 2 for "tADA" asset And I do not see insufficient balance error in bundle 1 for "tADA" asset And "Review transaction" button is disabled on "Send" page diff --git a/packages/e2e-tests/src/features/SendTransactionBundlesExtendedMainnet.feature b/packages/e2e-tests/src/features/SendTransactionBundlesExtendedMainnet.feature index 0eaa2fc60..697d1f15b 100644 --- a/packages/e2e-tests/src/features/SendTransactionBundlesExtendedMainnet.feature +++ b/packages/e2e-tests/src/features/SendTransactionBundlesExtendedMainnet.feature @@ -147,13 +147,11 @@ Feature: Send - Extended Browser View (Advanced Tx) And I click "Send" button on page header And I enter a valid "shelley" address in the bundle 1 recipient's address And I enter a 51% of total "ADA" asset in bundle 1 - And I open cancel modal to trigger button validation Then I do not see insufficient balance error in bundle 1 for "ADA" asset And "Review transaction" button is enabled on "Send" page When I click "Add bundle" button on "Send" page And I enter a valid "shelley" address in the bundle 2 recipient's address And I enter a 51% of total "ADA" asset in bundle 2 - And I open cancel modal to trigger button validation Then I see insufficient balance error in bundle 2 for "ADA" asset And I see insufficient balance error in bundle 1 for "ADA" asset And "Review transaction" button is disabled on "Send" page diff --git a/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part1.feature b/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part1.feature index b6db8357e..7b7f28e78 100644 --- a/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part1.feature +++ b/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part1.feature @@ -175,11 +175,9 @@ Feature: LW-484: Send & Receive - Extended Browser View (Simple Tx) Scenario: Extended-view - Error displayed when token value out of range And I click "Send" button on page header And I enter a valid "shelley" address in the bundle 1 recipient's address - When I enter a value of: 99999999 to the "tADA" asset - And I open cancel modal to trigger button validation + When I enter a value of: 99999999 to the "tADA" asset in bundle 1 Then "Insufficient balance" error is displayed on "Send" page And "Review transaction" button is disabled on "Send" page - When I enter a value of: 2 to the "tADA" asset - And I open cancel modal to trigger button validation + When I enter a value of: 2 to the "tADA" asset in bundle 1 Then "Insufficient balance" error is not displayed on "Send" page And "Review transaction" button is enabled on "Send" page diff --git a/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part3.feature b/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part3.feature index 9a0e48c33..6ee67085c 100644 --- a/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part3.feature +++ b/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part3.feature @@ -9,7 +9,6 @@ Feature: LW-484: Send & Receive - Extended Browser View (Simple Tx) When I click "Send" button on page header When I enter a valid "shelley" address in the bundle 1 recipient's address Then I enter a value of: to the "tADA" asset in bundle 1 - And I open cancel modal to trigger button validation Then "Insufficient balance" error displayed on "Send" page Then "Review transaction" button is on "Send" page Examples: diff --git a/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part4.feature b/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part4.feature index f42bc52cb..7a7db4f0b 100644 --- a/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part4.feature +++ b/packages/e2e-tests/src/features/SendTransactionSimpleExtended.part4.feature @@ -12,7 +12,7 @@ Feature: LW-484: Send & Receive - Extended Browser View (Simple Tx) And "" And I enter an exact value of: to the "" asset in bundle 1 Then I see as displayed value - When I click to loose focus from value field + When I click to lose focus from value field Then I see as displayed value And I insufficient balance error in bundle 1 for "" asset When I hover over the value for "" asset in bundle 1 @@ -56,7 +56,7 @@ Feature: LW-484: Send & Receive - Extended Browser View (Simple Tx) And "" And I enter an exact value of: to the "" asset in bundle 1 Then I see as displayed value - When I click to loose focus from value field + When I click to lose focus from value field Then I see as displayed value And I insufficient balance error in bundle 1 for "" asset When I hover over the value for "" asset in bundle 1 @@ -106,7 +106,7 @@ Feature: LW-484: Send & Receive - Extended Browser View (Simple Tx) When I click "Send" button on page header And click on the coin selector for "tADA" asset in bundle 1 And click on an token with name: "Ibilecoin" - And I click to loose focus from value field + And I click to lose focus from value field Then I see 0.00 as displayed value And I do not see insufficient balance error in bundle 1 for "Ibilecoin" asset When I hover over the value for "Ibilecoin" asset in bundle 1 diff --git a/packages/e2e-tests/src/features/SendTransactionSimplePopup.part1.feature b/packages/e2e-tests/src/features/SendTransactionSimplePopup.part1.feature index e200aa805..94d21bc49 100644 --- a/packages/e2e-tests/src/features/SendTransactionSimplePopup.part1.feature +++ b/packages/e2e-tests/src/features/SendTransactionSimplePopup.part1.feature @@ -169,11 +169,9 @@ Feature: LW-484: Send & Receive - Popup View (Simple Tx) And I click "Send" button on Tokens page in popup mode And I enter a valid "shelley" address in the bundle 1 recipient's address When I enter a value of: 99999999 to the "tADA" asset in bundle 1 - And I open cancel modal to trigger button validation Then "Insufficient balance" error is displayed on "Send" page And "Review transaction" button is disabled on "Send" page When I enter a value of: 2 to the "tADA" asset in bundle 1 - And I open cancel modal to trigger button validation Then "Insufficient balance" error is not displayed on "Send" page Then "Review transaction" button is enabled on "Send" page diff --git a/packages/e2e-tests/src/features/SendTransactionSimplePopup.part2.feature b/packages/e2e-tests/src/features/SendTransactionSimplePopup.part2.feature index 911e42c9e..140e0d835 100644 --- a/packages/e2e-tests/src/features/SendTransactionSimplePopup.part2.feature +++ b/packages/e2e-tests/src/features/SendTransactionSimplePopup.part2.feature @@ -220,7 +220,6 @@ Feature: LW-484: Send & Receive - Popup View (Simple Tx) When I click "Send" button on Tokens page in popup mode When I enter a valid "shelley" address in the bundle 1 recipient's address Then I enter a value of: to the "tADA" asset in bundle 1 - And I open cancel modal to trigger button validation Then "Insufficient balance" error displayed on "Send" page And "Review transaction" button is on "Send" page Examples: diff --git a/packages/e2e-tests/src/features/SendTransactionSimplePopup.part4.feature b/packages/e2e-tests/src/features/SendTransactionSimplePopup.part4.feature index 7238355be..b7d53c8f2 100644 --- a/packages/e2e-tests/src/features/SendTransactionSimplePopup.part4.feature +++ b/packages/e2e-tests/src/features/SendTransactionSimplePopup.part4.feature @@ -29,7 +29,7 @@ Feature: LW-484: Send & Receive - Popup View (Simple Tx) And "" And I enter an exact value of: to the "" asset in bundle 1 Then I see as displayed value - When I click to loose focus from value field + When I click to lose focus from value field Then I see as displayed value And I insufficient balance error in bundle 1 for "" asset When I hover over the value for "" asset in bundle 1 @@ -73,7 +73,7 @@ Feature: LW-484: Send & Receive - Popup View (Simple Tx) And "" And I enter an exact value of: to the "" asset in bundle 1 Then I see as displayed value - When I click to loose focus from value field + When I click to lose focus from value field Then I see as displayed value And I insufficient balance error in bundle 1 for "" asset When I hover over the value for "" asset in bundle 1 @@ -123,7 +123,7 @@ Feature: LW-484: Send & Receive - Popup View (Simple Tx) When I click "Send" button on Tokens page in popup mode And click on the coin selector for "tADA" asset in bundle 1 And click on an token with name: "Ibilecoin" - And I click to loose focus from value field + And I click to lose focus from value field Then I see 0.00 as displayed value And I do not see insufficient balance error in bundle 1 for "Ibilecoin" asset When I hover over the value for "Ibilecoin" asset in bundle 1 diff --git a/packages/e2e-tests/src/steps/sendTransactionSimpleSteps.ts b/packages/e2e-tests/src/steps/sendTransactionSimpleSteps.ts index 686643995..5c45bf34a 100644 --- a/packages/e2e-tests/src/steps/sendTransactionSimpleSteps.ts +++ b/packages/e2e-tests/src/steps/sendTransactionSimpleSteps.ts @@ -41,7 +41,6 @@ import { AddressInput } from '../elements/AddressInput'; import { AssetInput } from '../elements/newTransaction/assetInput'; import TokenSelectionPage from '../elements/newTransaction/tokenSelectionPage'; import TransactionPasswordPage from '../elements/newTransaction/transactionPasswordPage'; -import { Key } from 'webdriverio'; import { parseWalletAddress } from '../utils/parseWalletAddress'; import { AddressType } from '../enums/AddressTypeEnum'; import clipboard from 'clipboardy'; @@ -269,7 +268,7 @@ When( } ); -When(/^I click to loose focus from value field$/, async () => { +When(/^I click to lose focus from value field$/, async () => { await TransactionNewPage.coinConfigure().clickToLoseFocus(); }); @@ -288,12 +287,6 @@ Then( } ); -Then(/^I open cancel modal to trigger button validation$/, async () => { - // workaround for test automation only to fire all events after finished typing - await browser.keys(Key.Escape); - await Modal.cancelButton.click(); -}); - Then(/^I click on transaction drawer background to lose focus$/, async () => { await TransactionNewPage.clickDrawerBackground(); }); @@ -332,7 +325,7 @@ Then( const tokenBalance: string = testContext.load(`${assetName}tokenBalance`); const value = Number.parseFloat(tokenBalance) * (Number.parseFloat(percentage) * (1 / 100)); const valueToEnter = Number.parseFloat(value.toPrecision(2)); - await TransactionNewPage.coinConfigure(bundleIndex, assetName).fillTokenValueUsingKeys(valueToEnter); + await TransactionNewPage.coinConfigure(bundleIndex, assetName).fillTokenValue(valueToEnter); } );