github/mealie
1
0
Fork 0
mirror of https://github.com/hay-kot/mealie.git synced 2025-08-22 14:33:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

updated ingredient display tests

Browse source
This commit is contained in:
Michael Genson 2025-07-11 18:37:00 +00:00
commit b8a8128ecc
1 changed files with 20 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

46
tests/integration_tests/user_recipe_tests/test_recipe_ingredients.py
View file

@ -145,6 +145,11 @@ from mealie.schema.recipe.recipe_ingredient import (
@pytest.mark.parametrize( @pytest.mark.parametrize(
["food", "expected_food_singular_string", "expected_food_plural_string"], ["food", "expected_food_singular_string", "expected_food_plural_string"],
[ [
[
None,
"",
"",
],
[ [
IngredientFood(id=uuid4(), name="chopped onion", plural_name=None), IngredientFood(id=uuid4(), name="chopped onion", plural_name=None),
"chopped onion", "chopped onion",
@ -157,16 +162,14 @@ from mealie.schema.recipe.recipe_ingredient import (
], ],
], ],
) )
@pytest.mark.parametrize("note", ["very thin", ""]) @pytest.mark.parametrize("note", ["very thin", "", None])
@pytest.mark.parametrize("use_food", [True, False])
def test_ingredient_display( def test_ingredient_display(
quantity: float | None, quantity: float | None,
quantity_display_decimal: str, quantity_display_decimal: str,
quantity_display_fraction: str, quantity_display_fraction: str,
unit: IngredientUnit | None, unit: IngredientUnit | None,
food: IngredientFood, food: IngredientFood | None,
note: str, note: str | None,
use_food: bool,
expect_display_fraction: bool, expect_display_fraction: bool,
expect_plural_unit: bool, expect_plural_unit: bool,
expect_plural_food: bool, expect_plural_food: bool,
@ -176,34 +179,25 @@ def test_ingredient_display(
expected_food_plural_string: str, expected_food_plural_string: str,
): ):
expected_components = [] expected_components = []
if use_food: if expect_display_fraction:
if expect_display_fraction: expected_components.append(quantity_display_fraction)
expected_components.append(quantity_display_fraction) else:
expected_components.append(quantity_display_decimal)
if quantity:
if expect_plural_unit:
expected_components.append(expected_unit_plural_string)
else: else:
expected_components.append(quantity_display_decimal) expected_components.append(expected_unit_singular_string)
if quantity:
if expect_plural_unit:
expected_components.append(expected_unit_plural_string)
else:
expected_components.append(expected_unit_singular_string)
if food:
if expect_plural_food: if expect_plural_food:
expected_components.append(expected_food_plural_string) expected_components.append(expected_food_plural_string)
else: else:
expected_components.append(expected_food_singular_string) expected_components.append(expected_food_singular_string)
expected_components.append(note) expected_components.append(note or "")
else:
if quantity != 0 and quantity != 1:
if expect_display_fraction:
expected_components.append(quantity_display_fraction)
else:
expected_components.append(quantity_display_decimal)
expected_components.append(note)
expected_display_value = " ".join(c for c in expected_components if c) expected_display_value = " ".join(c for c in expected_components if c)
ingredient = RecipeIngredient(quantity=quantity, unit=unit, food=food, note=note, use_food=use_food) ingredient = RecipeIngredient(quantity=quantity, unit=unit, food=food, note=note)
assert ingredient.display == expected_display_value assert ingredient.display == expected_display_value