fix food tests

cookbook/tests/other/test_recipe_full_text_search.py

@@ -259,33 +259,35 @@ def test_fuzzy_lookup(found_recipe, recipes, param_type, user1,  space_1):
 
 # commenting this out for general use - it is really slow
 # it should be run on occasion to ensure everything still works
-# @pytest.mark.skipif(sqlite and True, reason="requires PostgreSQL")
-# @pytest.mark.parametrize("user1",  itertools.product(
-#     [
-#         ('fuzzy_search', True), ('fuzzy_search', False),
-#         ('fulltext', True), ('fulltext', False),
-#         ('icontains', True), ('icontains', False),
-#         ('istartswith', True), ('istartswith', False),
-#     ],
-#     [('unaccent', True), ('unaccent', False)]
-# ), indirect=['user1'])
-# @pytest.mark.parametrize("found_recipe", [
-#     ({'name': True}),
-#     ({'description': True}),
-#     ({'instruction': True}),
-#     ({'keyword': True}),
-#     ({'food': True}),
-# ], indirect=['found_recipe'])
-# def test_search_string(found_recipe, recipes,  user1,  space_1):
-#     with scope(space=space_1):
-#         param1 = f"query={user1[3]}"
-#         param2 = f"query={user1[4]}"
 
-#         r = json.loads(user1[0].get(reverse(LIST_URL) + f'?{param1}').content)
-#         assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[0].id, found_recipe[1].id]]) == user1[1]
 
-#         r = json.loads(user1[0].get(reverse(LIST_URL) + f'?{param2}').content)
-#         assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[0].id, found_recipe[1].id]]) == user1[2]
+@pytest.mark.skipif(sqlite and True, reason="requires PostgreSQL")
+@pytest.mark.parametrize("user1",  itertools.product(
+    [
+        ('fuzzy_search', True), ('fuzzy_search', False),
+        ('fulltext', True), ('fulltext', False),
+        ('icontains', True), ('icontains', False),
+        ('istartswith', True), ('istartswith', False),
+    ],
+    [('unaccent', True), ('unaccent', False)]
+), indirect=['user1'])
+@pytest.mark.parametrize("found_recipe", [
+    ({'name': True}),
+    ({'description': True}),
+    ({'instruction': True}),
+    ({'keyword': True}),
+    ({'food': True}),
+], indirect=['found_recipe'])
+def test_search_string(found_recipe, recipes,  user1,  space_1):
+    with scope(space=space_1):
+        param1 = f"query={user1[3]}"
+        param2 = f"query={user1[4]}"
+
+        r = json.loads(user1[0].get(reverse(LIST_URL) + f'?{param1}').content)
+        assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[0].id, found_recipe[1].id]]) == user1[1]
+
+        r = json.loads(user1[0].get(reverse(LIST_URL) + f'?{param2}').content)
+        assert len([x['id'] for x in r['results'] if x['id'] in [found_recipe[0].id, found_recipe[1].id]]) == user1[2]
 
 
 @pytest.mark.parametrize("found_recipe, param_type, result", [
@@ -322,33 +324,33 @@ def test_search_date(found_recipe, recipes, param_type, result, u1_s1, u2_s1, sp
 
 
 # TODO this is somehow screwed, probably the search itself, dont want to fix it for now
-# @pytest.mark.parametrize("found_recipe, param_type", [
-#     ({'rating': True}, 'rating'),
-#     ({'timescooked': True}, 'timescooked'),
-# ], indirect=['found_recipe'])
-# def test_search_count(found_recipe, recipes, param_type, u1_s1, u2_s1, space_1):
-#     param1 = f'?{param_type}=3'
-#     param2 = f'?{param_type}=-3'
-#     param3 = f'?{param_type}=0'
-#
-#     r = json.loads(u1_s1.get(reverse(LIST_URL) + param1).content)
-#     assert r['count'] == 1
-#     assert found_recipe[0].id in [x['id'] for x in r['results']]
-#
-#     r = json.loads(u1_s1.get(reverse(LIST_URL) + param2).content)
-#     assert r['count'] == 1
-#     assert found_recipe[1].id in [x['id'] for x in r['results']]
-#
-#     # test search for not rated/cooked
-#     r = json.loads(u1_s1.get(reverse(LIST_URL) + param3).content)
-#     assert r['count'] == 11
-#     assert (found_recipe[0].id or found_recipe[1].id) not in [x['id'] for x in r['results']]
-#
-#     # test matched returns for lte and gte searches
-#     r = json.loads(u2_s1.get(reverse(LIST_URL) + param1).content)
-#     assert r['count'] == 1
-#     assert found_recipe[2].id in [x['id'] for x in r['results']]
-#
-#     r = json.loads(u2_s1.get(reverse(LIST_URL) + param2).content)
-#     assert r['count'] == 1
-#     assert found_recipe[2].id in [x['id'] for x in r['results']]
+@pytest.mark.parametrize("found_recipe, param_type", [
+    ({'rating': True}, 'rating'),
+    ({'timescooked': True}, 'timescooked'),
+], indirect=['found_recipe'])
+def test_search_count(found_recipe, recipes, param_type, u1_s1, u2_s1, space_1):
+    param1 = f'?{param_type}=3'
+    param2 = f'?{param_type}=-3'
+    param3 = f'?{param_type}=0'
+
+    r = json.loads(u1_s1.get(reverse(LIST_URL) + param1).content)
+    assert r['count'] == 1
+    assert found_recipe[0].id in [x['id'] for x in r['results']]
+
+    r = json.loads(u1_s1.get(reverse(LIST_URL) + param2).content)
+    assert r['count'] == 1
+    assert found_recipe[1].id in [x['id'] for x in r['results']]
+
+    # test search for not rated/cooked
+    r = json.loads(u1_s1.get(reverse(LIST_URL) + param3).content)
+    assert r['count'] == 11
+    assert (found_recipe[0].id or found_recipe[1].id) not in [x['id'] for x in r['results']]
+
+    # test matched returns for lte and gte searches
+    r = json.loads(u2_s1.get(reverse(LIST_URL) + param1).content)
+    assert r['count'] == 1
+    assert found_recipe[2].id in [x['id'] for x in r['results']]
+
+    r = json.loads(u2_s1.get(reverse(LIST_URL) + param2).content)
+    assert r['count'] == 1
+    assert found_recipe[2].id in [x['id'] for x in r['results']]