Merge branch 'develop' into feature/vue3

# Conflicts:
#	.env.template
#	cookbook/views/views.py
#	requirements.txt
This commit is contained in:
vabene1111
2024-07-09 07:26:11 +02:00
87 changed files with 3469 additions and 3170 deletions

View File

@@ -100,7 +100,7 @@ def test_add_duplicate(u1_s1, obj_1):
{'book': obj_1.book.pk, 'recipe': obj_1.recipe.pk},
content_type='application/json'
)
assert r.status_code == 201
assert r.status_code == 400
def test_delete(u1_s1, u1_s2, obj_1):