From 0858748471cacf3f5c59a525c58b65abd5d5ea29 Mon Sep 17 00:00:00 2001 From: Tangem Date: Fri, 27 Feb 2026 16:05:34 +0300 Subject: [PATCH] Updated on 2026-08-14 --- .../com/tangem/scenarios/BaseScenarios.kt | 10 ----- .../kotlin/com/tangem/tests/DetailsTest.kt | 2 +- .../kotlin/com/tangem/tests/FeedbackTest.kt | 44 +++---------------- .../kotlin/com/tangem/tests/OnboardingTest.kt | 10 +---- .../kotlin/com/tangem/tests/ResetCardTest.kt | 2 +- .../kotlin/com/tangem/tests/ScanCardTest.kt | 8 ++-- .../kotlin/com/tangem/tests/WarningTest.kt | 2 +- 7 files changed, 14 insertions(+), 64 deletions(-) diff --git a/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt b/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt index bc4f4593d7..09f4b7bd1e 100644 --- a/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt +++ b/app/src/androidTest/kotlin/com/tangem/scenarios/BaseScenarios.kt @@ -5,7 +5,6 @@ import com.tangem.common.BaseTestCase import com.tangem.common.extensions.clickWithAssertion import com.tangem.domain.models.scan.ProductType import com.tangem.screens.* -import com.tangem.screens.AlreadyUsedWalletDialogPageObject.thisIsMyWalletButton import com.tangem.tap.domain.sdk.mocks.MockContent import com.tangem.tap.domain.sdk.mocks.MockProvider import com.tangem.utils.StringsSigns.DASH_SIGN @@ -14,7 +13,6 @@ import io.qameta.allure.kotlin.Allure.step fun BaseTestCase.scanCard( productType: ProductType? = null, mockContent: MockContent? = null, - alreadyActivatedDialogIsShown: Boolean = false, isTwinsCard: Boolean = false, ) { if (productType != null) { @@ -32,12 +30,6 @@ fun BaseTestCase.scanCard( step("Click on 'Scan card or ring' button") { onCreateWalletStartScreen { scanCardOrRingButton.clickWithAssertion() } } - if (alreadyActivatedDialogIsShown) { - step("Click on 'This is my wallet' button") { - waitForIdle() - AlreadyUsedWalletDialogPageObject { thisIsMyWalletButton.click() } - } - } if (isTwinsCard) { step("Click on 'Continue' button") { onOnboardingScreen { continueButton.clickWithAssertion() } @@ -51,14 +43,12 @@ fun BaseTestCase.scanCard( fun BaseTestCase.openMainScreen( productType: ProductType? = null, mockContent: MockContent? = null, - alreadyActivatedDialogIsShown: Boolean = false, isTwinsCard: Boolean = false, ) { step("Scan card") { scanCard( productType = productType, mockContent = mockContent, - alreadyActivatedDialogIsShown = alreadyActivatedDialogIsShown, isTwinsCard = isTwinsCard, ) } diff --git a/app/src/androidTest/kotlin/com/tangem/tests/DetailsTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/DetailsTest.kt index c084d381c8..54604ff5cf 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/DetailsTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/DetailsTest.kt @@ -64,7 +64,7 @@ class DetailsTest : BaseTestCase() { fun wallet2DetailsTest() = setupHooks().run { step("Open 'Main Screen'") { - openMainScreen(productType = ProductType.Wallet2, alreadyActivatedDialogIsShown = true) + openMainScreen(productType = ProductType.Wallet2) } onTopBar { step("Open wallet details") { diff --git a/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt index 0a20f32754..a1cc2319c9 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/FeedbackTest.kt @@ -6,11 +6,12 @@ import com.tangem.common.constants.TestConstants.RECIPIENT_ADDRESS import com.tangem.common.constants.TestConstants.WAIT_UNTIL_TIMEOUT import com.tangem.common.core.TangemSdkError import com.tangem.common.extensions.clickWithAssertion -import com.tangem.domain.models.scan.ProductType import com.tangem.domain.redux.StateDialog -import com.tangem.scenarios.* +import com.tangem.scenarios.checkFailedTransactionDialog +import com.tangem.scenarios.checkScanWarningDialog +import com.tangem.scenarios.openMainScreen +import com.tangem.scenarios.synchronizeAddresses import com.tangem.screens.* -import com.tangem.screens.AlreadyUsedWalletDialogPageObject.requestSupportButton import com.tangem.tap.common.redux.global.GlobalAction import com.tangem.tap.domain.sdk.mocks.MockProvider import com.tangem.tap.store @@ -96,7 +97,7 @@ class FeedbackTest : BaseTestCase() { step("Click 'Next' button") { onSendAddressScreen { nextButton.clickWithAssertion() } } - step("Assert sanding text is displayed") { + step("Assert sеnding text is displayed") { onSendConfirmScreen { sendingText.assertIsDisplayed() } } step("Click 'Send' button") { @@ -163,39 +164,4 @@ class FeedbackTest : BaseTestCase() { } } } - - @AllureId("3986") - @DisplayName("Send feedback: from scan already used wallet alert dialog") - @Test - fun sendFeedbackAfterScanAlreadyUsedWalletTest() { - val gmailText = "Welcome to Gmail" - - setupHooks( - additionalAfterSection = { - device.uiDevice.pressBack() - } - ).run { - step("Set mocks for Wallet2") { - MockProvider.setMocks(ProductType.Wallet2) - } - step("Click on 'Accept' button") { - onDisclaimerScreen { acceptButton.clickWithAssertion() } - } - step("Click on 'Get started' button") { - onStoriesScreen { getStartedButton.clickWithAssertion() } - } - step("Click on 'Scan card or ring' button") { - onCreateWalletStartScreen { scanCardOrRingButton.clickWithAssertion() } - } - step("Check 'Already used Wallet' dialog") { - checkAlreadyUsedWalletDialog() - } - step("Click on 'Request support' button") { - AlreadyUsedWalletDialogPageObject { requestSupportButton.click() } - } - step("Assert 'Gmail' app is open") { - ThirdPartyAppPageObject { assertElementWithTextExists(gmailText) } - } - } - } } \ No newline at end of file diff --git a/app/src/androidTest/kotlin/com/tangem/tests/OnboardingTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/OnboardingTest.kt index c1e7d608de..26238b9789 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/OnboardingTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/OnboardingTest.kt @@ -30,10 +30,7 @@ class OnboardingTest : BaseTestCase() { @Test fun shibaBackupScreenTest() { setupHooks().run { - scanCard( - mockContent = ShibaNoBackupMockContent, - alreadyActivatedDialogIsShown = true - ) + scanCard(mockContent = ShibaNoBackupMockContent) checkBackupScreen() } } @@ -54,10 +51,7 @@ class OnboardingTest : BaseTestCase() { @Test fun wallet2BackupScreenTest() { setupHooks().run { - scanCard( - mockContent = Wallet2NoBackupMockContent, - alreadyActivatedDialogIsShown = true - ) + scanCard(mockContent = Wallet2NoBackupMockContent) checkBackupScreen() } } diff --git a/app/src/androidTest/kotlin/com/tangem/tests/ResetCardTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/ResetCardTest.kt index 50a5f44b6d..60c2157e1a 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/ResetCardTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/ResetCardTest.kt @@ -64,7 +64,7 @@ class ResetCardTest : BaseTestCase() { fun resetWallet2CardWithBackupTest() { setupHooks().run { step("Open 'Main Screen'") { - openMainScreen(productType = ProductType.Wallet2, alreadyActivatedDialogIsShown = true) + openMainScreen(productType = ProductType.Wallet2) } step("Open 'Device settings' screen") { openDeviceSettingsScreen() diff --git a/app/src/androidTest/kotlin/com/tangem/tests/ScanCardTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/ScanCardTest.kt index 856a3963b3..1b83533fcb 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/ScanCardTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/ScanCardTest.kt @@ -73,7 +73,7 @@ class ScanCardTest : BaseTestCase() { setupHooks().run { step("Open 'Main Screen' on $card") { - openMainScreen(mockContent = cardType, alreadyActivatedDialogIsShown = true) + openMainScreen(mockContent = cardType) } step("Check 'Main' screen for $card curve with devices count = '$devicesCount'") { checkMultiCurrencyMainScreen( @@ -119,7 +119,7 @@ class ScanCardTest : BaseTestCase() { setupHooks().run { step("Open 'Main Screen' on '$card' card") { - openMainScreen(mockContent = cardType, alreadyActivatedDialogIsShown = true) + openMainScreen(mockContent = cardType) } step("Check 'Main' screen for '$card' card with devices count = '$devicesCount'") { checkMultiCurrencyMainScreen(devicesCount, cardName) @@ -138,7 +138,7 @@ class ScanCardTest : BaseTestCase() { setupHooks().run { step("Open 'Main Screen' on '$ring'") { - openMainScreen(productType = cardType, alreadyActivatedDialogIsShown = true) + openMainScreen(productType = cardType) } step("Check 'Main' screen for '$ring' with devices count = '$devicesCount'") { checkMultiCurrencyMainScreen(devicesCount, cardName) @@ -175,7 +175,7 @@ class ScanCardTest : BaseTestCase() { setupHooks().run { step("Open 'Main Screen' on '$card' card") { - openMainScreen(mockContent = cardType, alreadyActivatedDialogIsShown = true) + openMainScreen(mockContent = cardType) } step("Check 'Main' screen for '$card' card with devices count = '$devicesCount'") { checkMultiCurrencyMainScreen(devicesCount, cardName) diff --git a/app/src/androidTest/kotlin/com/tangem/tests/WarningTest.kt b/app/src/androidTest/kotlin/com/tangem/tests/WarningTest.kt index cf0024f8bb..8bbaf0ed91 100644 --- a/app/src/androidTest/kotlin/com/tangem/tests/WarningTest.kt +++ b/app/src/androidTest/kotlin/com/tangem/tests/WarningTest.kt @@ -75,7 +75,7 @@ class WarningTest : BaseTestCase() { } ).run { step("Open 'Main' screen") { - openMainScreen(mockContent = Wallet2WithSeedPhraseMockContent, alreadyActivatedDialogIsShown = true) + openMainScreen(mockContent = Wallet2WithSeedPhraseMockContent) } step("Assert 'Seed phrase' notification icon is displayed") { onMainScreen { seedPhraseNotificationIcon.assertIsDisplayed() }