chore: iOS Maestro test fix

.github/workflows/build-pr.yml

@@ -100,4 +100,9 @@ jobs:
     uses: ./.github/workflows/maestro-ios.yml
     needs: [e2e-build-ios]
     secrets: inherit
-
+    strategy:
+      matrix:
+        shard: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]
+      fail-fast: false
+    with:
+      shard: ${{ matrix.shard }}

.github/workflows/maestro-android.yml

@@ -127,4 +127,4 @@ jobs:
         with:
           name: maestro-video-${{ inputs.shard }}
           path: test_run_${{ inputs.shard }}_attempt_*.mp4
-          retention-days: 7
+          retention-days: 7

.github/workflows/maestro-ios.yml

@@ -2,6 +2,10 @@ name: Maestro Tests on iOS
 
 on:
   workflow_call:
+    inputs:
+      shard:
+        required: true
+        type: string
 
 jobs:
   ios-test:
@@ -85,20 +89,35 @@ jobs:
           xcrun simctl install $UDID "ios-simulator-app"
 
       - name: Run Tests
-        run: |
-          export MAESTRO_DRIVER_STARTUP_TIMEOUT=120000
-          maestro test .maestro --format junit --output maestro-report.xml
+        id: maestro-tests
+        uses: nick-fields/retry@v3
+        with:
+          max_attempts: 3
+          timeout_minutes: 60
+          command: |
+            SHARD=${{ inputs.shard }}
+            echo "Running shard: $SHARD"
+            export MAESTRO_DRIVER_STARTUP_TIMEOUT=120000
+
+            maestro test .maestro \
+              --exclude-tags=util \
+              --include-tags=test-$SHARD \
+              --exclude-tags=android-only \
+              --format junit \
+              --output maestro-report.xml
 
-      - name: Upload Test Report
+      - name: Maestro Test Report
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: Test Report
+          name: Test Report - Shard ${{ inputs.shard }}
           path: maestro-report.xml
+          retention-days: 28
 
-      - name: Upload Maestro Logs
+      - name: iOS Maestro Logs
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: iOS Maestro Logs
-          path: ~/.maestro/tests/
+          name: iOS Maestro Logs - Shard ${{ inputs.shard }}
+          path: ~/.maestro/tests/
+          retention-days: 28

.maestro/helpers/erase-text.yaml

@@ -4,12 +4,28 @@ tags:
   - 'util'
 
 ---
-- longPressOn:
-    id: ${id}
+- runFlow:
+    when:
+      true: ${id != null}
+    commands:
+      - longPressOn:
+          id: ${id}
+- runFlow:
+    when:
+      true: ${text != null}
+    commands:
+      - doubleTapOn:
+          text: .*${text}.*
 - runFlow:
     when:
       visible:
         text: 'Select All'
     commands:
       - tapOn: Select All
       - eraseText: 1
+- runFlow:
+    when:
+      notVisible:
+        text: 'Select All'
+    commands:
+      - eraseText: 100

.maestro/helpers/hide-keyboard.yaml

@@ -0,0 +1,17 @@
+appId: chat.rocket.reactnative
+name: Hide Keyboard
+tags:
+  - 'util'
+
+---
+- runFlow:
+    when:
+      platform: android
+    commands:
+      - hideKeyboard
+- runFlow:
+    when:
+      platform: iOS
+    commands:
+      - tapOn:
+          point: 1%,20%

.maestro/helpers/launch-app.yaml

@@ -16,6 +16,7 @@ tags:
       - runFlow:
           when:
             visible: '.*Pixel Launcher.*'
+            platform: Android
           commands:
             - tapOn: 'Close App'
       - assertVisible: 'Add workspace'

.maestro/helpers/login-with-deeplink.yaml

@@ -4,13 +4,8 @@ tags:
   - 'util'
 
 ---
-- runFlow:
-    when:
-      true: CLEAR_STATE
-      platform: android
-    commands:
-      - clearState
-      - stopApp: chat.rocket.reactnative
+- clearState
+- stopApp: chat.rocket.reactnative
 - evalScript: ${output.login = output.utils.login(USERNAME, PASSWORD)}
 - runFlow:
     file: 'open-deeplink.yaml'
@@ -36,6 +31,13 @@ tags:
       - assertNotVisible:
           text: '.*Allow.*'
           optional: true
+- runFlow:
+    when:
+      visible: '.*Would like to send you notifications.*'
+      platform: iOS
+    commands:
+      - tapOn:
+          point: 65%,60%
 - extendedWaitUntil:
     visible:
       id: 'rooms-list-view'

.maestro/helpers/logout.yaml

