diff --git a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt index bedaad69a6..cf9fb967fc 100644 --- a/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt +++ b/app/src/androidTest/kotlin/com/tangem/common/BaseTestCase.kt @@ -189,10 +189,22 @@ abstract class BaseTestCase : TestCase( "ADD_AND_MANAGE_TOKENS_ENABLED" to true, "ASSETS_DISCOVERY_ENABLED" to true, "VISA_ONBOARDING_ENABLED" to true, - "AND_15101_TANGEM_PAY_HOT_WALLET_ONBOARDING" to true, + // Toggles released in 5.39+ — forced on so tests run against the actual build even when the + // app version resolves to 1.0.0-SNAPSHOT on CI (then 1.0.0 < 5.39 would disable them). + "STAKING_ETH_ENABLED" to true, + "DYNAMIC_ADDRESSES_ENABLED" to true, + "SOLANA_TX_HISTORY_ENABLED" to true, + "SOLANA_SCALED_UI_AMOUNT_ENABLED" to true, + "SWAP_AB_ENABLED" to true, "AND_15310_ADD_FUNDS_STAGE1" to true, - "APP_REDESIGN_ENABLED" to true, + "AND_15009_SWAP_PROVIDER_FILTER_ENABLED" to true, + "AND_15101_TANGEM_PAY_HOT_WALLET_ONBOARDING" to true, + "AND_15402_ADI_MAIN_SCREEN_DEFAULT_ENABLED" to true, + "AND_15103_SWAP_RATE_EXPERIENCE_ENABLED" to true, "AND_15122_SWAP_PREDEFINED_BUTTONS_ENABLED" to true, + "TWI_1512_HIDE_STORIES_FOR_REFERRAL_ENABLED" to true, + // Toggles released in 5.40 + "APP_REDESIGN_ENABLED" to true, ) ) } diff --git a/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt b/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt index 272f804ed8..08641bc0d6 100644 --- a/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt +++ b/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt @@ -2,8 +2,6 @@ package com.tangem.scenarios import androidx.compose.ui.test.ExperimentalTestApi import androidx.compose.ui.test.hasText -import androidx.compose.ui.test.performTextInput -import androidx.compose.ui.test.waitUntilAtLeastOneExists import com.tangem.common.BaseTestCase import com.tangem.common.constants.TestConstants.WAIT_UNTIL_TIMEOUT_LONG import com.tangem.common.extensions.clickWithAssertion diff --git a/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt index 4faf866ff0..ec4df4e127 100644 --- a/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt +++ b/app/src/androidTest/kotlin/com/tangem/screens/MainScreenPageObject.kt @@ -436,7 +436,7 @@ class MainScreenPageObject(private val semanticsProvider: SemanticsNodeInteracti fun assertTokensCount(expectedCount: Int) { semanticsProvider - .onAllNodes(withTestTag(TokenElementsTestTags.TOKEN_PRICE)) + .onAllNodes(withTestTag(MainScreenTestTags.TOKEN_LIST_ITEM), useUnmergedTree = true) .assertCountEquals(expectedCount) } } diff --git a/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt index f3a2dc4b7c..149aaf1d89 100644 --- a/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt +++ b/app/src/androidTest/kotlin/com/tangem/screens/TokenDetailsPageObject.kt @@ -1,5 +1,7 @@ package com.tangem.screens +import androidx.compose.ui.semantics.SemanticsProperties +import androidx.compose.ui.test.SemanticsMatcher import androidx.compose.ui.test.SemanticsNodeInteractionsProvider import com.tangem.common.BaseTestCase import com.tangem.core.ui.test.BaseActionButtonsBlockTestTags @@ -65,7 +67,8 @@ class TokenDetailsPageObject(semanticsProvider: SemanticsNodeInteractionsProvide } val fiatBalance: KNode = child { - hasTestTag(TokenDetailsScreenTestTags.BALANCE_FIAT) + hasAnyAncestor(withTestTag(TokenDetailsScreenTestTags.BALANCE_FIAT)) + addSemanticsMatcher(SemanticsMatcher.keyIsDefined(SemanticsProperties.Text)) useUnmergedTree = true } diff --git a/app/src/androidTest/kotlin/com/tangem/screens/WarningBottomSheetPageObject.kt b/app/src/androidTest/kotlin/com/tangem/screens/WarningBottomSheetPageObject.kt index 56bb30983e..a2d7a6c358 100644 --- a/app/src/androidTest/kotlin/com/tangem/screens/WarningBottomSheetPageObject.kt +++ b/app/src/androidTest/kotlin/com/tangem/screens/WarningBottomSheetPageObject.kt @@ -3,7 +3,6 @@ package com.tangem.screens import androidx.compose.ui.test.SemanticsNodeInteractionsProvider import com.tangem.common.BaseTestCase import com.tangem.core.ui.R -import com.tangem.core.ui.test.BaseButtonTestTags import com.tangem.core.ui.test.WarningBottomSheetTestTags import io.github.kakaocup.compose.node.element.ComposeScreen import io.github.kakaocup.compose.node.element.ComposeScreen.Companion.onComposeScreen @@ -31,27 +30,23 @@ class WarningBottomSheetPageObject(semanticsProvider: SemanticsNodeInteractionsP } val okGotItButton: KNode = child { - hasTestTag(BaseButtonTestTags.TEXT) + hasTestTag(WarningBottomSheetTestTags.BUTTON_SECONDARY) hasText(getResourceString(R.string.warning_button_ok)) - useUnmergedTree = true } val gotItButton: KNode = child { - hasTestTag(BaseButtonTestTags.TEXT) + hasTestTag(WarningBottomSheetTestTags.BUTTON_PRIMARY) hasText(getResourceString(R.string.common_got_it)) - useUnmergedTree = true } val cancelButton: KNode = child { - hasTestTag(BaseButtonTestTags.TEXT) + hasTestTag(WarningBottomSheetTestTags.BUTTON_PRIMARY) hasText(getResourceString(R.string.common_cancel)) - useUnmergedTree = true } val connectAnywayButton: KNode = child { - hasTestTag(BaseButtonTestTags.TEXT) + hasTestTag(WarningBottomSheetTestTags.BUTTON_SECONDARY) hasText(getResourceString(R.string.wc_alert_connect_anyway)) - useUnmergedTree = true } } diff --git a/app/src/androidTest/kotlin/com/tangem/tests/actionButtons/MainScreenActionButtonsTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/actionButtons/MainScreenActionButtonsTest.kt index 3155dbbe80..1ef7c4baf1 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/actionButtons/MainScreenActionButtonsTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/actionButtons/MainScreenActionButtonsTest.kt @@ -383,14 +383,14 @@ class MainScreenActionButtonsTest : BaseTestCase() { step("Open 'Main Screen' on '$cardName' card") { openMainScreen(mockContent = cardType, isTwinsCard = true) } - step("Assert 'Buy' button is displayed") { - onMainScreen { buyButton.assertIsDisplayed() } + step("Assert 'Add funds' button is displayed") { + onMainScreen { addFundsButton.assertIsDisplayed() } } - step("Click on 'Buy' button") { - onMainScreen { buyButton.performClick() } + step("Click on 'Add funds' button") { + onMainScreen { addFundsButton.performClick() } } - step("Click on token: '$tokenTitle'") { - onBuyTokenScreen { tokenWithTitleAndFiatAmount(tokenTitle).performClick() } + step("Click on 'Buy' button in bottom sheet") { + onAddFundsBottomSheet { buyButton.clickWithAssertion() } } step("Click on 'Confirm' button in 'Dialog'") { waitForIdle() diff --git a/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt index efdc72799c..531f8a6e71 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/balance/TotalBalanceUpdateTest.kt @@ -88,14 +88,12 @@ class TotalBalanceUpdateTest : BaseTestCase() { } step("Click on 'Add' button in 'Add token' bottom sheet") { flakySafely(WAIT_UNTIL_TIMEOUT) { - onAddTokenBottomSheet { - addButton.performClick() - } - onAddTokenBottomSheet { laterButton.assertIsDisplayed() } + onAddTokenBottomSheet { addButton.performClick() } } } - step("Click on 'Later' button") { - onAddTokenBottomSheet { laterButton.performClick() } + step("Press 'Back' button") { + waitForIdle() + device.uiDevice.pressBack() } step("Press 'Back' button") { waitForIdle() @@ -201,8 +199,11 @@ class TotalBalanceUpdateTest : BaseTestCase() { step("Assert 'Token details screen' open") { onTokenDetailsScreen { screenContainer.assertIsDisplayed() } } - step("Click 'More' button") { - onTokenDetailsTopBar { backButton.clickWithAssertion() } + step("Click on 'Back' button") { + flakySafely(WAIT_UNTIL_TIMEOUT) { + onTokenDetailsTopBar { backButton.clickWithAssertion() } + onMainScreen { screenContainer.assertIsDisplayed() } + } } step("Assert $TOTAL_BALANCE is displayed in total balance") { onMainScreen { totalBalanceText.assertTextContains(TOTAL_BALANCE) } diff --git a/app/src/androidTest/kotlin/com/tangem/tests/hotWallet/AssetsDiscoveryTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/hotWallet/AssetsDiscoveryTest.kt index c96032df3a..27b130e296 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/hotWallet/AssetsDiscoveryTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/hotWallet/AssetsDiscoveryTest.kt @@ -138,7 +138,7 @@ class AssetsDiscoveryTest : BaseTestCase() { val tetherTitle = "Tether" val ethereumNetworkTitle = "ETHEREUM" val accountName = getResourceString(CoreUiR.string.account_main_account_title) - val expectedTokensCount = 4 + val expectedTokensCount = 2 setupHooks( additionalBeforeAppLaunchSection = { diff --git a/app/src/androidTest/kotlin/com/tangem/tests/main/MainScreenTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/main/MainScreenTest.kt index 75bd8276a3..2f69a7e418 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/main/MainScreenTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/main/MainScreenTest.kt @@ -3,8 +3,8 @@ package com.tangem.tests.main import com.tangem.common.BaseTestCase import com.tangem.common.constants.TestConstants.USER_TOKENS_API_SCENARIO import com.tangem.common.extensions.SwipeDirection -import com.tangem.common.extensions.swipeVertical import com.tangem.common.extensions.clickWithAssertion +import com.tangem.common.extensions.swipeVertical import com.tangem.common.utils.resetWireMockScenarioState import com.tangem.common.utils.setWireMockScenarioState import com.tangem.scenarios.openMainScreen @@ -86,10 +86,10 @@ class MainScreenTest : BaseTestCase() { openMainScreen() } step("Assert 'Add & Manage' button is displayed") { - onMainScreen { addAndManageButtonNode.assertIsDisplayed() } + onMainScreen { addAndManageButton().assertIsDisplayed() } } step("Click 'Add & Manage' button") { - onMainScreen { addAndManageButtonNode.clickWithAssertion() } + onMainScreen { addAndManageButton().clickWithAssertion() } } step("Assert 'Organize tokens' option is not displayed (nothing to organize)") { onAddAndManageBottomSheet { organizeTokensButton.assertIsNotDisplayed() } diff --git a/app/src/androidTest/kotlin/com/tangem/tests/send/sendViaSwap/GaslessSendViaSwapTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/send/sendViaSwap/GaslessSendViaSwapTest.kt index 582555f882..c922a7915d 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/send/sendViaSwap/GaslessSendViaSwapTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/send/sendViaSwap/GaslessSendViaSwapTest.kt @@ -231,7 +231,9 @@ class GaslessSendViaSwapTest : BaseTestCase() { onSendConfirmScreen { secondaryAmount.assertIsDisplayed() } } step("Assert the network fee is paid in '$currencySymbol'") { - onSendConfirmScreen { feeBlockCurrency(currencySymbol).assertIsDisplayed() } + flakySafely(WAIT_UNTIL_TIMEOUT_LONG) { + onSendConfirmScreen { feeBlockCurrency(currencySymbol).assertIsDisplayed() } + } } step("Sign, send and open the 'Transaction sent' screen") { flakySafely(WAIT_UNTIL_TIMEOUT_LONG) { diff --git a/app/src/androidTest/kotlin/com/tangem/tests/send/warnings/DogecoinWarningsTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/send/warnings/DogecoinWarningsTest.kt index 5156609bb7..7ab3fb9ab5 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/send/warnings/DogecoinWarningsTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/send/warnings/DogecoinWarningsTest.kt @@ -4,9 +4,11 @@ import com.tangem.common.BaseTestCase import com.tangem.common.constants.TestConstants.DOGECOIN_RECIPIENT_ADDRESS import com.tangem.common.constants.TestConstants.QUOTES_API_SCENARIO import com.tangem.common.constants.TestConstants.USER_TOKENS_API_SCENARIO +import com.tangem.common.constants.TestConstants.WAIT_UNTIL_TIMEOUT_LONG import com.tangem.common.extensions.clickWithAssertion import com.tangem.common.utils.resetWireMockScenarioState import com.tangem.scenarios.checkSendWarning +import com.tangem.scenarios.openSendConfirmScreenViaNextButton import com.tangem.scenarios.openSendScreen import com.tangem.screens.onSendAddressScreen import com.tangem.screens.onSendScreen @@ -20,8 +22,8 @@ import org.junit.Test @HiltAndroidTest class DogecoinWarningsTest : BaseTestCase() { private val tokenName = "Dogecoin" - private val amountToLeaveLessThanDust = "5.78654978" - private val amountToLeaveMoreThanDust = "5.7" + private val amountToLeaveLessThanDust = "5.7045" + private val amountToLeaveMoreThanDust = "5.6" private val amountGreaterThanDust = "0.02" private val amountLessThanDust = "0.005" private val dustAmount = "DOGE 0.01" @@ -56,8 +58,10 @@ class DogecoinWarningsTest : BaseTestCase() { step("Type address in input text field") { onSendAddressScreen { addressTextField.performTextReplacement(DOGECOIN_RECIPIENT_ADDRESS) } } - step("Click on 'Next' button") { - onSendAddressScreen { nextButton.clickWithAssertion() } + step("Open 'Send confirm' screen via 'Next' button") { + flakySafely(WAIT_UNTIL_TIMEOUT_LONG) { + openSendConfirmScreenViaNextButton() + } } step("Assert 'Invalid amount warning' is displayed") { checkSendWarning( @@ -93,8 +97,10 @@ class DogecoinWarningsTest : BaseTestCase() { step("Type address in input text field") { onSendAddressScreen { addressTextField.performTextReplacement(DOGECOIN_RECIPIENT_ADDRESS) } } - step("Click on 'Next' button") { - onSendAddressScreen { nextButton.clickWithAssertion() } + step("Open 'Send confirm' screen via 'Next' button") { + flakySafely(WAIT_UNTIL_TIMEOUT_LONG) { + openSendConfirmScreenViaNextButton() + } } step("Assert 'Invalid amount warning' is not displayed") { checkSendWarning( diff --git a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsTopBar.kt b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsTopBar.kt index a79ceb5399..c4a6dee5bd 100644 --- a/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsTopBar.kt +++ b/features/tokendetails/impl/src/main/kotlin/com/tangem/feature/tokendetails/presentation/tokendetails/ui/TokenDetailsTopBar.kt @@ -68,11 +68,10 @@ internal fun TokenDetailsTopBar(topAppBarUM: TokenDetailsTopAppBarUM, modifier: .hazeEffectTangem { blurRadius = ACTION_BLUR_RADIUS } TangemTopBar( modifier = modifier - .statusBarsPadding() - .testTag(TokenDetailsTopBarTestTags.BACK_BUTTON), + .statusBarsPadding(), startContent = { TangemTopBarActionContent( - modifier = actionModifier, + modifier = actionModifier.testTag(TokenDetailsTopBarTestTags.BACK_BUTTON), actionUM = TangemTopBarActionUM( iconRes = R.drawable.ic_arrow_back_28, onClick = topAppBarUM.onBackClick, diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBalance.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBalance.kt index cdb2f79b77..013b583609 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBalance.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/components/common/WalletBalance.kt @@ -134,6 +134,7 @@ private fun SubtitleRow(walletBalanceUM: WalletBalanceUM, modifier: Modifier = M ).resolveReference(), style = TangemTheme.typography2.bodyRegular14, color = TangemTheme.colors2.text.neutral.tertiary, + modifier = Modifier.testTag(MainScreenTestTags.SYNC_PROGRESS_TEXT), ) CircularProgressIndicator( modifier = Modifier.size(19.dp),