Docker/mealie
Docker/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-08-05 13:35:23 +02:00
Code Issues Releases Activity

refactor: remove depreciated repo call (#1370)

Browse source 
* ingredient parser hot fixes (float equality)

* remove `get` in favor of `get_one` & `multi_query`
This commit is contained in:
Hayden 2022-06-10 19:01:14 -08:00 • committed by GitHub
parent b904b161eb
commit 932f4a72df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 25 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/fixtures/fixture_shopping_lists.py vendored
View file

@ -75,7 +75,7 @@ def list_with_items(database: AllRepositories, unique_user: TestUser):
)
# refresh model
list_model = database.group_shopping_lists.get(list_model.id)
list_model = database.group_shopping_lists.get_one(list_model.id)
yield list_model

2
tests/integration_tests/user_recipe_tests/test_recipe_ingredient_parser.py
View file

@ -12,7 +12,7 @@ class Routes:
def assert_ingredient(api_response: dict, test_ingredient: TestIngredient):
assert api_response["ingredient"]["quantity"] == test_ingredient.quantity
assert api_response["ingredient"]["quantity"] == pytest.approx(test_ingredient.quantity)
assert api_response["ingredient"]["unit"]["name"] == test_ingredient.unit
assert api_response["ingredient"]["food"]["name"] == test_ingredient.food
assert api_response["ingredient"]["note"] == test_ingredient.comments

4
tests/unit_tests/test_ingredient_parser.py
View file

@ -31,7 +31,7 @@ test_ingredients = [
# Small Fraction Tests - PR #1369
# Reported error is was for 1/8 - new lowest expected threshold is 1/32
TestIngredient("1/8 cup all-purpose flour", 0.125, "cup", "all-purpose flour", ""),
TestIngredient("1/32 cup all-purpose flour", 0.03125, "cup", "all-purpose flour", ""),
TestIngredient("1/32 cup all-purpose flour", 0.031, "cup", "all-purpose flour", ""),
]
@ -41,7 +41,7 @@ def test_nlp_parser():
# Itterate over mdoels and test_ingreidnets to gether
for model, test_ingredient in zip(models, test_ingredients):
assert float(sum(Fraction(s) for s in model.qty.split())) == test_ingredient.quantity
assert round(float(sum(Fraction(s) for s in model.qty.split())), 3) == pytest.approx(test_ingredient.quantity)
assert model.comment == test_ingredient.comments
assert model.name == test_ingredient.food