chore: improvement to end to end test

.github/workflows/maestro-android.yml

@@ -11,6 +11,8 @@ jobs:
   android-test:
     name: 'Android Tests'
     runs-on: ubuntu-latest
+    env:
+      MAESTRO_VERSION: 2.2.0
 
     steps:
       - name: Checkout Repository
@@ -19,8 +21,22 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: 17
+
+      - name: Cache Android AVD
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ runner.os }}-api34
+
+      - name: Cache Maestro
+        uses: actions/cache@v4
+        with:
+          path: ~/.maestro
+          key: maestro-${{ runner.os }}-${{ env.MAESTRO_VERSION }}
 
       - name: Download APK
         uses: actions/download-artifact@v4
@@ -34,21 +50,26 @@ jobs:
 
       - name: Install Maestro
         run: |
-          curl -fsSL "https://get.maestro.mobile.dev" | bash
-          echo "$HOME/.maestro/bin" >> $GITHUB_PATH
-        
+          curl -Ls "https://get.maestro.mobile.dev" | bash
+          echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
+
       - name: Enable KVM group permissions
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
 
+      - name: Disable unnecessary services (improves emulator stability)
+        run: |
+          sudo systemctl stop docker || true
+          sudo systemctl stop snapd || true
+
       - name: Make Maestro script executable
         run: chmod +x .github/scripts/run-maestro.sh
 
       - name: Start Android Emulator and Run Maestro Tests
         uses: reactivecircus/android-emulator-runner@v2
-        timeout-minutes: 120
+        timeout-minutes: 60
         with:
           api-level: 34
           disk-size: 4096M
@@ -58,8 +79,9 @@ jobs:
           cores: 4
           ram-size: 4096M
           force-avd-creation: false
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           disable-animations: true
+          emulator-boot-timeout: 900
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -accel on
           script: ./.github/scripts/run-maestro.sh android ${{ inputs.shard }}
 
       - name: Android Maestro Logs

.github/workflows/maestro-ios.yml

@@ -10,6 +10,8 @@ on:
 jobs:
   ios-test:
     runs-on: macos-14
+    env:
+      MAESTRO_VERSION: 2.2.0
 
     steps:
       - name: Checkout Repo
@@ -18,8 +20,8 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
-          java-version: '17'
+          distribution: temurin
+          java-version: "17"
 
       - name: Download App
         uses: actions/download-artifact@v4
@@ -32,70 +34,73 @@ jobs:
         with:
           E2E_ACCOUNT: ${{ secrets.E2E_ACCOUNT }}
 
-      - name: Install Maestro
+      - name: Cache Maestro
+        uses: actions/cache@v4
+        with:
+          path: ~/.maestro
+          key: maestro-${{ runner.os }}-${{ env.MAESTRO_VERSION }}
+
+      - name: Install Maestro + idb
         run: |
           brew tap facebook/fb
           brew install facebook/fb/idb-companion
           curl -fsSL "https://get.maestro.mobile.dev" | bash
-          echo "$HOME/.maestro/bin" >> $GITHUB_PATH
+          echo "$HOME/.maestro/bin" >> "$GITHUB_PATH"
 
       - name: Configure Simulator
         run: |
           defaults write com.apple.iphonesimulator ConnectHardwareKeyboard -bool false
-          defaults write com.apple.iphonesimulator ShowSingleTouches 1
           defaults write com.apple.iphonesimulator SlowAnimations -bool false
           defaults write com.apple.iphonesimulator ShowDeviceBezels -bool false
           defaults write com.apple.iphonesimulator DisableShadows -bool true
+          defaults write com.apple.iphonesimulator AllowFullscreenMode -bool false
+          defaults write com.apple.iphonesimulator PasteboardAutomaticSync -bool false
+          defaults write com.apple.iphonesimulator ShowChrome -bool false
+          defaults write com.apple.iphonesimulator DeviceFramebufferOnly -bool true
 
       - name: Boot Simulator
-        timeout-minutes: 30
+        timeout-minutes: 15
         run: |
-          SIM_NAME="iPhone 16 Pro Max"
-          TIMEOUT=300  # 5 minutes in seconds
-          INTERVAL=5   # Check every 5 seconds
-    
+          SIM_NAME="iPhone 16 Pro"
+
+          echo "Booting simulator: $SIM_NAME"
+
           xcrun simctl boot "$SIM_NAME" || true
-
-          ELAPSED=0
-          while true; do
-            BOOTED=$(xcrun simctl list devices | grep "$SIM_NAME (" | grep "(Booted)")
-            if [ -n "$BOOTED" ]; then
-                echo "$SIM_NAME is booted"
-                break
-            fi
-
-            if [ $ELAPSED -ge $TIMEOUT ]; then
-                echo "Simulator did not boot within 5 minutes. Retrying..."
-                xcrun simctl shutdown "$SIM_NAME"
-                xcrun simctl boot "$SIM_NAME"
-                ELAPSED=0
-            fi
-
-            sleep $INTERVAL
-            ELAPSED=$((ELAPSED + INTERVAL))
-            done
-
+          xcrun simctl bootstatus "$SIM_NAME" -b
+
+          echo "Disabling animations"
+          xcrun simctl spawn booted defaults write -g UIAnimationDragCoefficient -float 10
+
+          echo "Warming SpringBoard"
+          xcrun simctl launch booted com.apple.springboard
+          sleep 15
+
+          echo "Booted devices:"
           xcrun simctl list devices | grep Booted
 
-      - name: Get Simulator UDID 
+      - name: Get Booted Simulator UDID
         id: booted-sim
         run: |
-          UDID=$(xcrun simctl list devices | grep "iPhone 16 Pro Max (" | grep "(Booted)" | grep -oE '[A-F0-9-]{36}' | head -n1)
+          UDID=$(xcrun simctl list devices booted | grep -oE '[A-F0-9-]{36}' | head -n1)
           echo "UDID=$UDID"
           echo "UDID=$UDID" >> $GITHUB_ENV
 
-      - name: Make Maestro script executable
-        run: chmod +x .github/scripts/run-maestro.sh
-
       - name: Install App
         run: |
-          xcrun simctl install $UDID "ios-simulator-app"
+          xcrun simctl install booted ios-simulator-app
 
-      - name: Run Tests
-        timeout-minutes: 120
-        run: ./.github/scripts/run-maestro.sh ios ${{ inputs.shard }}
+      - name: Make Maestro Script Executable
+        run: chmod +x .github/scripts/run-maestro.sh
+
+      - name: Run Maestro Tests
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 30
+          max_attempts: 2
+          retry_on: timeout
+          command: ./.github/scripts/run-maestro.sh ios ${{ inputs.shard }}
 
-      - name: iOS Maestro Logs
+      - name: Upload Maestro Logs
         if: always()
         uses: actions/upload-artifact@v4
         with:

.maestro/helpers/create-account.yaml

@@ -24,7 +24,7 @@ tags:
 - tapOn:
     id: register-view-confirm-password
 - inputText: ${output.user.password}
-- hideKeyboard
+- runFlow: './hide-keyboard.yaml'
 - scrollUntilVisible:
     element:
       id: register-view-submit

.maestro/helpers/search-room.yaml

@@ -5,6 +5,8 @@ tags:
 ---
 - assertVisible:
     id: 'rooms-list-view'
+- waitForAnimationToEnd:
+    timeout: 5000
 - tapOn:
     id: 'rooms-list-view-search'
 - tapOn:

.maestro/scripts/data-setup.js

