Add prefix MAESTRO_ to Maestro env variable.

.maestro/tests/account/changeServer.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - tapOn:
     id: "login-change_server"

.maestro/tests/account/login.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - tapOn: "Continue"
 - runFlow: ../assertions/assertLoginDisplayed.yaml
@@ -9,7 +9,7 @@ appId: ${APP_ID}
     id: "login-continue"
 - tapOn:
     id: "login-email_username"
-- inputText: ${USERNAME}
+- inputText: ${MAESTRO_USERNAME}
 - pressKey: Enter
 - tapOn:
     id: "login-password"
@@ -20,7 +20,7 @@ appId: ${APP_ID}
 - tapOn:
     id: "login-password"
 - eraseText: 20
-- inputText: ${PASSWORD}
+- inputText: ${MAESTRO_PASSWORD}
 - pressKey: Enter
 - tapOn: "Continue"
 - runFlow: ../assertions/assertWelcomeScreenDisplayed.yaml

.maestro/tests/account/logout.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - tapOn:
     id: "home_screen-settings"

.maestro/tests/assertions/assertAnalyticsDisplayed.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Help improve Element X dbg"

.maestro/tests/assertions/assertHomeDisplayed.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
     visible: "All Chats"

.maestro/tests/assertions/assertInitDisplayed.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Be in your element"

.maestro/tests/assertions/assertLoginDisplayed.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
     visible: "Change account provider"

.maestro/tests/assertions/assertRoomListSynced.yaml

@@ -1,5 +1,5 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
-    visible: ${ROOM_NAME}
+    visible: ${MAESTRO_ROOM_NAME}
     timeout: 10000

.maestro/tests/assertions/assertWelcomeScreenDisplayed.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - extendedWaitUntil:
     visible:

.maestro/tests/init.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - clearState
 - launchApp:

.maestro/tests/roomList/createAndDeleteDM.yaml

@@ -1,11 +1,11 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 # Purpose: Test the creation and deletion of a DM room.
 - tapOn: "Create a new conversation or room"
 - tapOn: "Search for someone"
-- inputText: ${INVITEE1_MXID}
+- inputText: ${MAESTRO_INVITEE1_MXID}
 - tapOn:
-    text: ${INVITEE1_MXID}
+    text: ${MAESTRO_INVITEE1_MXID}
     index: 1
 - takeScreenshot: build/maestro/330-createAndDeleteDM
 - tapOn: "maestroelement2"

.maestro/tests/roomList/createAndDeleteRoom.yaml

@@ -1,12 +1,12 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 # Purpose: Test the creation and deletion of a room
 - tapOn: "Create a new conversation or room"
 - tapOn: "New room"
 - tapOn: "Search for someone"
-- inputText: ${INVITEE1_MXID}
+- inputText: ${MAESTRO_INVITEE1_MXID}
 - tapOn:
-    text: ${INVITEE1_MXID}
+    text: ${MAESTRO_INVITEE1_MXID}
     index: 1
 - tapOn: "Next"
 - tapOn: "e.g. your project name"
@@ -19,9 +19,9 @@ appId: ${APP_ID}
 - tapOn: "Invite people"
 # assert there's 1 member and 1 invitee
 - tapOn: "Search for someone"
-- inputText: ${INVITEE2_MXID}
+- inputText: ${MAESTRO_INVITEE2_MXID}
 - tapOn:
-    text: ${INVITEE2_MXID}
+    text: ${MAESTRO_INVITEE2_MXID}
     index: 1
 - tapOn: "Invite"
 - tapOn: "Back"

.maestro/tests/roomList/roomContextMenu.yaml

@@ -1,13 +1,13 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 # Purpose: Test the context menu of a room in the room list
-- longPressOn: ${ROOM_NAME}
+- longPressOn: ${MAESTRO_ROOM_NAME}
 - takeScreenshot: build/maestro/310-RoomList-ContextMenu
 - tapOn:
     text: "Settings"
     index: 0
 - tapOn: "Back"
-- longPressOn: ${ROOM_NAME}
+- longPressOn: ${MAESTRO_ROOM_NAME}
 - tapOn:
     text: "Leave room"
     index: 0

.maestro/tests/roomList/roomList.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - runFlow: searchRoomList.yaml
 - takeScreenshot: build/maestro/300-RoomList

.maestro/tests/roomList/searchRoomList.yaml

@@ -1,10 +1,10 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - runFlow: ../assertions/assertRoomListSynced.yaml
 - tapOn: "search"
-- inputText: ${ROOM_NAME.substring(0, 3)}
+- inputText: ${MAESTRO_ROOM_NAME.substring(0, 3)}
 - takeScreenshot: build/maestro/400-SearchRoom
-- tapOn: ${ROOM_NAME}
+- tapOn: ${MAESTRO_ROOM_NAME}
 # Back from timeline
 - back
 - assertVisible: "MyR"

.maestro/tests/roomList/timeline/messages/location.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - takeScreenshot: build/maestro/520-Timeline
 - tapOn: "Add attachment"

.maestro/tests/roomList/timeline/messages/poll.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - takeScreenshot: build/maestro/530-Timeline
 - tapOn: "Add attachment"

.maestro/tests/roomList/timeline/messages/text.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - takeScreenshot: build/maestro/510-Timeline
 - tapOn:

.maestro/tests/roomList/timeline/timeline.yaml

@@ -1,7 +1,7 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 # This is the name of one room
-- tapOn: ${ROOM_NAME}
+- tapOn: ${MAESTRO_ROOM_NAME}
 - takeScreenshot: build/maestro/500-Timeline
 - runFlow: messages/text.yaml
 - runFlow: messages/location.yaml

.maestro/tests/settings/settings.yaml

@@ -1,4 +1,4 @@
-appId: ${APP_ID}
+appId: ${MAESTRO_APP_ID}
 ---
 - tapOn:
     id: "home_screen-settings"