From 4e6e935acb2fd9619d780c51cdb3486b19000bb7 Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Fri, 13 Mar 2026 07:22:44 -0400
Subject: [PATCH] Fix CI: update e2e script for host/ output, remove stale
 Node.js deps

- e2e.yml: remove qrencode, imagemagick, jq, nodejs, npm (no longer needed)
- test-e2e.sh: check host/<subdomain>/ instead of dist/, fix onionshare-cli
  flags (remove --use-running-tor, add -v), run pytest unit tests
- ci.yml: install package with pip install -e . instead of listing deps manually
---
 .github/workflows/ci.yml  |  5 ++--
 .github/workflows/e2e.yml |  3 +--
 ci/test-e2e.sh            | 52 +++++++++++++++++++++++++--------------
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 64c94d8..4482194 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,8 +16,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install flake8 pytest InquirerPy rich
+          pip install flake8 pytest
+          pip install -e .
       - name: Lint
         run: flake8 voxvera tests
       - name: Test
-        run: pytest
+        run: pytest tests/test_cli.py -v
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index a5a2f4a..8d99e3d 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -15,8 +15,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y qrencode imagemagick jq python3-pip nodejs npm
-          npm install -g javascript-obfuscator html-minifier-terser
+          sudo apt-get install -y python3-pip
       - name: Run end-to-end tests
         run: ci/test-e2e.sh
       - name: Upload logs
diff --git a/ci/test-e2e.sh b/ci/test-e2e.sh
index 87fa433..2ea5ecb 100755
--- a/ci/test-e2e.sh
+++ b/ci/test-e2e.sh
@@ -20,7 +20,20 @@ DemoUser
 demosite
 EOI
 "$voxvera_cmd" build
-ls -R dist >>"$LOG_DIR/tree.txt"
+
+# Verify build output exists in host/
+subdomain=$(python3 -c "import json; print(json.load(open('voxvera/src/config.json'))['subdomain'])")
+host_dir="voxvera/host/$subdomain"
+ls -R "$host_dir" >>"$LOG_DIR/tree.txt"
+
+# Verify essential files
+for f in index.html config.json nostr.html; do
+  [ -f "$host_dir/$f" ] || { echo "Missing $f in $host_dir" >&2; exit 1; }
+done
+echo "Build output verified in $host_dir"
+
+# Run pytest unit tests
+python3 -m pytest tests/test_cli.py -v 2>&1 | tee "$LOG_DIR/pytest.log"
 
 # Optional network tests
 if [ "${VOXVERA_E2E_OFFLINE:-}" != "1" ]; then
@@ -31,37 +44,38 @@ if [ "${VOXVERA_E2E_OFFLINE:-}" != "1" ]; then
 
   # Start OnionShare
   onionshare-cli --website --public \
-    --persistent ci/.onionshare-session \
-    dist/demosite >"$LOG_DIR/onionshare.log" 2>&1 &
+    --persistent "$host_dir/.onionshare-session" \
+    -v \
+    "$host_dir" >"$LOG_DIR/onionshare.log" 2>&1 &
   OS_PID=$!
 
-# Wait for URL
-URL=""
-i=0
-while [ $i -lt 90 ]; do
+  # Wait for URL
+  URL=""
+  i=0
+  while [ $i -lt 90 ]; do
     if grep -Eo 'http[^ ]+\.onion' "$LOG_DIR/onionshare.log" | head -n1 >"$LOG_DIR/url.txt"; then
-        URL=$(cat "$LOG_DIR/url.txt")
-        [ -n "$URL" ] && break
+      URL=$(cat "$LOG_DIR/url.txt")
+      [ -n "$URL" ] && break
     fi
     i=$((i + 1))
     sleep 1
-done
-if [ -z "$URL" ]; then
+  done
+  if [ -z "$URL" ]; then
     echo "Onion URL not found" >&2
     kill $OS_PID || true
     kill $TOR_PID || true
     exit 1
-fi
+  fi
 
-# Verify URL in config
-grep -q "$URL" dist/demosite/config.json
+  # Verify URL in config
+  grep -q "$URL" "$host_dir/config.json"
 
-# Fetch page via Tor
-curl --socks5-hostname 127.0.0.1:9050 "$URL" | grep -q '<title>'
+  # Fetch page via Tor
+  curl --socks5-hostname 127.0.0.1:9050 "$URL" | grep -q '<title>'
 
-# Clean up
-kill $OS_PID
-kill $TOR_PID
+  # Clean up
+  kill $OS_PID
+  kill $TOR_PID
   wait $OS_PID 2>/dev/null || true
   wait $TOR_PID 2>/dev/null || true
 else