[BHP1-1454] Update and Add Cucumber Tests

.dir-locals.el

@@ -11,3 +11,5 @@
 ;; ((nil . ((cider-clojure-cli-aliases . "-A:dev:behave/vms")
 ;;          (cider-default-cljs-repl . figwheel-main)
 ;;          (cider-figwheel-main-default-options . "vms"))))
+
+

.github/workflows/cljs-tests.yml

@@ -0,0 +1,50 @@
+name: CLJS tests
+
+on:
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  cljs-tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+
+      - uses: DeLaGuardo/setup-clojure@13.0
+        with:
+          cli: latest
+          bb: latest
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gitlibs
+          key: cljdeps-${{ hashFiles('deps.edn', 'projects/behave/deps.edn') }}
+          restore-keys: cljdeps-
+
+      - uses: browser-actions/setup-chrome@v1
+        id: chrome
+        with:
+          chrome-version: stable
+
+      # Prefetch deps so the test step is compile + run only.
+      - name: Prefetch deps
+        working-directory: projects/behave
+        run: clojure -P -M:test-ci
+
+      # Compiles the test build, launches headless Chrome via figwheel, runs
+      # the suite (behave.headless-test-runner), and exits pass/fail.
+      - name: Run CLJS test suite (headless Chrome)
+        working-directory: projects/behave
+        env:
+          CHROME_BIN: ${{ steps.chrome.outputs.chrome-path }}
+        run: bb test:ci

.github/workflows/cucumber-pr.yml

@@ -0,0 +1,20 @@
+name: cucumber (on PR core only)
+
+# Runs the core cucumber suite automatically on every PR to main. The full/all scope
+# stays on the manual push-button workflow (cucumber.yml).
+on:
+  pull_request:
+    branches:
+      - main
+
+# Cancel a still-running core run when the PR gets a new commit.
+concurrency:
+  group: cucumber-pr-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  core:
+    uses: ./.github/workflows/cucumber-run.yml
+    with:
+      scope: core
+      timeout_minutes: 120  # core-only is far smaller than the 360 push-button cap; tune as needed

.github/workflows/cucumber-run.yml