@@ -22,7 +22,7 @@ const getDeepLink = (method, server, ...params) => {
 
 
 const login = (username, password) => {
-    const response = http.post(`${data.server}/api/v1/login`, {
+    const response = postWithRetry(`${data.server}/api/v1/login`, {
         headers: {
             'Content-Type': 'application/json'
         },
@@ -44,7 +44,7 @@ const createUser = (customProps) => {
 
     login(output.account.adminUser, output.account.adminPassword);
 
-    http.post(`${data.server}/api/v1/users.create`, {
+    postWithRetry(`${data.server}/api/v1/users.create`, {
         headers: {
             'Content-Type': 'application/json',
             ...headers
@@ -74,19 +74,20 @@ const deleteCreatedUser = async ({ username: usernameToDelete }) => {
     try {
         login(output.account.adminUser, output.account.adminPassword);
 
-        const result = http.get(`${data.server}/api/v1/users.info?username=${usernameToDelete}`, {
+        const result = getWithRetry(`${data.server}/api/v1/users.info?username=${usernameToDelete}`, {
             headers: {
                 'Content-Type': 'application/json',
                 ...headers
             }
         });
 
         const userId = json(result.body)?.data?.user?._id;
-        http.post(`${data.server}/api/v1/users.delete`, { userId, confirmRelinquish: true }, {
+        postWithRetry(`${data.server}/api/v1/users.delete`, {
             headers: {
                 'Content-Type': 'application/json',
                 ...headers
-            }
+            },
+            body: JSON.stringify({ userId, confirmRelinquish: true })
         });
     } catch (error) {
         console.log(JSON.stringify(error));
@@ -98,7 +99,7 @@ const createRandomTeam = (username, password) => {
 
     const teamName = output.randomTeamName();
 
-    http.post(`${data.server}/api/v1/teams.create`, {
+    postWithRetry(`${data.server}/api/v1/teams.create`, {
         headers: {
             'Content-Type': 'application/json',
             ...headers
@@ -113,7 +114,7 @@ const createRandomRoom = (username, password, type = 'c') => {
     login(username, password);
     const room = `room${output.random()}`;
 
-    const response = http.post(`${data.server}/api/v1/${type === 'c' ? 'channels.create' : 'groups.create'}`, {
+    const response = postWithRetry(`${data.server}/api/v1/${type === 'c' ? 'channels.create' : 'groups.create'}`, {
         headers: {
             'Content-Type': 'application/json',
             ...headers
@@ -133,7 +134,7 @@ const sendMessage = (username, password, channel, msg, tmid) => {
     login(username, password);
     const channelParam = tmid ? { roomId: channel } : { channel };
 
-    const response = http.post(`${data.server}/api/v1/chat.postMessage`, {
+    const response = postWithRetry(`${data.server}/api/v1/chat.postMessage`, {
         headers: {
             'Content-Type': 'application/json',
             ...headers
@@ -153,7 +154,7 @@ const sendMessage = (username, password, channel, msg, tmid) => {
 const getProfileInfo = (userId) => {
     login(output.account.adminUser, output.account.adminPassword);
 
-    const result = http.get(`${data.server}/api/v1/users.info?userId=${userId}`, {
+    const result = getWithRetry(`${data.server}/api/v1/users.info?userId=${userId}`, {
         headers: {
             'Content-Type': 'application/json',
             ...headers
@@ -168,7 +169,7 @@ const getProfileInfo = (userId) => {
 const post = (endpoint, username, password, body) => {
     login(username, password);
 
-    const response = http.post(`${data.server}/api/v1/${endpoint}`, {
+    const response = postWithRetry(`${data.server}/api/v1/${endpoint}`, {
         headers: {
             'Content-Type': 'application/json',
             ...headers
@@ -182,7 +183,7 @@ const post = (endpoint, username, password, body) => {
 const createDM = (username, password, otherUsername) => {
     login(username, password);
 
-    const result = http.post(`${data.server}/api/v1/im.create`, {
+    const result = postWithRetry(`${data.server}/api/v1/im.create`, {
         headers: {
             'Content-Type': 'application/json',
             ...headers
@@ -208,6 +209,48 @@ function logAccounts() {
     console.log(JSON.stringify(data.accounts));
 }
 
+const sleep = (ms) => {
+    const start = Date.now();
+    while (Date.now() - start < ms) { }
+}
+
+const retryRequest = (fn, {
+    retries = 3,
+    delay = 1000,
+    factor = 2
+} = {}) => {
+    let lastError;
+    for (let attempt = 1; attempt <= retries; attempt++) {
+        try {
+            const response = fn();
+
+            if (response && response.status >= 200 && response.status < 300) {
+                return response;
+            }
+
+            if (response && response.status >= 400 && response.status < 500) {
+                throw new Error(`Non-retryable error ${response.status}`);
+            }
+
+            lastError = new Error(`HTTP ${response ? response.status : 'unknown'}`);
+        } catch (err) {
+            lastError = err;
+        }
+
+        if (attempt < retries) {
+            const wait = delay * Math.pow(factor, attempt - 1);
+            console.log(`Retry ${attempt}/${retries} after ${wait}ms`);
+            sleep(wait);
+        }
+    }
+
+    throw lastError;
+};
+
+const postWithRetry = (url, options) => retryRequest(() => http.post(url, options));
+
+const getWithRetry = (url, options) => retryRequest(() => http.get(url, options));
+
 output.utils = {
     createUser,
     createUserWithPasswordChange,

.maestro/tests/assorted/broadcast.yaml

@@ -65,7 +65,7 @@ tags:
 - tapOn:
     id: 'create-channel-name'
 - inputText: ${output.room}
-- hideKeyboard
+- runFlow: '../../helpers/hide-keyboard.yaml'
 - assertVisible:
     id: 'create-channel-broadcast'
 - tapOn:

.maestro/tests/assorted/change-avatar.yaml

@@ -173,7 +173,7 @@ tags:
     timeout: 60000
 - tapOn:
     text: 'Fetch image from URL'
-- hideKeyboard
+- runFlow: '../../helpers/hide-keyboard.yaml'
 - extendedWaitUntil:
     visible:
       id: 'change-avatar-view-submit'

.maestro/tests/e2ee/flows/create-e2ee-room.yaml

@@ -44,7 +44,7 @@ tags:
 - tapOn:
     id: 'create-channel-name'
 - inputText: ${ROOM}
-- hideKeyboard
+- runFlow: '../../../helpers/hide-keyboard.yaml'
 - extendedWaitUntil:
     visible:
       id: 'create-channel-encrypted'