From 0e82a8baad503bf641e35dba5e205e343a1f5a5a Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Tue, 23 Dec 2025 19:57:26 +0100
Subject: [PATCH] [WIP] Run mosquitto as a service for browser UI tests (#985)

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: thomasnordquist <7721625+thomasnordquist@users.noreply.github.com>
---
 .github/workflows/tests.yml | 13 +++++++++++++
 scripts/runBrowserTests.sh  | 22 +++++++---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 456f075..79a709c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -28,6 +28,16 @@ jobs:
       volumes:
         - ./:/app
       options: --user root
+    services:
+      mosquitto:
+        image: eclipse-mosquitto:2
+        ports:
+          - 1883:1883
+        options: >-
+          --health-cmd "mosquitto_sub -t '$SYS/#' -C 1"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     steps:
       - uses: actions/checkout@v4
         with:
@@ -39,6 +49,9 @@ jobs:
       - name: Run Browser UI Tests
         timeout-minutes: 10
         run: ./scripts/runBrowserTests.sh
+        env:
+          MQTT_BROKER_HOST: mosquitto
+          MQTT_BROKER_PORT: 1883
       - name: Upload Test Screenshots
         if: always()
         uses: actions/upload-artifact@v4
diff --git a/scripts/runBrowserTests.sh b/scripts/runBrowserTests.sh
index d6b0b59..e350eb4 100755
--- a/scripts/runBrowserTests.sh
+++ b/scripts/runBrowserTests.sh
@@ -2,15 +2,15 @@
 # Browser Mode Test Runner
 # 
 # This script runs UI tests against the browser mode server (instead of Electron).
-# It starts a local mosquitto MQTT broker and the MQTT Explorer server, then runs
-# the test suite using Playwright with a headless Chrome browser.
+# It expects a mosquitto MQTT broker to be running (via service or manually started).
+# The broker address is configured via environment variables.
 #
 # Environment Variables:
 #   MQTT_EXPLORER_USERNAME - Username for browser authentication (default: test)
 #   MQTT_EXPLORER_PASSWORD - Password for browser authentication (default: test123)
 #   PORT - Server port (default: 3000)
 #   BROWSER_MODE_URL - URL for browser tests (set automatically)
-#   MQTT_BROKER_HOST - MQTT broker host for tests (default: 127.0.0.1)
+#   MQTT_BROKER_HOST - MQTT broker host for tests (required, default: 127.0.0.1)
 #   MQTT_BROKER_PORT - MQTT broker port for tests (default: 1883)
 #
 set -e
@@ -19,11 +19,6 @@ function finish {
   set +e
   echo "Exiting, cleaning up.."
 
-  if [[ ! -z "$PID_MOSQUITTO" ]]; then
-    echo "Stopping mosquitto ($PID_MOSQUITTO).."
-    kill "$PID_MOSQUITTO" || echo "Already stopped"
-  fi
-
   if [[ ! -z "$PID_SERVER" ]]; then
     echo "Stopping server ($PID_SERVER).."
     kill "$PID_SERVER" || echo "Already stopped"
@@ -32,11 +27,6 @@ function finish {
 
 trap finish EXIT
 
-# Start mqtt broker
-mosquitto &
-export PID_MOSQUITTO=$!
-sleep 1
-
 # Set credentials for browser authentication (tests will use these to login)
 export MQTT_EXPLORER_USERNAME=${MQTT_EXPLORER_USERNAME:-test}
 export MQTT_EXPLORER_PASSWORD=${MQTT_EXPLORER_PASSWORD:-test123}
@@ -62,8 +52,10 @@ done
 
 # Run browser tests
 export BROWSER_MODE_URL="http://localhost:${PORT}"
-export MQTT_BROKER_HOST="127.0.0.1"
-export MQTT_BROKER_PORT="1883"
+export MQTT_BROKER_HOST="${MQTT_BROKER_HOST:-127.0.0.1}"
+export MQTT_BROKER_PORT="${MQTT_BROKER_PORT:-1883}"
+
+echo "Using MQTT broker at $MQTT_BROKER_HOST:$MQTT_BROKER_PORT"
 
 yarn test:browser
 TEST_EXIT_CODE=$?