diff --git a/app/src/androidTest/kotlin/com/tangem/screens/SendAddressPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/SendAddressPageObject.kt index d51d071203..0458682ee0 100644 --- a/app/src/androidTest/kotlin/com/tangem/screens/SendAddressPageObject.kt +++ b/app/src/androidTest/kotlin/com/tangem/screens/SendAddressPageObject.kt @@ -40,8 +40,7 @@ class SendAddressPageObject(semanticsProvider: SemanticsNodeInteractionsProvider } val addressTextFieldHint: KNode = child { - hasParent(withTestTag(SendAddressScreenTestTags.ADDRESS_TEXT_FIELD)) - useUnmergedTree = true + hasTestTag(SendAddressScreenTestTags.ADDRESS_TEXT_FIELD) } fun recipientNetworkCaution(network: String): KNode = child { diff --git a/app/src/androidTest/kotlin/com/tangem/screens/SendSelectNetworkFeeBottomSheetPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/SendSelectNetworkFeeBottomSheetPageObject.kt index 68d545c608..80e61ca2c0 100644 --- a/app/src/androidTest/kotlin/com/tangem/screens/SendSelectNetworkFeeBottomSheetPageObject.kt +++ b/app/src/androidTest/kotlin/com/tangem/screens/SendSelectNetworkFeeBottomSheetPageObject.kt @@ -22,6 +22,12 @@ class SendSelectNetworkFeeBottomSheetPageObject(semanticsProvider: SemanticsNode useUnmergedTree = true } + val chooseSpeedTitle: KNode = child { + hasTestTag(BaseBottomSheetTestTags.TITLE) + hasText(getResourceString(R.string.fee_selector_choose_speed_title)) + useUnmergedTree = true + } + fun regularFeeSelectorItem(title: String): KNode = child { hasTestTag(SendSelectNetworkFeeBottomSheetTestTags.REGULAR_FEE_ITEM) hasAnyDescendant(withText(title)) @@ -96,6 +102,12 @@ class SendSelectNetworkFeeBottomSheetPageObject(semanticsProvider: SemanticsNode hasText(getResourceString(R.string.common_done)) useUnmergedTree = true } + + val confirmButton: KNode = child { + hasTestTag(BaseButtonTestTags.TEXT) + hasText(getResourceString(R.string.common_confirm)) + useUnmergedTree = true + } } internal fun BaseTestCase.onSendSelectNetworkFeeBottomSheet(function: SendSelectNetworkFeeBottomSheetPageObject.() -> Unit) = diff --git a/app/src/androidTest/kotlin/com/tangem/tests/send/feeScreen/SendFeeScreenTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/send/feeScreen/SendFeeScreenTest.kt index e3e66cb763..3f6c0ea10f 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/send/feeScreen/SendFeeScreenTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/send/feeScreen/SendFeeScreenTest.kt @@ -172,6 +172,9 @@ class SendFeeScreenTest : BaseTestCase() { step("Assert 'Fee selector' bottom sheet title is displayed") { onSendSelectNetworkFeeBottomSheet { title.assertIsDisplayed() } } + step("Click on '$marketSelectorItem' selector item") { + onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(marketSelectorItem).performClick() } + } step("Assert '$fastSelectorItem' selector item is displayed") { onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(fastSelectorItem).assertIsDisplayed() } } @@ -261,6 +264,9 @@ class SendFeeScreenTest : BaseTestCase() { step("Click on 'Done' button") { onSendSelectNetworkFeeBottomSheet { doneButton.performClick() } } + step("Click on 'Confirm' button") { + onSendSelectNetworkFeeBottomSheet { confirmButton.performClick() } + } step("Assert fee block is displayed with new fee amount: '$newFeeAmount'") { checkNetworkFeeBlock(currentFeeAmount = newFeeAmount, withFeeSelector = true) } @@ -323,8 +329,8 @@ class SendFeeScreenTest : BaseTestCase() { step("Click on fee selector icon") { onSendConfirmScreen { feeSelectorIcon.performClick() } } - step("Assert 'Fee selector' bottom sheet title is displayed") { - onSendSelectNetworkFeeBottomSheet { title.assertIsDisplayed() } + step("Assert 'Choose speed' bottom sheet title is displayed") { + onSendSelectNetworkFeeBottomSheet { chooseSpeedTitle.assertIsDisplayed() } } step("Assert '$fastSelectorItem' selector item is displayed") { onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(fastSelectorItem).assertIsDisplayed() } @@ -386,7 +392,7 @@ class SendFeeScreenTest : BaseTestCase() { val tokenName = "VeThor" val mockState = "Vechain" val tokenAmount = "0.1" - val feeAmount = "<$0.01" + val feeAmount = "~$0.01" val marketSelectorItem = getResourceString(R.string.common_fee_selector_option_market) val fastSelectorItem = getResourceString(R.string.common_fee_selector_option_fast) val slowSelectorItem = getResourceString(R.string.common_fee_selector_option_slow) @@ -421,8 +427,8 @@ class SendFeeScreenTest : BaseTestCase() { step("Click on fee selector icon") { onSendConfirmScreen { feeSelectorIcon.performClick() } } - step("Assert 'Fee selector' bottom sheet title is displayed") { - onSendSelectNetworkFeeBottomSheet { title.assertIsDisplayed() } + step("Assert 'Choose speed' bottom sheet title is displayed") { + onSendSelectNetworkFeeBottomSheet { chooseSpeedTitle.assertIsDisplayed() } } step("Assert '$fastSelectorItem' selector item is displayed") { onSendSelectNetworkFeeBottomSheet { regularFeeSelectorItem(fastSelectorItem).assertIsDisplayed() }