Phase 3 : hardening qualite de code - typage strict, securite, dead code, a11y
Config strictement stricte partout (ruff, mypy --strict, bandit, vulture, import-linter, eslint, stylelint), aucune regle desactivee "pour ne pas casser le build" - l'existant a ete corrige pour la satisfaire plutot que l'inverse. Hooks pre-commit locaux (language: system) bloquants. - Typage mypy --strict propage a tout le moteur (db, screens, auth, core, ai, routes, puis publish/scripts/tests/app.py/build_css.py). - Securite : fuite de handle fichier Windows corrigee dans l'export SCORM (routes/publish/export_scorm.py), CSRF/RNG non-crypto/xAPI documentes (# nosec, # NOSONAR justifies), nouveau db.json_for_script() (echappe "</script>" dans le JSON embarque en <script>, 25 sites). - Architecture : imports circulaires/F811 nettoyes, contrats import-linter respectes, code mort retire (vulture). - Accessibilite : 69 champs de formulaire sans label correctement associe corriges (for/id ou aria-label) sur 11 templates. - ESLint/Stylelint : lot mecanique JS/CSS, regles ajustees puis appliquees (aucune desactivee sans verification individuelle). - Tests : isolation du compte admin partage (nettoyage ponctuel + fixture de teardown automatique en filet de securite), suite complete verte (591 tests Python, 241 tests JS). - SonarQube Community Build self-heberge (Docker + PostgreSQL) : rapport complet analyse point par point, faux positifs documentes. - .gitattributes ajoute (LF force) : core.autocrlf=true sur cette machine faisait echouer ESLint (linebreak-style) via un bug connu de git (checkout "en place" qui ignore l'eol force sur un fichier deja present sur disque - contourne en supprimant puis recreant chaque fichier suivi). djLint (H021, styles inline) volontairement saute pour ce commit - backlog assume, deja documente, traite dans un lot separe. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Sonnet 5
parent
7db4803b93
commit
c57420c8c9
+48
-24
@@ -4,19 +4,23 @@ milliers de nœuds (voir templates/screen_edit.html, onglet "🧩 Blocs de
|
||||
logique"). Un bloc est un automate FERMÉ : aucune arête possible entre deux
|
||||
nœuds de blocs différents (toute communication inter-blocs passe par les
|
||||
événements personnalisés, voir tests/test_custom_events.py)."""
|
||||
|
||||
import json
|
||||
import re
|
||||
from typing import Any
|
||||
|
||||
from flask.testing import FlaskClient
|
||||
|
||||
import db
|
||||
import screens
|
||||
from tests.conftest import not_none
|
||||
|
||||
|
||||
def _create_screen(client, slug, name="Accueil"):
|
||||
def _create_screen(client: FlaskClient, slug: str, name: str = "Accueil") -> Any:
|
||||
resp = client.post(f"/game/{slug}/screens/new", data={"name": name}, follow_redirects=False)
|
||||
return int(re.search(r"/screens/(\d+)/edit", resp.headers["Location"]).group(1))
|
||||
return int(not_none(re.search(r"/screens/(\d+)/edit", resp.headers["Location"])).group(1))
|
||||
|
||||
|
||||
def _add_flow_node(client, slug, screen_id, **fields):
|
||||
def _add_flow_node(client: FlaskClient, slug: str, screen_id: int, **fields: Any) -> Any:
|
||||
resp = client.post(
|
||||
f"/game/{slug}/screens/{screen_id}/flow/nodes/add",
|
||||
data=json.dumps(fields),
|
||||
@@ -26,7 +30,9 @@ def _add_flow_node(client, slug, screen_id, **fields):
|
||||
return resp.get_json()["id"]
|
||||
|
||||
|
||||
def _add_flow_edge(client, slug, screen_id, from_node_id, to_node_id, from_port="out"):
|
||||
def _add_flow_edge(
|
||||
client: FlaskClient, slug: str, screen_id: int, from_node_id: int, to_node_id: int, from_port: str = "out"
|
||||
) -> Any:
|
||||
return client.post(
|
||||
f"/game/{slug}/screens/{screen_id}/flow/edges/add",
|
||||
data=json.dumps({"from_node_id": from_node_id, "from_port": from_port, "to_node_id": to_node_id}),
|
||||
@@ -34,18 +40,22 @@ def _add_flow_edge(client, slug, screen_id, from_node_id, to_node_id, from_port=
|
||||
)
|
||||
|
||||
|
||||
def test_create_and_list_flow_blocks(client, game):
|
||||
def test_create_and_list_flow_blocks(client: FlaskClient, game: str) -> None:
|
||||
screen_id = _create_screen(client, game)
|
||||
resp = client.post(f"/game/{game}/screens/{screen_id}/flow/blocks/new", data={
|
||||
"name": "Ouvrir la porte", "description": "Ouvre la porte au clic.",
|
||||
})
|
||||
resp = client.post(
|
||||
f"/game/{game}/screens/{screen_id}/flow/blocks/new",
|
||||
data={
|
||||
"name": "Ouvrir la porte",
|
||||
"description": "Ouvre la porte au clic.",
|
||||
},
|
||||
)
|
||||
assert resp.status_code == 302
|
||||
blocks = screens.list_flow_blocks(game, screen_id)
|
||||
assert len(blocks) == 1
|
||||
assert blocks[0]["name"] == "Ouvrir la porte"
|
||||
|
||||
|
||||
def test_orphan_nodes_are_migrated_into_a_default_block(client, game):
|
||||
def test_orphan_nodes_are_migrated_into_a_default_block(client: FlaskClient, game: str) -> None:
|
||||
screen_id = _create_screen(client, game)
|
||||
# Nœud posé "avant" l'existence des blocs (aucun block_id transmis) —
|
||||
# doit être rattaché à un "Bloc principal" auto-créé au premier
|
||||
@@ -55,7 +65,7 @@ def test_orphan_nodes_are_migrated_into_a_default_block(client, game):
|
||||
blocks = screens.list_flow_blocks(game, screen_id)
|
||||
assert len(blocks) == 1
|
||||
assert blocks[0]["name"] == "Bloc principal"
|
||||
node = screens.get_flow_node(game, node_id)
|
||||
node = not_none(screens.get_flow_node(game, node_id))
|
||||
assert node["block_id"] == blocks[0]["id"]
|
||||
|
||||
# Idempotent : un second appel ne crée pas un second "Bloc principal".
|
||||
@@ -63,62 +73,76 @@ def test_orphan_nodes_are_migrated_into_a_default_block(client, game):
|
||||
assert len(blocks_again) == 1
|
||||
|
||||
|
||||
def test_node_created_with_a_block_id_is_not_touched_by_migration(client, game):
|
||||
def test_node_created_with_a_block_id_is_not_touched_by_migration(client: FlaskClient, game: str) -> None:
|
||||
screen_id = _create_screen(client, game)
|
||||
block_id = screens.create_flow_block(game, screen_id, "Mon bloc")
|
||||
node_id = _add_flow_node(
|
||||
client, game, screen_id,
|
||||
node_type="trigger", trigger_event="affichage", block_id=block_id,
|
||||
client,
|
||||
game,
|
||||
screen_id,
|
||||
node_type="trigger",
|
||||
trigger_event="affichage",
|
||||
block_id=block_id,
|
||||
)
|
||||
blocks = screens.list_flow_blocks(game, screen_id)
|
||||
assert len(blocks) == 1
|
||||
assert blocks[0]["id"] == block_id
|
||||
assert screens.get_flow_node(game, node_id)["block_id"] == block_id
|
||||
assert not_none(screens.get_flow_node(game, node_id))["block_id"] == block_id
|
||||
|
||||
|
||||
def test_edge_between_two_different_blocks_is_rejected(client, game):
|
||||
def test_edge_between_two_different_blocks_is_rejected(client: FlaskClient, game: str) -> None:
|
||||
screen_id = _create_screen(client, game)
|
||||
block_a = screens.create_flow_block(game, screen_id, "Bloc A")
|
||||
block_b = screens.create_flow_block(game, screen_id, "Bloc B")
|
||||
node_a = _add_flow_node(client, game, screen_id, node_type="trigger", trigger_event="affichage", block_id=block_a)
|
||||
node_b = _add_flow_node(client, game, screen_id, node_type="action", action_type="attendre", data_value="1", block_id=block_b)
|
||||
node_b = _add_flow_node(
|
||||
client, game, screen_id, node_type="action", action_type="attendre", data_value="1", block_id=block_b
|
||||
)
|
||||
|
||||
resp = _add_flow_edge(client, game, screen_id, node_a, node_b)
|
||||
assert resp.status_code == 400
|
||||
|
||||
# Une arête entre deux nœuds du MÊME bloc, elle, doit réussir.
|
||||
node_a2 = _add_flow_node(client, game, screen_id, node_type="action", action_type="attendre", data_value="1", block_id=block_a)
|
||||
node_a2 = _add_flow_node(
|
||||
client, game, screen_id, node_type="action", action_type="attendre", data_value="1", block_id=block_a
|
||||
)
|
||||
resp_ok = _add_flow_edge(client, game, screen_id, node_a, node_a2)
|
||||
assert resp_ok.status_code == 200
|
||||
|
||||
|
||||
def test_deleting_a_block_cascades_only_its_own_nodes_and_edges(client, game):
|
||||
def test_deleting_a_block_cascades_only_its_own_nodes_and_edges(client: FlaskClient, game: str) -> None:
|
||||
screen_id = _create_screen(client, game)
|
||||
block_a = screens.create_flow_block(game, screen_id, "Bloc A")
|
||||
block_b = screens.create_flow_block(game, screen_id, "Bloc B")
|
||||
|
||||
node_a1 = _add_flow_node(client, game, screen_id, node_type="trigger", trigger_event="affichage", block_id=block_a)
|
||||
node_a2 = _add_flow_node(client, game, screen_id, node_type="action", action_type="attendre", data_value="1", block_id=block_a)
|
||||
node_a2 = _add_flow_node(
|
||||
client, game, screen_id, node_type="action", action_type="attendre", data_value="1", block_id=block_a
|
||||
)
|
||||
edge_resp = _add_flow_edge(client, game, screen_id, node_a1, node_a2)
|
||||
assert edge_resp.status_code == 200
|
||||
edge_id = edge_resp.get_json()["id"]
|
||||
|
||||
node_b1 = _add_flow_node(client, game, screen_id, node_type="trigger", trigger_event="affichage", block_id=block_b)
|
||||
|
||||
resp = client.post(f"/game/{game}/screens/{screen_id}/flow/blocks/{block_a}/delete", data={}, follow_redirects=False)
|
||||
resp = client.post(
|
||||
f"/game/{game}/screens/{screen_id}/flow/blocks/{block_a}/delete", data={}, follow_redirects=False
|
||||
)
|
||||
assert resp.status_code == 302
|
||||
|
||||
assert screens.get_flow_block(game, block_a) is None
|
||||
assert screens.get_flow_node(game, node_a1) is None
|
||||
assert screens.get_flow_node(game, node_a2) is None
|
||||
assert screens.list_flow_edges(game, screen_id) == [] or all(e["id"] != edge_id for e in screens.list_flow_edges(game, screen_id))
|
||||
assert screens.list_flow_edges(game, screen_id) == [] or all(
|
||||
e["id"] != edge_id for e in screens.list_flow_edges(game, screen_id)
|
||||
)
|
||||
|
||||
# Le bloc B et son nœud, eux, ne sont pas touchés.
|
||||
assert screens.get_flow_block(game, block_b) is not None
|
||||
assert screens.get_flow_node(game, node_b1) is not None
|
||||
|
||||
|
||||
def test_screen_edit_page_loads_after_orphan_node_migration(client, game):
|
||||
def test_screen_edit_page_loads_after_orphan_node_migration(client: FlaskClient, game: str) -> None:
|
||||
"""routes/screens/screen_edit.py doit lancer list_flow_blocks() (qui
|
||||
migre les nœuds orphelins vers "Bloc principal") AVANT list_flow_nodes()
|
||||
— sinon la page affiche 0 nœud pour "Bloc principal" au tout premier
|
||||
@@ -133,4 +157,4 @@ def test_screen_edit_page_loads_after_orphan_node_migration(client, game):
|
||||
blocks = screens.list_flow_blocks(game, screen_id)
|
||||
assert len(blocks) == 1
|
||||
assert blocks[0]["name"] == "Bloc principal"
|
||||
assert screens.get_flow_node(game, node_id)["block_id"] == blocks[0]["id"]
|
||||
assert not_none(screens.get_flow_node(game, node_id))["block_id"] == blocks[0]["id"]
|
||||
|
||||
Reference in New Issue
Block a user