@@ -0,0 +1,100 @@
+name: cucumber (base)
+
+# Reusable job shared by the push-button (cucumber.yml) and the PR (cucumber-pr.yml)
+# workflows. Single source of truth for the cucumber CI steps.
+on:
+  workflow_call:
+    inputs:
+      scope:
+        description: 'Which scenarios to run: core (@core, excluding @extended) or all (@core + @extended)'
+        type: string
+        default: core
+      features_dir:
+        description: 'Features dir (narrow to a subset, e.g. features/results-page)'
+        type: string
+        default: features
+      serve_timeout:
+        description: 'Seconds to wait for the app to become reachable'
+        type: string
+        default: '300'
+      shards:
+        description: 'Number of parallel shards (each = 1 Chrome + 1 app server; bump cautiously on RAM)'
+        type: string
+        default: '2'
+      timeout_minutes:
+        description: 'Job timeout in minutes (GitHub-hosted runner max is 360 / 6h)'
+        type: number
+        default: 360
+
+jobs:
+  cucumber:
+    runs-on: ubuntu-latest
+    timeout-minutes: ${{ inputs.timeout_minutes }}
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+
+      - uses: DeLaGuardo/setup-clojure@13.0
+        with:
+          cli: latest        # clojure CLI
+          bb: latest         # babashka
+
+      - uses: actions/cache@v4
+        with:
+          path: |
+            ~/.m2/repository
+            ~/.gitlibs
+          key: cljdeps-${{ hashFiles('deps.edn', 'projects/behave/deps.edn') }}
+          restore-keys: cljdeps-
+
+      # Install Chrome only. We deliberately do NOT install/pin chromedriver here — setup-chrome's
+      # "stable" chromedriver can drift a major version ahead of the browser (SessionNotCreated).
+      # Selenium Manager (bundled in Selenium 4.23) downloads the matching driver at runtime.
+      - uses: browser-actions/setup-chrome@v1
+        id: chrome
+        with:
+          chrome-version: stable
+
+      # Prefetch deps so the run is compile-only (all three classpaths the sharded run uses:
+      # driver, per-shard server, and the advanced CLJS compile).
+      - name: Prefetch deps
+        run: |
+          clojure -P -M:dev:behave/cms
+          clojure -P -M:dev:behave/app
+          (cd projects/behave && clojure -P -M:compile-cljs)
+
+      # Compiles the advanced CLJS build once, starts N isolated app servers (own port + DB
+      # each), splits features across them, runs N headless Chrome drivers in parallel, then
+      # merges + tears everything down. Non-zero exit fails the job. Inputs are read via env
+      # to avoid ${{ }} script injection.
+      - name: Run cucumber suite (sharded, headless, fresh DBs)
+        env:
+          # No CHROMEDRIVER_PATH — Selenium Manager auto-resolves a driver matching CHROME_BIN.
+          CHROME_BIN: ${{ steps.chrome.outputs.chrome-path }}
+          SCOPE: ${{ inputs.scope }}
+          FEATURES_DIR: ${{ inputs.features_dir }}
+          SERVE_TIMEOUT: ${{ inputs.serve_timeout }}
+          SHARDS: ${{ inputs.shards }}
+        run: |
+          case "$SCOPE" in
+            all) QUERY='(or "core" "extended")' ;;
+            *)   QUERY='(and "core" (not "extended"))' ;;
+          esac
+          bb cucumber:ci \
+            --headless \
+            --shards "$SHARDS" \
+            --query "$QUERY" \
+            --features-dir "$FEATURES_DIR" \
+            --serve-timeout "$SERVE_TIMEOUT"
+
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: cucumber-results
+          path: |
+            logs/cucumber/**
+          if-no-files-found: ignore

.github/workflows/cucumber.yml

@@ -1,69 +1,33 @@
-name: cucumber
+name: cucumber (manual dispatch)
 
 on:
-  pull_request:
-  push:
-    branches: [main]
   workflow_dispatch:
+    inputs:
+      scope:
+        description: 'Which scenarios to run'
+        type: choice
+        default: core
+        options:
+          - core   # @core, excluding @extended
+          - all    # @core + @extended
+      features_dir:
+        description: 'Features dir (narrow to a subset, e.g. features/results-page)'
+        type: string
+        default: features
+      serve_timeout:
+        description: 'Seconds to wait for the app to become reachable'
+        type: string
+        default: '300'
+      shards:
+        description: 'Number of parallel shards (each = 1 Chrome + 1 app server; bump cautiously on RAM)'
+        type: string
+        default: '2'
 
 jobs:
-  cucumber-core:
-    runs-on: ubuntu-latest
-    timeout-minutes: 45
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: '21'
-
-      - uses: DeLaGuardo/setup-clojure@13.0
-        with:
-          cli: latest        # clojure CLI
-          bb: latest         # babashka
-
-      - uses: actions/cache@v4
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gitlibs
-          key: cljdeps-${{ hashFiles('deps.edn', 'projects/behave/deps.edn') }}
-          restore-keys: cljdeps-
-
-      # Matched Chrome + chromedriver (avoids Selenium SessionNotCreated version drift).
-      - uses: browser-actions/setup-chrome@v1
-        id: chrome
-        with:
-          chrome-version: stable
-          install-chromedriver: true
-
-      # Prefetch deps so the readiness window is compile-only (both classpaths the run uses).
-      - name: Prefetch deps
-        run: |
-          clojure -P -M:dev:behave/cms
-          (cd projects/behave && clojure -P -M:figwheel-lib)
-
-      # Starts the app (figwheel serve + init-config!/init-db!), runs the @core suite
-      # headless against a freshly-created empty DB (connect! creates it; VMS comes from
-      # the tracked layout.msgpack), then tears the app down. Non-zero exit fails the job.
-      - name: Run @core cucumber suite (headless, fresh DB)
-        env:
-          CHROME_BIN: ${{ steps.chrome.outputs.chrome-path }}
-          CHROMEDRIVER_PATH: ${{ steps.chrome.outputs.chromedriver-path }}
-        run: |
-          bb cucumber:ci \
-            --query '(and "core" (not "extended"))' \
-            --db-path ci-db.sqlite \
-            --serve-timeout 300
-
-      - uses: actions/upload-artifact@v4
-        if: always()
-        with:
-          name: cucumber-results
-          path: |
-            cucumber_test_results_*.org
-            cucumber_results_*.edn
-            cucumber_figwheel.log
-            cucumber_run.log
-          if-no-files-found: ignore
+  cucumber:
+    uses: ./.github/workflows/cucumber-run.yml
+    with:
+      scope: ${{ inputs.scope }}
+      features_dir: ${{ inputs.features_dir }}
+      serve_timeout: ${{ inputs.serve_timeout }}
+      shards: ${{ inputs.shards }}

.gitignore

@@ -232,3 +232,8 @@ projects/behave/resources/public/cljs-test/
 projects/behave/resources/public/js/behave.js
 projects/behave/projects/
 projects/behave/resources/db.sqlite
+
+# Cucumber test run artifacts (logs already covered by *.log above)
+cucumber_results_*.edn
+cucumber_test_results*.org
+ci-db.sqlite

bb.edn

@@ -32,6 +32,13 @@
                 (shell "find projects/behave/resources/public/help/images -type f ( -iname \"*.jpg\" -o -iname \"*.jpeg\" -o -iname \"*.png\" ) -exec sh -c 'for file do convert \"$file\" \"${file%.*}.webp\" && echo \"Converted $file to ${file%.*}.webp\"; done' sh {} +")
                 (shell "find projects/behave/resources/public/help/images -type f ( -iname \"*.jpg\" -o -iname \"*.jpeg\" -o -iname \"*.png\" ) -exec rm {} +"))
 
+  ;;; Cucumber
+  cucumber    {:doc  "Run the cucumber suite (app must already be running). Opts forwarded to scripts/run_cucumber_tests.clj: --headless --query --features-dir --steps-dir --retry-failed --stop --url --help"
+               :task (System/exit (:exit (apply shell {:continue true} "bb" "scripts/run_cucumber_tests.clj" *command-line-args*)))}
+
+  cucumber:ci {:doc  "Cucumber run: compile the advanced CLJS build once, start isolated app server(s) (own port + DB each), run Chrome driver(s), then merge + tear down. DEFAULT is a visible browser: 1 shard, browser + server stay open until Ctrl-C. Pass --headless for the headless CI path: parallel sharding (default 2) and auto-close. Requires chromedriver on PATH. Opts: --headless (headless + parallel shards, auto-close), --shards N (default 2 with --headless; 1 in visible mode unless set), --feature F, --query, --features-dir, --serve-timeout, --db-prefix, --base-port, --skip-compile, --stop (halt at first failure; forces 1 shard unless --shards given)."
+               :task (System/exit (:exit (apply shell {:continue true} "bb" "scripts/cucumber_ci.clj" *command-line-args*)))}
+
   ;;; Datomic
   -today      (str (java.time.LocalDate/now))
 

behave-lib/Makefile

@@ -15,7 +15,7 @@ all: clean install
 
 # NOTE Make sure to set WEBIDL in Enviornment Variables
 bind:
-	${WEBIDL} include/idl/behave.idl include/js/glue
+	python ${WEBIDL} include/idl/behave.idl include/js/glue
 	mv include/js/glue.cpp include/cpp/emscripten/glue.cpp
 
 compile: clean bind