refactor integration tests in workflow to use a unified function for running Selenium tests

Author: DjamilaBaroudi

.github/workflows/tests.yml

@@ -83,91 +83,47 @@ jobs:
     - name: Run webview tests
       run: npm run test:webview
 
-    - name: Run basic integration tests
+    - name: Run all integration tests
       run: |
-        echo "Running integration tests..."
-        
-        # Set Chrome-related environment variables and unique user data dir
-        if [ "${{ runner.os }}" = "Linux" ]; then
-          export CHROME_BIN=$(which google-chrome || which chromium-browser || which chromium)
-          export CHROME_USER_DATA_DIR="/tmp/chrome-user-data-$$"
-          echo "Using Chrome at: $CHROME_BIN"
-          echo "Using user data dir: $CHROME_USER_DATA_DIR"
-          xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npm run selenium:run-tests:connections
-          xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npm run selenium:run-tests:ingestr
-        elif [ "${{ runner.os }}" = "macOS" ]; then
-          # Try different Chrome locations on macOS
-          if [ -f "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
-            export CHROME_BIN="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-          elif [ -f "/Applications/Chromium.app/Contents/MacOS/Chromium" ]; then
-            export CHROME_BIN="/Applications/Chromium.app/Contents/MacOS/Chromium"
+        # Function to run selenium tests with proper Chrome setup
+        run_selenium_test() {
+          local test_name="$1"
+          local test_command="$2"
+          local user_data_suffix="$3"
+          
+          echo "Running $test_name..."
+          
+          # Set Chrome-related environment variables and unique user data dir
+          if [ "${{ runner.os }}" = "Linux" ]; then
+            export CHROME_BIN=$(which google-chrome || which chromium-browser || which chromium)
+            export CHROME_USER_DATA_DIR="/tmp/chrome-user-data-$user_data_suffix-$$"
+            echo "Using Chrome at: $CHROME_BIN"
+            echo "Using user data dir: $CHROME_USER_DATA_DIR"
+            xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' $test_command
+          elif [ "${{ runner.os }}" = "macOS" ]; then
+            # Try different Chrome locations on macOS
+            if [ -f "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
+              export CHROME_BIN="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+            elif [ -f "/Applications/Chromium.app/Contents/MacOS/Chromium" ]; then
+              export CHROME_BIN="/Applications/Chromium.app/Contents/MacOS/Chromium"
+            fi
+            export CHROME_USER_DATA_DIR="/tmp/chrome-user-data-$user_data_suffix-$$"
+            echo "Using Chrome at: $CHROME_BIN"
+            echo "Using user data dir: $CHROME_USER_DATA_DIR"
+            $test_command
+          else
+            # Windows - let extension tester handle Chrome detection
+            export CHROME_USER_DATA_DIR="C:\\temp\\chrome-user-data-$user_data_suffix-$$"
+            $test_command
           fi
-          export CHROME_USER_DATA_DIR="/tmp/chrome-user-data-$$"
-          echo "Using Chrome at: $CHROME_BIN"
-          echo "Using user data dir: $CHROME_USER_DATA_DIR"
-          npm run selenium:run-tests:connections
-          npm run selenium:run-tests:ingestr
-        else
-          # Windows - let extension tester handle Chrome detection
-          export CHROME_USER_DATA_DIR="C:\\temp\\chrome-user-data-$$"
-          npm run selenium:run-tests:connections
-          npm run selenium:run-tests:ingestr
-        fi
-      shell: bash
-
-    - name: Run advanced integration tests
-      run: |
-        echo "Running webview integration tests..."
+          echo "$test_name completed"
+        }
         
-        # Set Chrome-related environment variables and unique user data dir
-        if [ "${{ runner.os }}" = "Linux" ]; then
-          export CHROME_BIN=$(which google-chrome || which chromium-browser || which chromium)
-          export CHROME_USER_DATA_DIR="/tmp/chrome-user-data-webview-$$"
-          echo "Using Chrome at: $CHROME_BIN"
-          echo "Using user data dir: $CHROME_USER_DATA_DIR"
-          xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npm run selenium:run-tests:webview
-        elif [ "${{ runner.os }}" = "macOS" ]; then
-          # Try different Chrome locations on macOS
-          if [ -f "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
-            export CHROME_BIN="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-          elif [ -f "/Applications/Chromium.app/Contents/MacOS/Chromium" ]; then
-            export CHROME_BIN="/Applications/Chromium.app/Contents/MacOS/Chromium"
-          fi
-          export CHROME_USER_DATA_DIR="/tmp/chrome-user-data-webview-$$"
-          echo "Using Chrome at: $CHROME_BIN"
-          echo "Using user data dir: $CHROME_USER_DATA_DIR"
-          npm run selenium:run-tests:webview
-        else
-          # Windows - let extension tester handle Chrome detection
-          export CHROME_USER_DATA_DIR="C:\\temp\\chrome-user-data-webview-$$"
-          npm run selenium:run-tests:webview
-        fi
-      shell: bash
-
-    - name: Run lineage integration tests
-      run: |
-        echo "Running lineage integration tests..."
-        # Set Chrome-related environment variables and unique user data dir
-        if [ "${{ runner.os }}" = "Linux" ]; then
-          export CHROME_BIN=$(which google-chrome || which chromium-browser || which chromium)
-          export CHROME_USER_DATA_DIR="/tmp/chrome-user-data-lineage-$$"
-          echo "Using Chrome at: $CHROME_BIN"
-          echo "Using user data dir: $CHROME_USER_DATA_DIR"
-          xvfb-run --auto-servernum --server-args='-screen 0 1920x1080x24' npm run selenium:run-tests:lineage
-        elif [ "${{ runner.os }}" = "macOS" ]; then
-          # Try different Chrome locations on macOS
-          if [ -f "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ]; then
-            export CHROME_BIN="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
-          elif [ -f "/Applications/Chromium.app/Contents/MacOS/Chromium" ]; then
-            export CHROME_BIN="/Applications/Chromium.app/Contents/MacOS/Chromium"
-          fi
-          npm run selenium:run-tests:lineage
-        else
-          # Windows - let extension tester handle Chrome detection
-          export CHROME_USER_DATA_DIR="C:\\temp\\chrome-user-data-lineage-$$"
-          npm run selenium:run-tests:lineage
-        fi
-        echo "Lineage integration tests completed"
+        # Run all integration tests
+        run_selenium_test "connections and ingestr tests" "npm run selenium:run-tests:connections && npm run selenium:run-tests:ingestr" "basic"
+        run_selenium_test "webview tests" "npm run selenium:run-tests:webview" "webview"
+        run_selenium_test "lineage tests" "npm run selenium:run-tests:lineage" "lineage"
+        run_selenium_test "query preview tests" "npm run selenium:run-tests:query-preview" "query-preview"
       shell: bash
 
     - name: Store UI test logs