Merge branch 'develop' into feat.push-avatar-ios

Author: diegolmello

.github/scripts/run-maestro.sh

@@ -5,7 +5,7 @@ PLATFORM="${1:-${PLATFORM:-android}}"
 SHARD="${2:-${SHARD:-default}}"
 FLOWS_DIR=".maestro/tests"
 MAIN_REPORT="maestro-report.xml"
-MAX_RERUN_ROUNDS="${MAX_RERUN_ROUNDS:-2}"
+MAX_RERUN_ROUNDS="${MAX_RERUN_ROUNDS:-3}"
 RERUN_REPORT_PREFIX="maestro-rerun"
 export MAESTRO_DRIVER_STARTUP_TIMEOUT="${MAESTRO_DRIVER_STARTUP_TIMEOUT:-120000}"
 
@@ -51,11 +51,12 @@ echo "Mapped flows for tag test-${SHARD}:"
 awk -F'\t' '{ printf "  %s -> %s\n", $1, $2 }' "$MAPFILE"
 
 FLOW_FILES=()
-declare -A SEEN
+SEEN_PATHS=""
+
 while IFS=$'\t' read -r name path; do
-  if [ -z "${SEEN[$path]:-}" ]; then
+  if ! printf '%s\n' "$SEEN_PATHS" | grep -Fqx "$path"; then
     FLOW_FILES+=("$path")
-    SEEN[$path]=1
+    SEEN_PATHS="${SEEN_PATHS}"$'\n'"$path"
   fi
 done < "$MAPFILE"
 

.github/workflows/maestro-android.yml

@@ -68,4 +68,4 @@ jobs:
         with:
           name: Android Maestro Logs - Shard ${{ inputs.shard }}
           path: ~/.maestro/tests/**/*.png
-          retention-days: 7
+          retention-days: 7

.github/workflows/maestro-ios.yml

@@ -101,4 +101,4 @@ jobs:
         with:
           name: iOS Maestro Logs - Shard ${{ inputs.shard }}
           path: ~/.maestro/tests/**/*.png
-          retention-days: 7
+          retention-days: 7

.maestro/README.md

@@ -39,7 +39,7 @@ Contains the scripts that are going to be executed by the flows before running t
 #### `data.js`
 
 - Contains seeds to common test data, like server url, public channels, etc
-- Currently we point to https://mobile.rocket.chat as main server
+- Currently we point to https://mobile.qa.rocket.chat as main server
   - Pointing to a local server is not recommended yet, as you would need to create a few public channels and change some permissions
   - Ideally we should point to a docker or even a mocked server, but that's tbd
 - Try not to add new data there. Use random values instead.

.maestro/scripts/data.js

