From f7c2adcdc43e2e5d73bebfee6424233c442d128f Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Wed, 1 Apr 2026 13:30:01 +0200
Subject: [PATCH] CI: yet another Maestro fix (#6505)

* Fix the `assertSessionVerificationDisplayed.yaml` check

* Previous 'Location' is now 'Share location'

* We don't have a GPS location, so the text is 'Share selected location'

* 'Create a new conversation' is now 'Create room'

* Try adding a background logcat process

* 'Sign out' is now 'Remove this device'

* Adjust the logcat filtering so it silences everything that's not our app, otherwise the logs can get quite large
---
 .../scripts/maestro/maestro-local-with-screen-recording.sh  | 3 +++
 .maestro/tests/account/logout.yaml                          | 6 +++---
 .../assertions/assertSessionVerificationDisplayed.yaml      | 2 +-
 .maestro/tests/roomList/createAndDeleteDM.yaml              | 2 +-
 .maestro/tests/roomList/createAndDeleteRoom.yaml            | 2 +-
 .maestro/tests/roomList/timeline/messages/location.yaml     | 4 ++--
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh b/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
index 51a968fdec..4ee021c316 100755
--- a/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
+++ b/.github/workflows/scripts/maestro/maestro-local-with-screen-recording.sh
@@ -19,6 +19,9 @@ adb install -r $1
 echo "Starting the screen recording..."
 adb push .github/workflows/scripts/maestro/local-recording.sh /data/local/tmp/
 adb shell "chmod +x /data/local/tmp/local-recording.sh"
+mkdir -p ~/.maestro/tests
+# Start logcat in the background and save the output to a file, use `org.matrix.rust.sdk` tag since the SDK handles the logging
+adb logcat 'org.matrix.rust.sdk:D *:S' > ~/.maestro/tests/logcat.txt &
 adb shell "/data/local/tmp/local-recording.sh & echo \$! > /data/local/tmp/screenrecord_pid.txt" &
 set +e
 ~/.maestro/bin/maestro test .maestro/allTests.yaml
diff --git a/.maestro/tests/account/logout.yaml b/.maestro/tests/account/logout.yaml
index f27f5dada3..a276182825 100644
--- a/.maestro/tests/account/logout.yaml
+++ b/.maestro/tests/account/logout.yaml
@@ -2,14 +2,14 @@ appId: ${MAESTRO_APP_ID}
 ---
 - tapOn:
     id: "home_screen-settings"
-- tapOn: "Sign out"
+- tapOn: "Remove this device"
 - takeScreenshot: build/maestro/900-SignOutScreen
 - back
-- tapOn: "Sign out"
+- tapOn: "Remove this device"
 # Ensure cancel cancels
 - tapOn:
     id: "dialog-negative"
-- tapOn: "Sign out"
+- tapOn: "Remove this device"
 - tapOn:
     id: "dialog-positive"
 - runFlow: ../assertions/assertInitDisplayed.yaml
diff --git a/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml b/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml
index fff0fe7b32..d2160e0934 100644
--- a/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml
+++ b/.maestro/tests/assertions/assertSessionVerificationDisplayed.yaml
@@ -1,5 +1,5 @@
 appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
-    visible: "Confirm your identity"
+    visible: "Confirm your digital identity"
     timeout: 60000
diff --git a/.maestro/tests/roomList/createAndDeleteDM.yaml b/.maestro/tests/roomList/createAndDeleteDM.yaml
index e80dc377b5..a6279151ea 100644
--- a/.maestro/tests/roomList/createAndDeleteDM.yaml
+++ b/.maestro/tests/roomList/createAndDeleteDM.yaml
@@ -1,7 +1,7 @@
 appId: ${MAESTRO_APP_ID}
 ---
 # Purpose: Test the creation and deletion of a DM room.
-- tapOn: "Create a new conversation or room"
+- tapOn: "Create room"
 - tapOn: "Search for someone"
 - inputText: ${MAESTRO_INVITEE1_MXID}
 - tapOn:
diff --git a/.maestro/tests/roomList/createAndDeleteRoom.yaml b/.maestro/tests/roomList/createAndDeleteRoom.yaml
index d0b17133d5..b53066ccd5 100644
--- a/.maestro/tests/roomList/createAndDeleteRoom.yaml
+++ b/.maestro/tests/roomList/createAndDeleteRoom.yaml
@@ -1,7 +1,7 @@
 appId: ${MAESTRO_APP_ID}
 ---
 # Purpose: Test the creation and deletion of a room
-- tapOn: "Create a new conversation or room"
+- tapOn: "Create room"
 - tapOn: "New room"
 - tapOn: "Add name…"
 - inputText: "aRoomName"
diff --git a/.maestro/tests/roomList/timeline/messages/location.yaml b/.maestro/tests/roomList/timeline/messages/location.yaml
index c9382bd30c..863a699fd9 100644
--- a/.maestro/tests/roomList/timeline/messages/location.yaml
+++ b/.maestro/tests/roomList/timeline/messages/location.yaml
@@ -2,6 +2,6 @@ appId: ${MAESTRO_APP_ID}
 ---
 - takeScreenshot: build/maestro/520-Timeline
 - tapOn: "Add attachment"
-- tapOn: "Location"
-- tapOn: "Share my location"
+- tapOn: "Share location"
+- tapOn: "Share selected location"
 - takeScreenshot: build/maestro/521-Timeline