Merge remote-tracking branch 'upstream/main' into test/firmware-service-tests

Author: JanZachmann

.gitignore

@@ -5,19 +5,16 @@ tools/centrifugo
 *.tar.gz
 *.env
 *.http
-/dist
 .claude/
 .gemini/
 .pnpm-store/
 
+# Build outputs (root level only)
+/dist
+
 # Generated WASM package (rebuild with wasm-pack)
 src/ui/src/core/pkg/
 
 # Research and documentation files (generated, not part of source)
 *.md
 !README.md
-
-# E2E Test Artifacts
-src/ui/playwright-report/
-src/ui/test-results/
-temp/

README.md

@@ -174,16 +174,28 @@ Run `./build-and-deploy-image.sh --help` for all available options.
 ### Testing
 
 ```bash
-# Run backend tests
+# Run all unit tests (backend + core)
 cargo test --features mock
 
-# Run Crux Core tests
-cargo test -p omnect-ui-core
+# Run E2E tests (automated setup - starts Centrifugo + frontend dev server)
+./scripts/run-e2e-tests.sh
 
-# Lint
+# Run E2E tests in Docker container (isolated environment)
+./scripts/test-e2e-in-container.sh
+
+# Lint all code
 cargo clippy --all-targets --features mock
 ```
 
+#### Troubleshooting E2E Tests
+
+If you encounter permission errors when running E2E tests (typically after running Docker-based tests), clean up files created by root:
+
+```bash
+# Clean all E2E test artifacts with permission issues
+sudo rm -rf temp/certs src/ui/dist src/ui/test-results src/ui/playwright-report
+```
+
 ### VSCode Integration
 
 The project includes VSCode launch configurations optimized for development:

scripts/run-e2e-tests.sh

@@ -3,17 +3,32 @@ set -e
 
 # Internal script to run E2E tests inside the container
 
+# Cleanup function to kill spawned processes
+cleanup() {
+    echo "🧹 Cleaning up processes..."
+    [ -n "$FRONTEND_PID" ] && kill $FRONTEND_PID 2>/dev/null || true
+    [ -n "$CENTRIFUGO_PID" ] && kill $CENTRIFUGO_PID 2>/dev/null || true
+}
+trap cleanup EXIT
+
 echo "🔧 Setting up test environment..."
 
-# 0. Ensure bun is installed (needed for UI)
+# 0. Kill any stale Vite/bun processes from previous runs
+echo "🧹 Cleaning up stale processes..."
+pkill -9 -f "vite.*--port 5173" 2>/dev/null || true
+pkill -9 -f "bun run.*5173" 2>/dev/null || true
+pkill -9 -f "node.*vite.*5173" 2>/dev/null || true
+sleep 2
+
+# 1. Ensure bun is installed (needed for UI)
 if ! command -v bun &> /dev/null; then
     echo "⚠️ Bun not found, installing..."
     curl -fsSL https://bun.sh/install | bash
     export BUN_INSTALL="$HOME/.bun"
     export PATH="$BUN_INSTALL/bin:$PATH"
 fi
 
-# 1. Ensure Centrifugo is available (using the tool script if needed)
+# 2. Ensure Centrifugo is available (using the tool script if needed)
 if ! command -v centrifugo &> /dev/null; then
     echo "⚠️ Centrifugo not found in PATH, checking tools directory..."
     if [ ! -f "tools/centrifugo" ]; then
@@ -22,15 +37,24 @@ if ! command -v centrifugo &> /dev/null; then
     export PATH=$PATH:$(pwd)/tools
 fi
 
-# 2. Start Centrifugo directly (Backend is mocked, but we need real WS)
+# 3. Start Centrifugo directly (Backend is mocked, but we need real WS)
 echo "🚀 Starting Centrifugo..."
 # Using the config from backend/config/centrifugo_config.json
 CENTRIFUGO_CONFIG="src/backend/config/centrifugo_config.json"
 
 # Generate self-signed certs for testing if missing
 mkdir -p temp/certs
