chore: address flaky tests

Author: YogendraShelke

.github/scripts/determine-widget-scope.sh

@@ -19,11 +19,13 @@ all_widgets=$(echo "$widget_dirs" | jq -R -s -c 'split("\n") | map(select(length
 all_widgets_and_js=$(echo "$widget_dirs" | jq -R -s -c 'split("\n") | map(select(length > 0)) + ["mobile-resources-native", "nanoflow-actions-native"]')
 
 # Convert a space-separated list of widget names into a JSON array (or [] when empty).
+# Deduplicates entries as a safety measure.
 to_json_array() {
   if [[ -z "$1" ]]; then
     echo "[]"
   else
-    echo "[\"$(echo "$1" | sed 's/ /","/g')\"]"
+    # Sort and deduplicate, then convert to JSON array
+    echo "$1" | tr ' ' '\n' | sort -u | jq -R -s -c 'split("\n") | map(select(length > 0))'
   fi
 }
 
@@ -54,15 +56,16 @@ if [ "$event_name" == "pull_request" ]; then
     if [[ $file == packages/pluggableWidgets/* ]]; then
       widget=$(echo $file | cut -d'/' -f3)
       subdir=$(echo $file | cut -d'/' -f4)
-      if [[ ! $selected_workspaces =~ $widget ]]; then
+      # Use word boundary check to prevent both duplicates and substring false matches
+      if [[ ! " $selected_workspaces " =~ " $widget " ]]; then
         selected_workspaces="$selected_workspaces $widget"
       fi
       # A change confined to the widget's e2e/ folder (Maestro flows + screenshots) changes
       # only the TEST, not the built artifact — so it should NOT trigger a rebuild. The widget
       # still goes into selected_workspaces above (it gets TESTED), but it's kept out of the
       # BUILD scope; its .mpk comes from the test project's committed baseline, exactly like
       # every other not-rebuilt widget in a partial run.
-      if [[ "$subdir" != "e2e" ]] && [[ ! $build_workspaces =~ $widget ]]; then
+      if [[ "$subdir" != "e2e" ]] && [[ ! " $build_workspaces " =~ " $widget " ]]; then
         build_workspaces="$build_workspaces $widget"
       fi
     elif [[ $file == packages/jsActions/mobile-resources-native/* ]] || [[ $file == packages/jsActions/nanoflow-actions-native/* ]]; then

maestro/Smoke.yaml

@@ -2,13 +2,14 @@ appId: "${APP_ID}"
 ---
 # Fast-fail smoke check (S6). Run ONCE per shard before any widget flows: if the app can't
 # launch and render the "Widgets menu", the build/bundle is fundamentally broken and every
-# flow would fail the same way. Bail in ~1.5 min instead of grinding 8-9 flows × retries up
-# to the job timeout. Short timeout + NO retry block on purpose — this is the cheap probe.
+# flow would fail the same way. Bail in ~2 min instead of grinding 8-9 flows × retries up
+# to the job timeout. Timeout was 60s but gallery-native on Android needs extra time for
+# initial asset loading. 90s gives room while still being a fast-fail probe.
 - launchApp:
     clearState: true
     permissions:
       camera: allow
       notifications: allow
 - extendedWaitUntil:
     visible: "Widgets menu"
-    timeout: 60000
+    timeout: 90000

maestro/helpers/helpers.sh

@@ -136,6 +136,28 @@ ensure_emulator_ready() {
     done
 }
 
+# Function to verify Mendix runtime is responding (Android only - uses adb reverse)
+verify_runtime_ready() {
+    if [ "$PLATFORM" != "android" ]; then
+        return 0  # iOS doesn't need this check - runtime is on localhost
+    fi
+    local max_attempts=10
+    local attempt=1
+    echo "Verifying Mendix runtime connectivity..."
+    while [ "$attempt" -le "$max_attempts" ]; do
+        # Use adb to check if localhost:8080 is reachable from the emulator's perspective
+        if adb shell "curl -s -o /dev/null -w '%{http_code}' http://localhost:8080/" 2>/dev/null | grep -q "200\|302"; then
+            echo "✅ Runtime is reachable from emulator (attempt $attempt)"
+            return 0
+        fi
+        echo "Runtime not ready yet (attempt $attempt/$max_attempts), waiting..."
+        sleep 3
+        attempt=$((attempt + 1))
+    done
+    echo "⚠️  Runtime verification timed out - proceeding anyway (app will handle connection errors)"
+    return 0  # Don't fail hard - let the app/smoke check handle it
+}
+
 # Function to run tests
 run_tests() {
   local test_files=("$@")
@@ -178,6 +200,7 @@ smoke_check() {
     if [ "$PLATFORM" == "android" ]; then
       ensure_emulator_ready
       set_status_bar
+      verify_runtime_ready  # Ensure runtime is reachable before launching app
     fi
     start_recording "smoke-attempt-$attempt"
     if $HOME/.local/bin/maestro/bin/maestro test --env APP_ID=$APP_ID --env PLATFORM=$PLATFORM --env MAESTRO_DRIVER_STARTUP_TIMEOUT=$MAESTRO_DRIVER_STARTUP_TIMEOUT "$script_dir/Smoke.yaml"; then

packages/pluggableWidgets/bottom-sheet-native/e2e/specs/maestro/Botton_sheet_expanding_fullscreen.yaml

@@ -8,11 +8,11 @@ appId: "${APP_ID}"
     text: "Bottom Sheet"
 - tapOn:
     text: "Expanding fullscreen"
-# Because the image loading can take some time due to resources on emulator, we need to wait for the image to be visible
-- extendedWaitUntil: 
+# Because the image loading and animation can take some time due to resources on emulator, we need to wait
+- extendedWaitUntil:
      visible: randText  # Any random text that does not exist in the UI
      optional: true  # This should be true so that the test won't fail
-     timeout: 10000 # 10 seconds
+     timeout: 15000 # 15 seconds to allow for animation to complete
 - takeScreenshot:
     path: "maestro/images/actual/${PLATFORM}/bottom_sheet_expanding_fullscreen"
 - assertScreenshot:

packages/pluggableWidgets/bottom-sheet-native/e2e/specs/maestro/Modal_basic_non_native.yaml

@@ -8,6 +8,10 @@ appId: "${APP_ID}"
     text: "Bottom Sheet"
 - tapOn:
     text: "Modal basic non native"
+# Wait for the page to fully load before tapping Open
+- extendedWaitUntil:
+    visible: "Open"
+    timeout: 10000
 - tapOn:
     text: "Open"
 

packages/pluggableWidgets/intro-screen-native/e2e/specs/maestro/IntroScreen.yaml

@@ -47,6 +47,13 @@ appId: "${APP_ID}"
     timeout: 5000
 - tapOn:
     text: "NEXT"
+# Wait for slide transition to complete and FINISH button to appear
+- extendedWaitUntil:
+    visible: "Active slide: 3"
+    timeout: 5000
+- extendedWaitUntil:
+    visible: "FINISH"
+    timeout: 5000
 - tapOn:
     text: "FINISH"
 - extendedWaitUntil: