From ea4c16cc2a85edded2003e509e6029ca3bc58285 Mon Sep 17 00:00:00 2001 From: axeron2036 Date: Sun, 30 Apr 2023 07:29:10 +0000 Subject: [PATCH 1/2] Translated using Weblate (Russian) Currently translated at 9.6% (48 of 496 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/ru/ --- cookbook/locale/ru/LC_MESSAGES/django.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook/locale/ru/LC_MESSAGES/django.po b/cookbook/locale/ru/LC_MESSAGES/django.po index a81113371..52a4708a3 100644 --- a/cookbook/locale/ru/LC_MESSAGES/django.po +++ b/cookbook/locale/ru/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-09-13 22:40+0200\n" -"PO-Revision-Date: 2023-04-12 11:55+0000\n" -"Last-Translator: noxonad \n" +"PO-Revision-Date: 2023-05-01 07:55+0000\n" +"Last-Translator: axeron2036 \n" "Language-Team: Russian \n" "Language: ru\n" @@ -286,7 +286,7 @@ msgstr "" #: .\cookbook\forms.py:497 msgid "Search Method" -msgstr "" +msgstr "Способ поиска" #: .\cookbook\forms.py:498 msgid "Fuzzy Lookups" From d8ddf669217de27b8982ca6df923a2bb06012437 Mon Sep 17 00:00:00 2001 From: smilerz Date: Wed, 3 May 2023 10:17:59 -0500 Subject: [PATCH 2/2] reload food objects to resolve inconsistent behavior --- cookbook/tests/api/test_api_food.py | 10 +++++++--- cookbook/tests/factories/__init__.py | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cookbook/tests/api/test_api_food.py b/cookbook/tests/api/test_api_food.py index 504bee0a1..e180576f8 100644 --- a/cookbook/tests/api/test_api_food.py +++ b/cookbook/tests/api/test_api_food.py @@ -99,8 +99,12 @@ def test_list_space(obj_1, obj_2, u1_s1, u1_s2, space_2): assert json.loads(u1_s1.get(reverse(LIST_URL)).content)['count'] == 2 assert json.loads(u1_s2.get(reverse(LIST_URL)).content)['count'] == 0 - obj_1.space = space_2 - obj_1.save() + with scopes_disabled(): + # for some reason the 'path' attribute changes between the factory and the test + obj_1 = Food.objects.get(id=obj_1.id) + obj_2 = Food.objects.get(id=obj_2.id) + obj_1.space = space_2 + obj_1.save() assert json.loads(u1_s1.get(reverse(LIST_URL)).content)['count'] == 1 assert json.loads(u1_s2.get(reverse(LIST_URL)).content)['count'] == 1 @@ -494,10 +498,10 @@ def test_root_filter(obj_tree_1, obj_2, obj_3, u1_s1): def test_tree_filter(obj_tree_1, obj_2, obj_3, u1_s1): with scope(space=obj_tree_1.space): # for some reason the 'path' attribute changes between the factory and the test when using both obj_tree and obj + obj_tree_1 = Food.objects.get(id=obj_tree_1.id) parent = obj_tree_1.get_parent() obj_2.move(parent, node_location) obj_2 = Food.objects.get(id=obj_2.id) - obj_tree_1 = Food.objects.get(id=obj_tree_1.id) parent = Food.objects.get(id=parent.id) # should return full tree starting at parent (obj_tree_1, obj_2), ignoring query filters diff --git a/cookbook/tests/factories/__init__.py b/cookbook/tests/factories/__init__.py index b8844119a..2f740cf99 100644 --- a/cookbook/tests/factories/__init__.py +++ b/cookbook/tests/factories/__init__.py @@ -116,7 +116,7 @@ class FoodFactory(factory.django.DjangoModelFactory): 'cookbook.tests.factories.RecipeFactory', space=factory.SelfAttribute('..space')), no_declaration=None ) - path = None + path = factory.LazyAttribute(lambda x: faker.numerify(text='%###')) space = factory.SubFactory(SpaceFactory) @factory.post_generation