@@ -1,5 +1,5 @@
 const data = {
-	server: 'https://mobile.rocket.chat',
+	server: 'https://mobile.qa.rocket.chat',
 	alternateServer: 'https://stable.rocket.chat',
 	...output.account,
     accounts: [],
@@ -15,4 +15,4 @@ const data = {
 	e2eePassword: 'Password1@abcdefghijklmnopqrst'
 };
 
-output.data = data;
+output.data = data;

.maestro/scripts/random.js

@@ -7,12 +7,37 @@ function random(length = 10) {
 	return text;
 }
 
+function generatePassword(length = 10) {
+    const lower = 'abcdefghijklmnopqrstuvwxyz'
+    const upper = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+    const nums = '0123456789'
+    const all = lower + upper + nums
+
+    let password = ''
+    password += lower[Math.floor(Math.random() * lower.length)]
+    password += upper[Math.floor(Math.random() * upper.length)]
+    password += nums[Math.floor(Math.random() * nums.length)]
+
+    while (password.length < length) {
+        const char = all[Math.floor(Math.random() * all.length)]
+        const last = password[password.length - 1]
+        const secondLast = password[password.length - 2]
+        const thirdLast = password[password.length - 3]
+
+        if (char === last && char === secondLast && char === thirdLast) continue
+        password += char
+    }
+
+    return password
+}
+
+
 const randomUser = () => {
     const randomVal = random();
     return {
         username: 'user' + randomVal,
         name: 'user' + randomVal,
-        password: 'Password1@' + randomVal,
+        password: generatePassword(),
         email: 'mobile+' + randomVal + '@rocket.chat'
     };
 }

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

@@ -87,11 +87,11 @@ tags:
 
 - extendedWaitUntil:
     visible:
-      text: '.*@all - all mention.*'
+      text: '@all - all mention'
     timeout: 60000
 - extendedWaitUntil:
     visible:
-      text: '.*@rocket.cat - user mention.*'
+      text: '@rocket.cat - user mention'
     timeout: 60000
 
 # should disable mentions with @ symbol
@@ -126,19 +126,11 @@ tags:
 
 - extendedWaitUntil:
     visible:
-      text: '.*all - all mention.*'
-    timeout: 60000
-- extendedWaitUntil:
-    notVisible:
-      text: '.*@all - all mention.*'
+      text: 'all - all mention'
     timeout: 60000
 - extendedWaitUntil:
     visible:
-      text: '.*rocket.cat - user mention.*'
-    timeout: 60000
-- extendedWaitUntil:
-    notVisible:
-      text: '.*@rocket.cat - user mention.*'
+      text: 'rocket.cat - user mention'
     timeout: 60000
 
 # should enable rooms with # symbol
@@ -173,7 +165,7 @@ tags:
 
 - extendedWaitUntil:
     visible:
-      text: '.*#general - channel mention.*'
+      text: '#general - channel mention'
     timeout: 60000
 
 # should disable mentions with # symbol
@@ -205,12 +197,7 @@ tags:
     file: '../../helpers/search-and-navigate-room.yaml'
     env:
       ROOM: 'maestro-accessibility-test'
-
 - extendedWaitUntil:
     visible:
-      text: '.*general - channel mention.*'
-    timeout: 60000
-- extendedWaitUntil:
-    notVisible:
-      text: '.*#general - channel mention.*'
+      text: 'general - channel mention'
     timeout: 60000

.maestro/tests/assorted/changeserver.yaml

@@ -180,8 +180,20 @@ tags:
     visible:
       text: '.*Delete.*'
     timeout: 60000
-- tapOn:
-    text: 'Delete'
+- runFlow:
+    when:
+      platform: iOS
+    commands:
+      - tapOn:
+          point: 65%,55%
+          retryTapIfNoChange: true
+- runFlow:
+    when:
+      platform: Android
+    commands:
+      - tapOn:
+          text: 'Delete'
+          retryTapIfNoChange: true
 
 # verify alternate server is deleted
 - waitForAnimationToEnd:

.maestro/tests/assorted/delete-server.yaml

@@ -93,8 +93,20 @@ tags:
     visible:
       text: '.*Delete.*'
     timeout: 60000
-- tapOn:
-    text: 'Delete'
+- runFlow:
+    when:
+      platform: iOS
+    commands:
+      - tapOn:
+          point: 65%,55%
+          retryTapIfNoChange: true
+- runFlow:
+    when:
+      platform: Android
+    commands:
+      - tapOn:
+          text: 'Delete'
+          retryTapIfNoChange: true
 - waitForAnimationToEnd:
     timeout: 300
 - extendedWaitUntil:

.maestro/tests/assorted/join-from-directory.yaml

@@ -26,6 +26,8 @@ tags:
     visible:
       id: 'rooms-list-view-directory'
     timeout: 60000
+- waitForAnimationToEnd:
+    timeout: 10000
 - tapOn:
     id: 'rooms-list-view-directory'
 - extendedWaitUntil:
@@ -95,10 +97,10 @@ tags:
     id: 'directory-view-filter'
 - extendedWaitUntil:
     visible:
-      text: 'Users'
+      text: 'Users unselected'
     timeout: 60000
 - tapOn:
-    text: 'Users'
+    text: 'Users unselected'
 - tapOn:
     id: 'directory-view-search'
 - inputText: ${output.otherUser.username}
@@ -143,10 +145,10 @@ tags:
     id: 'directory-view-filter'
 - extendedWaitUntil:
     visible:
-      text: 'Teams'
+      text: 'Teams unselected'
     timeout: 60000
 - tapOn:
-    text: 'Teams'
+    text: 'Teams unselected'
 - tapOn:
     id: 'directory-view-search'
 - inputText: ${output.team}