From 9f3c953b3100d9dfa7eddc99b3e9e5747109de52 Mon Sep 17 00:00:00 2001 From: Antoine Van Elstraete Date: Wed, 11 Mar 2026 17:47:25 +0100 Subject: [PATCH] refactor: rename vehicle keys to generic moteur/type in config --- config.toml | 32 ++++++++++++++++++++++++-------- tests/conftest.py | 32 ++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 16 deletions(-) diff --git a/config.toml b/config.toml index 9d408b8..44ad3e1 100644 --- a/config.toml +++ b/config.toml @@ -1,21 +1,37 @@ -[vehicles.voiture] -name = "Peugeot 308" +[vehicles.citadine] +name = "Citadine électrique" +fuel = "electric" +co2_per_km = 0 +cv = 3 +type = "moteur" + +[vehicles.familiale] +name = "Familiale thermique" fuel = "diesel" co2_per_km = 142 cv = 5 +type = "moteur" + +[vehicles.moto] +name = "Moto" +fuel = "essence" +co2_per_km = 90 +cv = 3 +type = "moteur" [vehicles.velo] name = "Vélo" fuel = "none" co2_per_km = 0 +type = "velo" -[journeys.voiture_seule] -name = "Voiture seule" -distances = { voiture = 25 } +[journeys.moteur_seul] +name = "Véhicule à moteur seul" +distances = { moteur = 25 } -[journeys.voiture_velo] -name = "Voiture + Vélo" -distances = { voiture = 14, velo = 8 } +[journeys.moteur_velo] +name = "Véhicule à moteur + Vélo" +distances = { moteur = 14, velo = 8 } [journeys.velo_seul] name = "Vélo seul" diff --git a/tests/conftest.py b/tests/conftest.py index baaeee7..1f18bc4 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -6,24 +6,40 @@ from app import create_app, db as _db def app(tmp_path): config_path = tmp_path / "config.toml" config_path.write_text(""" -[vehicles.voiture] -name = "Peugeot 308" +[vehicles.citadine] +name = "Citadine électrique" +fuel = "electric" +co2_per_km = 0 +cv = 3 +type = "moteur" + +[vehicles.familiale] +name = "Familiale thermique" fuel = "diesel" co2_per_km = 142 cv = 5 +type = "moteur" + +[vehicles.moto] +name = "Moto" +fuel = "essence" +co2_per_km = 90 +cv = 3 +type = "moteur" [vehicles.velo] name = "Vélo" fuel = "none" co2_per_km = 0 +type = "velo" -[journeys.voiture_seule] -name = "Voiture seule" -distances = { voiture = 25 } +[journeys.moteur_seul] +name = "Véhicule à moteur seul" +distances = { moteur = 25 } -[journeys.voiture_velo] -name = "Voiture + Vélo" -distances = { voiture = 14, velo = 8 } +[journeys.moteur_velo] +name = "Véhicule à moteur + Vélo" +distances = { moteur = 14, velo = 8 } [journeys.velo_seul] name = "Vélo seul"