-if [ ! -f "temp/certs/server.cert.pem" ]; then
+if [ ! -f "temp/certs/server.cert.pem" ] || [ ! -r "temp/certs/server.key.pem" ]; then
+    echo "🔐 Generating self-signed certificates..."
+    # Check if old certs exist with wrong permissions
+    if [ -f "temp/certs/server.cert.pem" ] && [ ! -w "temp/certs/server.cert.pem" ]; then
+        echo "❌ Error: Old certificates exist with wrong permissions (likely created by root)"
+        echo "   Please run: sudo rm -rf temp/certs"
+        exit 1
+    fi
+    rm -f temp/certs/server.cert.pem temp/certs/server.key.pem
     openssl req -newkey rsa:2048 -nodes -keyout temp/certs/server.key.pem -x509 -days 365 -out temp/certs/server.cert.pem -subj "/CN=localhost" 2>/dev/null
+    chmod 644 temp/certs/server.key.pem temp/certs/server.cert.pem
 fi
 
 # Env vars for Centrifugo
@@ -59,28 +83,52 @@ for i in {1..30}; do
     sleep 1
 done
 
-# 3. Serve the Frontend
+# 4. Serve the Frontend
 echo "🌐 Starting Frontend Dev Server..."
 cd src/ui
+
 # Install dependencies if needed (container might not have node_modules)
 if [ ! -d "node_modules" ]; then
     echo "📦 Installing UI dependencies..."
     bun install
 fi
 
-# Start vite dev server in background
-bun run dev --port 5173 > /tmp/vite.log 2>&1 &
+# Check for permission issues with dist directory or its subdirectories
+if [ -d "dist" ]; then
+    if [ ! -w "dist" ] || find dist -type d ! -writable 2>/dev/null | grep -q .; then
+        echo "❌ Error: dist directory has wrong permissions (likely created by root)"
+        echo "   Please run: sudo rm -rf src/ui/dist"
+        kill $CENTRIFUGO_PID || true
+        exit 1
+    fi
+fi
+
+# Build the frontend for preview mode (eliminates Vite dev optimization issues)
+# Note: Using default base path (/) for preview server, not /static for production backend
+echo "🏗️  Building frontend..."
+if bun run build-preview > /tmp/vite-build.log 2>&1; then
+    echo "✅ Frontend build complete!"
+else
+    echo "❌ Frontend build failed!"
+    cat /tmp/vite-build.log
+    kill $CENTRIFUGO_PID || true
+    exit 1
+fi
+
+# Start Vite preview server (serves production build)
+echo "🚀 Starting Vite preview server..."
+bun run preview --port 5173 > /tmp/vite.log 2>&1 &
 FRONTEND_PID=$!
 
-# Wait for Frontend
-echo "⏳ Waiting for Frontend..."
+# Wait for preview server
+echo "⏳ Waiting for preview server..."
 for i in {1..30}; do
     if curl -s http://localhost:5173 > /dev/null; then
-        echo "✅ Frontend is ready!"
+        echo "✅ Preview server is ready!"
         break
     fi
     if [ $i -eq 30 ]; then
-        echo "❌ Frontend failed to start."
+        echo "❌ Preview server failed to start."
         cat /tmp/vite.log
         kill $FRONTEND_PID || true
         kill $CENTRIFUGO_PID || true
@@ -89,8 +137,22 @@ for i in {1..30}; do
     sleep 1
 done
 
-# 4. Run Playwright Tests
+# 5. Run Playwright Tests
 echo "🧪 Running Playwright Tests..."
+
+# Check for permission issues with Playwright test results
+if [ -d "test-results" ] && [ ! -w "test-results" ]; then
+    echo "❌ Error: Playwright test-results directory has wrong permissions (likely created by root)"
+    echo "   Please run: sudo rm -rf src/ui/test-results src/ui/playwright-report"
+    kill $FRONTEND_PID || true
+    kill $CENTRIFUGO_PID || true
+    exit 1
+fi
+
+# Install Playwright browsers (always run to ensure correct version)
+echo "📦 Ensuring Playwright browsers are installed..."
+npx playwright install chromium
+
 # BASE_URL is set for playwright.config.ts
 export BASE_URL="http://localhost:5173"
 

src/app/src/lib.rs

@@ -9,9 +9,6 @@ pub mod update;
 #[cfg(target_arch = "wasm32")]
 pub mod wasm;
 
-#[cfg(test)]
-mod tests;
-
 use crux_core::Command;
 
 // Using deprecated Capabilities API for Http (kept for Effect enum generation)