e7a2f0387b
Backend simplification:
- The server now loads ONE pool JSON from $QUIZ_POOL_PATH at startup and
upserts a single canonical session. The session id comes from the pool
JSON's optional "session_id" field, falling back to $QUIZ_SESSION_ID.
- The multi-quiz / multi-session CRUD API is gone:
DELETED GET/POST /admin/api/quizzes
DELETED POST /admin/api/quizzes/upload
DELETED GET/POST /admin/api/sessions
DELETED GET /admin/login (HTML stub)
DELETED GET /admin/api/sessions/{sid}/csv (replaced by /admin/api/csv)
Replaced with a single-session control surface:
GET /admin/ — serves admin.html unconditionally
GET /admin/api/state — admin-gated; pool meta + state + QR + join URL
POST /admin/api/reset — admin-gated; wipe submissions + back to lobby
POST /admin/logout — clear admin cookie
GET /admin/api/csv — single-session results
WS /ws/instructor/{sid} — kept; new commands "next" + "reset"
- Instructor "Next" button is now a single state-driving command
(RoomManager.advance_to_next): from lobby it opens Q0; from question_open
it closes the current Q and opens the next; from question_closed it
opens the next; if past the last question it ends the session.
- New RoomManager.reset wipes submissions, participants, and per-question
state, then broadcasts a clean lobby.
- Student GET / now redirects to /?sid=<canonical> when no sid is given,
so the QR / share URL is fully deterministic.
Frontend rewrite (functional baseline; visual polish to follow):
- /admin/ is now a single SPA: GET /admin/api/state decides login form
vs dashboard. No separate /admin/login URL bar.
- Admin dashboard is state-driven with one primary action per state.
QR code, join URL, and live participant list are always visible on the
left so the operator can leave the page on a projector.
- Student answer buttons are big and tappable; reveal screen highlights
correct/wrong choice + shows score, total, and rank.
- Static admin/student SPAs share a CSS palette with light/dark support.
Tests rewritten around the single canonical session id.
The auto-bootstrapped session lets each test fixture skip the old
quiz/session creation dance. 39/39 tests pass.
Cleanup:
- Deleted CODEX_PROMPT.md, IMPLEMENTATION_REPORT.md, NOTES.md, SPEC.md,
static/observer.html (obsolete codex-build artifacts and the unused
observer view).
- .gitignore now blocks /pool.json (the runtime file the operator drops
on the server) and the leftover .codex_done / codex_run.log / etc.
- bootstrap.sh seeds /opt/quiz/pool.json from examples/pool_example.json
on first deploy so a fresh box reaches a usable state without manual
intervention; .env now includes QUIZ_POOL_PATH.
78 lines
3.6 KiB
Python
78 lines
3.6 KiB
Python
import pytest
|
|
from starlette.websockets import WebSocketDisconnect
|
|
|
|
from conftest import admin_login, join_student
|
|
|
|
|
|
def test_instructor_ws_requires_admin_cookie(client, sid):
|
|
with pytest.raises(WebSocketDisconnect) as exc:
|
|
with client.websocket_connect(f"/ws/instructor/{sid}"):
|
|
pass
|
|
assert exc.value.code == 4001
|
|
|
|
|
|
def test_instructor_next_command_drives_full_loop(client, sid):
|
|
"""The 'next' WS message drives the entire lifecycle:
|
|
lobby → opens Q0 → closes Q0 + opens Q1 → ... → closes last + ends."""
|
|
join_student(client, sid, "s1", "Student One")
|
|
admin_login(client)
|
|
with client.websocket_connect(f"/ws/student/{sid}") as student_ws:
|
|
assert student_ws.receive_json()["type"] == "state"
|
|
with client.websocket_connect(f"/ws/instructor/{sid}") as admin_ws:
|
|
# Drain lobby snapshot.
|
|
assert admin_ws.receive_json()["type"] == "state"
|
|
assert admin_ws.receive_json()["type"] == "lobby_update"
|
|
|
|
# First "next" opens Q0 from lobby.
|
|
admin_ws.send_json({"type": "next"})
|
|
assert student_ws.receive_json()["type"] == "question_open"
|
|
admin_open = admin_ws.receive_json()
|
|
assert admin_open["type"] == "question_open"
|
|
assert admin_ws.receive_json()["type"] == "live_histogram"
|
|
|
|
# Second "next" closes Q0 and opens Q1.
|
|
admin_ws.send_json({"type": "next"})
|
|
student_msgs = [student_ws.receive_json() for _ in range(2)]
|
|
assert {m["type"] for m in student_msgs} == {"question_closed", "question_open"}
|
|
|
|
|
|
def test_instructor_close_then_next_emits_clean_open(client, sid):
|
|
join_student(client, sid, "s1", "Student One")
|
|
admin_login(client)
|
|
with client.websocket_connect(f"/ws/student/{sid}") as student_ws:
|
|
assert student_ws.receive_json()["type"] == "state"
|
|
with client.websocket_connect(f"/ws/instructor/{sid}") as admin_ws:
|
|
assert admin_ws.receive_json()["type"] == "state"
|
|
assert admin_ws.receive_json()["type"] == "lobby_update"
|
|
admin_ws.send_json({"type": "open_question", "question_idx": 0, "time_limit": 2})
|
|
assert student_ws.receive_json()["type"] == "question_open"
|
|
assert admin_ws.receive_json()["type"] == "question_open"
|
|
assert admin_ws.receive_json()["type"] == "live_histogram"
|
|
|
|
admin_ws.send_json({"type": "close_question"})
|
|
assert student_ws.receive_json()["type"] == "question_closed"
|
|
admin_msgs = [admin_ws.receive_json(), admin_ws.receive_json()]
|
|
assert {m["type"] for m in admin_msgs} == {"question_closed", "full_leaderboard"}
|
|
|
|
admin_ws.send_json({"type": "next"})
|
|
assert student_ws.receive_json()["type"] == "question_open"
|
|
|
|
|
|
def test_reset_command_returns_session_to_lobby(client, sid):
|
|
join_student(client, sid, "s1", "Student One")
|
|
admin_login(client)
|
|
with client.websocket_connect(f"/ws/instructor/{sid}") as admin_ws:
|
|
assert admin_ws.receive_json()["type"] == "state"
|
|
assert admin_ws.receive_json()["type"] == "lobby_update"
|
|
admin_ws.send_json({"type": "open_question", "question_idx": 0, "time_limit": 2})
|
|
assert admin_ws.receive_json()["type"] == "question_open"
|
|
assert admin_ws.receive_json()["type"] == "live_histogram"
|
|
|
|
admin_ws.send_json({"type": "reset"})
|
|
# After reset, the instructor receives a state=lobby snapshot + lobby_update.
|
|
msgs = []
|
|
while len(msgs) < 2:
|
|
msgs.append(admin_ws.receive_json())
|
|
types = [m["type"] for m in msgs]
|
|
assert "state" in types
|