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.
82 lines
3.4 KiB
Python
82 lines
3.4 KiB
Python
from conftest import join_student
|
|
|
|
|
|
def test_full_lifecycle_via_advance_and_close(client, sid):
|
|
"""End-to-end: 3 students, instructor drives via advance_to_next which
|
|
closes the open question and opens the next in a single step."""
|
|
rooms = client.app.state.rooms
|
|
sockets = []
|
|
try:
|
|
for idx in range(3):
|
|
join_student(client, sid, f"s{idx}", f"Student {idx}")
|
|
ws = client.websocket_connect(f"/ws/student/{sid}").__enter__()
|
|
sockets.append(ws)
|
|
assert ws.receive_json()["state"] == "lobby"
|
|
|
|
# Start: opens Q0.
|
|
client.portal.call(rooms.advance_to_next, sid)
|
|
for ws in sockets:
|
|
assert ws.receive_json()["type"] == "question_open"
|
|
for idx, ws in enumerate(sockets):
|
|
ws.send_json({"type": "submit", "question_idx": 0, "answer": "B" if idx < 2 else "A"})
|
|
assert ws.receive_json()["type"] == "submit_ack"
|
|
|
|
# Advance: closes Q0 and opens Q1 in one step.
|
|
client.portal.call(rooms.advance_to_next, sid)
|
|
for ws in sockets:
|
|
assert ws.receive_json()["type"] == "question_closed"
|
|
assert ws.receive_json()["type"] == "question_open"
|
|
assert client.portal.call(rooms.get_session, sid)["state"] == "question_open"
|
|
assert client.portal.call(rooms.get_session, sid)["current_question_idx"] == 1
|
|
|
|
# End the session early.
|
|
client.portal.call(rooms.end_session, sid)
|
|
for ws in sockets:
|
|
first = ws.receive_json()
|
|
# end_session closes the open question, then sends session_ended.
|
|
if first["type"] == "question_closed":
|
|
assert ws.receive_json()["type"] == "session_ended"
|
|
else:
|
|
assert first["type"] == "session_ended"
|
|
assert client.portal.call(rooms.get_session, sid)["state"] == "finished"
|
|
finally:
|
|
for ws in sockets:
|
|
ws.__exit__(None, None, None)
|
|
|
|
|
|
def test_explicit_close_then_advance_skips_redundant_close(client, sid):
|
|
"""If the instructor closes manually first, the next advance just opens
|
|
the following question (no double-close broadcast)."""
|
|
rooms = client.app.state.rooms
|
|
join_student(client, sid, "s1", "Solo")
|
|
with client.websocket_connect(f"/ws/student/{sid}") as ws:
|
|
assert ws.receive_json()["state"] == "lobby"
|
|
|
|
client.portal.call(rooms.open_question, sid, 0, 2)
|
|
assert ws.receive_json()["type"] == "question_open"
|
|
|
|
client.portal.call(rooms.close_question, sid)
|
|
assert ws.receive_json()["type"] == "question_closed"
|
|
|
|
client.portal.call(rooms.advance_to_next, sid)
|
|
assert ws.receive_json()["type"] == "question_open"
|
|
assert client.portal.call(rooms.get_session, sid)["current_question_idx"] == 1
|
|
|
|
|
|
def test_reset_clears_participants_and_returns_to_lobby(client, sid):
|
|
rooms = client.app.state.rooms
|
|
join_student(client, sid, "s1", "First")
|
|
join_student(client, sid, "s2", "Second")
|
|
client.portal.call(rooms.open_question, sid, 0, 2)
|
|
client.portal.call(rooms.submit_answer, sid, "s1", 0, "B")
|
|
client.portal.call(rooms.close_question, sid)
|
|
|
|
client.portal.call(rooms.reset, sid)
|
|
|
|
session = client.portal.call(rooms.get_session, sid)
|
|
assert session["state"] == "lobby"
|
|
assert session["current_question_idx"] is None
|
|
# Participants and submissions are wiped.
|
|
board = client.portal.call(rooms.leaderboard, sid)
|
|
assert board == []
|