Merge pull request #1722 from vector-im/feature/bma/fixMaestroSignOut

Fix maestro test.

.maestro/tests/account/logout.yaml

@@ -6,9 +6,12 @@ appId: ${APP_ID}
 - takeScreenshot: build/maestro/900-SignOutScreen
 - back
 - tapOn: "Sign out"
-- tapOn: "Sign out"
+- tapOn:
+    id: "sign-out-submit"
 # Ensure cancel cancels
 - tapOn: "Cancel"
-- tapOn: "Sign out"
-- tapOn: "Sign out anyway"
+- tapOn:
+    id: "sign-out-submit"
+- tapOn:
+    id: "dialog-positive"
 - runFlow: ../assertions/assertInitDisplayed.yaml

features/logout/impl/src/main/kotlin/io/element/android/features/logout/impl/LogoutView.kt

@@ -46,6 +46,8 @@ import io.element.android.libraries.designsystem.theme.progressIndicatorTrackCol
 import io.element.android.libraries.designsystem.utils.CommonDrawables
 import io.element.android.libraries.matrix.api.encryption.BackupUploadState
 import io.element.android.libraries.matrix.api.encryption.SteadyStateException
+import io.element.android.libraries.testtags.TestTags
+import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.theme.ElementTheme
 import io.element.android.libraries.ui.strings.CommonStrings
 
@@ -194,7 +196,9 @@ private fun BottomMenu(
             text = stringResource(id = signOutSubmitRes),
             showProgress = logoutAction is Async.Loading,
             destructive = true,
-            modifier = Modifier.fillMaxWidth(),
+            modifier = Modifier
+                .fillMaxWidth()
+                .testTag(TestTags.signOut),
             onClick = onLogoutClicked,
         )
     }

libraries/designsystem/build.gradle.kts

@@ -39,6 +39,7 @@ android {
         // Should not be there, but this is a POC
         implementation(libs.coil.compose)
         implementation(libs.vanniktech.blurhash)
+        implementation(projects.libraries.testtags)
         implementation(projects.libraries.uiStrings)
 
         ksp(libs.showkase.processor)

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/components/AlertDialogContent.kt

@@ -43,6 +43,8 @@ import androidx.compose.ui.unit.dp
 import io.element.android.libraries.designsystem.preview.ElementThemedPreview
 import io.element.android.libraries.designsystem.preview.PreviewGroup
 import io.element.android.libraries.designsystem.utils.CommonDrawables
+import io.element.android.libraries.testtags.TestTags
+import io.element.android.libraries.testtags.testTag
 import io.element.android.libraries.theme.ElementTheme
 import kotlin.math.max
 
@@ -113,18 +115,23 @@ internal fun SimpleAlertDialogContent(
                     // If there is a 3rd item it should be at the end of the dialog
                     // Having this 3rd action is discouraged, see https://m3.material.io/components/dialogs/guidelines#e13b68f5-e367-4275-ad6f-c552ee8e358f
                     TextButton(
+                        modifier = Modifier.testTag(TestTags.dialogNeutral),
                         text = thirdButtonText,
                         size = ButtonSize.Medium,
                         onClick = onThirdButtonClicked,
                     )
                 }
                 TextButton(
+                    modifier = Modifier.testTag(
+                        if (submitText == null) TestTags.dialogPositive else TestTags.dialogNegative
+                    ),
                     text = cancelText,
                     size = ButtonSize.Medium,
                     onClick = onCancelClicked,
                 )
                 if (submitText != null) {
                     Button(
+                        modifier = Modifier.testTag(TestTags.dialogPositive),
                         text = submitText,
                         enabled = enabled,
                         size = ButtonSize.Medium,

libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt

@@ -33,6 +33,11 @@ object TestTags {
     val loginPassword = TestTag("login-password")
     val loginContinue = TestTag("login-continue")
 
+    /**
+     * Sign out screen.
+     */
+    val signOut = TestTag("sign-out-submit")
+
     /**
      * Change server screen.
      */
@@ -52,6 +57,13 @@ object TestTags {
      * RichTextEditor.
      */
     val richTextEditor = TestTag("rich_text_editor")
+
+    /**
+     * Dialogs.
+     */
+    val dialogPositive = TestTag("dialog-positive")
+    val dialogNegative = TestTag("dialog-negative")
+    val dialogNeutral = TestTag("dialog-neutral")
 }