@@ -43,6 +43,15 @@ tags:
 - tapOn:
     id: 'settings-logout'
 
+- extendedWaitUntil:
+    visible:
+      text: '.*You will be logged out of this application.*'
+    timeout: 60000
+
+- assertVisible:
+    text: Logout
+    index: 0
+
 - runFlow:
     when:
       platform: Android
@@ -60,10 +69,9 @@ tags:
       platform: iOS
     commands:
       - tapOn:
-          text: Logout
-          index: 1
+          point: '65%,56%'
 
 - extendedWaitUntil:
     visible:
       id: 'new-server-view'
-    timeout: 60000
+    timeout: 5000

.maestro/helpers/navigate-to-room.yaml

@@ -4,9 +4,11 @@ tags:
   - 'util'
 
 ---
+- waitForAnimationToEnd
 - scrollUntilVisible:
     element:
       id: 'rooms-list-view-item-${ROOM}'
+- waitForAnimationToEnd
 - tapOn:
     id: 'rooms-list-view-item-${ROOM}'
 - extendedWaitUntil:

.maestro/helpers/open-deeplink.yaml

@@ -11,4 +11,11 @@ tags:
       visible: '.*Open in.*'
       platform: iOS
     commands:
-      - tapOn: Open
+      - tapOn:
+          text: Open
+          index: 0
+          optional: true
+      - tapOn:
+          text: Open
+          index: 1
+          optional: true

.maestro/tests/assorted/accessibility-and-appearance.yaml

@@ -6,6 +6,7 @@ onFlowComplete:
   - evalScript: ${output.utils.deleteCreatedUsers()}
 tags:
   - test-5
+  - android-only
 
 ---
 - evalScript: ${output.user = output.utils.createUser()}

.maestro/tests/assorted/broadcast.yaml

@@ -132,7 +132,7 @@ tags:
 
 # should have the message created earlier
 - assertVisible:
-    text: 'message'
+    id: 'message-content-message'
 
 # should tap on reply button and navigate to direct room
 - assertVisible:

.maestro/tests/assorted/profile.yaml

@@ -9,7 +9,6 @@ tags:
 
 ---
 - evalScript: ${output.user = output.utils.createUser()}
-
 - runFlow:
     file: '../../helpers/login-with-deeplink.yaml'
     env:
@@ -103,6 +102,7 @@ tags:
     element:
       id: 'profile-view-submit'
     timeout: 60000
+    centerElement: true
 - tapOn:
     id: 'profile-view-submit'
 
@@ -127,6 +127,7 @@ tags:
     element:
       id: 'profile-view-submit'
     timeout: 60000
+    centerElement: true
 - tapOn:
     id: 'profile-view-submit'
 
@@ -146,12 +147,10 @@ tags:
     env:
       id: 'profile-view-email'
 - inputText: mobile+profileChangesNew${output.random()}@rocket.chat
-- tapOn:
-    text: '.*Email.*'
-    index: 0
 - scrollUntilVisible:
     element:
       id: 'profile-view-submit'
+    centerElement: true
     timeout: 60000
 - tapOn:
     id: 'profile-view-submit'

.maestro/tests/room/create-dm-group.yaml

@@ -40,10 +40,10 @@ tags:
 # should navigate to create DM
 - extendedWaitUntil:
     visible:
-      text: '.*Direct message.*'
+      id: 'new-message-view-create-direct-message'
     timeout: 60000
 - tapOn:
-    text: '.*Direct message.*'
+    id: 'new-message-view-create-direct-message'
 
 # should add users
 - extendedWaitUntil:

.maestro/tests/room/discussion.yaml

@@ -43,7 +43,8 @@ tags:
     visible:
       id: 'create-discussion-view'
     timeout: 60000
-- tapOn: 'Select a channel'
+- tapOn:
+    id: 'create-discussion-select-channel'
 - extendedWaitUntil:
     visible:
       id: 'action-sheet'
@@ -141,7 +142,7 @@ tags:
     timeout: 60000
 - extendedWaitUntil:
     visible:
-      text: ${output.room.name}
+      text: .*${output.room.name}.*
     timeout: 60000
 - tapOn:
     id: multi-select-discussion-name
@@ -313,10 +314,10 @@ tags:
 # should navigate to discussion
 - extendedWaitUntil:
     visible:
-      text: .*${output.discussionFromNewMessage}.*
+      id: 'discussions-view-${output.discussionFromNewMessage}'
     timeout: 60000
 - tapOn:
-    text: .*${output.discussionFromNewMessage}.*
+    id: 'discussions-view-${output.discussionFromNewMessage}'
 - extendedWaitUntil:
     visible:
       id: 'room-view-title-${output.discussionFromNewMessage}'