From 5e07e428c07c9639ba1a10c460d3cb227f87d971 Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Wed, 4 Jun 2025 09:36:08 -0300 Subject: [PATCH] Fix instrumentation tests for message backups checkout flow. --- .../subscription/MessageBackupsCheckoutActivityTest.kt | 10 +++++----- .../subscription/MessageBackupsTypeSelectionScreen.kt | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutActivityTest.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutActivityTest.kt index da192621ba..d5b45f82f2 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutActivityTest.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsCheckoutActivityTest.kt @@ -82,8 +82,8 @@ class MessageBackupsCheckoutActivityTest { composeTestRule.onNodeWithTag("message-backups-type-selection-screen-lazy-column") .performScrollToNode(hasText(context.getString(R.string.MessageBackupsTypeSelectionScreen__text_plus_all_your_media))) composeTestRule.onNodeWithText(context.getString(R.string.MessageBackupsTypeSelectionScreen__text_plus_all_your_media)).performClick() - composeTestRule.onNodeWithText(context.getString(R.string.MessageBackupsTypeSelectionScreen__next)).assertIsEnabled() - composeTestRule.onNodeWithText(context.getString(R.string.MessageBackupsTypeSelectionScreen__next)).performClick() + composeTestRule.onNodeWithTag("subscribe-button").assertIsEnabled() + composeTestRule.onNodeWithTag("subscribe-button").performClick() composeTestRule.waitForIdle() testDispatcher.scheduler.advanceUntilIdle() @@ -125,8 +125,8 @@ class MessageBackupsCheckoutActivityTest { composeTestRule.onNodeWithTag("message-backups-type-selection-screen-lazy-column") .performScrollToNode(hasText(context.getString(R.string.MessageBackupsTypeSelectionScreen__free))) composeTestRule.onNodeWithText(context.getString(R.string.MessageBackupsTypeSelectionScreen__free)).performClick() - composeTestRule.onNodeWithText(context.getString(R.string.MessageBackupsTypeSelectionScreen__next)).assertIsEnabled() - composeTestRule.onNodeWithText(context.getString(R.string.MessageBackupsTypeSelectionScreen__next)).performClick() + composeTestRule.onNodeWithTag("subscribe-button").assertIsEnabled() + composeTestRule.onNodeWithTag("subscribe-button").performClick() composeTestRule.waitForIdle() assertThat(SignalStore.backup.backupTier).isEqualTo(MessageBackupTier.FREE) @@ -175,7 +175,7 @@ class MessageBackupsCheckoutActivityTest { // Type selection screen composeTestRule.onNodeWithText(context.getString(R.string.MessagesBackupsTypeSelectionScreen__choose_your_backup_plan)).assertIsDisplayed() - composeTestRule.onNodeWithText(context.getString(R.string.MessageBackupsTypeSelectionScreen__next)).assertIsNotEnabled() + composeTestRule.onNodeWithTag("subscribe-button").assertIsNotEnabled() } private fun launchCheckoutFlow(tier: MessageBackupTier? = null): ActivityScenario { diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt index 7c4e056ac2..ddbae907bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/MessageBackupsTypeSelectionScreen.kt @@ -163,6 +163,7 @@ fun MessageBackupsTypeSelectionScreen( onClick = onNextClicked, enabled = isNextEnabled, modifier = Modifier + .testTag("subscribe-button") .fillMaxWidth() .padding(vertical = if (hasCurrentBackupTier) 10.dp else 16.dp) ) {