19603abc58
Three small UX/fairness tweaks from manual live testing: 1. Post-submit "wait for reveal" screen: show only the response time, no score. The +score reveal leaked correctness — any positive number = correct, zero = wrong — short-circuiting the "stop and think" beat the reveal pause was supposed to enforce. Time stays as the engagement signal; score now waits for the instructor reveal. 2. Final-screen "Correct X / Y" denominator is now total_questions instead of questions_answered. Missed questions are scored zero, so they belong in the denominator visibly. Server adds total_questions to the session_ended payload. 3. Projector score-distribution: drop the in-chart count labels (they collided with each other and with the median tag at small N), restore the previously-computed-but-not-rendered x-axis tick labels at the bottom. Stats line at the foot keeps n / mean / max. Also: short-circuit the per-submit instructor + presence broadcasts when no instructor / projector is connected (no listener, no DB work). The 50-student load test was tight on margin against its 2 s time_limit; with the new presence_message / live_histogram_message DB queries firing on every submit, the margin disappeared on busy boxes. Conftest fixture also bumped to 8 s per question for the same reason — gives breathing room for sequential WS submits in the load test. 71/71 pytest green.
100 lines
3.0 KiB
Python
100 lines
3.0 KiB
Python
"""Test fixtures."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
|
|
import pytest
|
|
from fastapi.testclient import TestClient
|
|
|
|
from app.config import Settings
|
|
from app.main import create_app
|
|
|
|
|
|
CANONICAL_SID = "main"
|
|
|
|
|
|
@pytest.fixture
|
|
def sample_pool():
|
|
# 8 s per question gives the load-simulation room to drive 50 sequential
|
|
# WS submits without the autoclose timer racing them on busy CI / dev
|
|
# boxes. Tests that don't care about the timer simply close questions
|
|
# explicitly; the larger default doesn't slow them down.
|
|
return {
|
|
"title": "Sample Quiz",
|
|
"score_fn": "linear_decay",
|
|
"time_limit_default": 8,
|
|
"session_id": CANONICAL_SID,
|
|
"questions": [
|
|
{
|
|
"id": "q1",
|
|
"text": "First question?",
|
|
"options": {"A": "Alpha", "B": "Beta", "C": "Gamma", "D": "Delta"},
|
|
"correct": "B",
|
|
"time_limit": 8,
|
|
"explanation": "B is correct.",
|
|
},
|
|
{
|
|
"id": "q2",
|
|
"text": "Second question?",
|
|
"options": {"A": "One", "B": "Two", "C": "Three", "D": "Four"},
|
|
"correct": "C",
|
|
"time_limit": 8,
|
|
},
|
|
{
|
|
"id": "q3",
|
|
"text": "Third question?",
|
|
"options": {"A": "Red", "B": "Blue", "C": "Green", "D": "Gold"},
|
|
"correct": "A",
|
|
"time_limit": 8,
|
|
},
|
|
{
|
|
"id": "q4",
|
|
"text": "Fourth question?",
|
|
"options": {"A": "North", "B": "South", "C": "East", "D": "West"},
|
|
"correct": "D",
|
|
"time_limit": 8,
|
|
},
|
|
{
|
|
"id": "q5",
|
|
"text": "Fifth question?",
|
|
"options": {"A": "Fetch", "B": "Decode", "C": "Execute", "D": "Write"},
|
|
"correct": "A",
|
|
"time_limit": 8,
|
|
},
|
|
],
|
|
}
|
|
|
|
|
|
@pytest.fixture
|
|
def client(tmp_path, sample_pool):
|
|
pool_path = tmp_path / "pool.json"
|
|
pool_path.write_text(json.dumps(sample_pool))
|
|
settings = Settings(
|
|
db_path=str(tmp_path / "quiz.db"),
|
|
secret_key="test-secret",
|
|
admin_password="admin-pass",
|
|
public_url="http://testserver",
|
|
pool_path=str(pool_path),
|
|
default_session_id=CANONICAL_SID,
|
|
)
|
|
app = create_app(settings)
|
|
with TestClient(app) as test_client:
|
|
yield test_client
|
|
|
|
|
|
@pytest.fixture
|
|
def sid() -> str:
|
|
return CANONICAL_SID
|
|
|
|
|
|
def admin_login(client: TestClient) -> None:
|
|
response = client.post("/admin/login", json={"password": "admin-pass"})
|
|
assert response.status_code == 200, response.text
|
|
|
|
|
|
def join_student(client: TestClient, sid: str, student_id: str = "s1", name: str = "Student One") -> dict:
|
|
response = client.post(f"/api/session/{sid}/join", json={"student_id": student_id, "name": name})
|
|
assert response.status_code == 200, response.text
|
|
return response.json()
|