rebase and fixes

cookbook/tests/api/test_api_food_shopping.py

@@ -77,16 +77,20 @@ def test_shopping_food_delete(request, arg, food):
 
 def test_shopping_food_share(u1_s1, u2_s1, food, space_1):
     with scope(space=space_1):
+        user1 = auth.get_user(u1_s1)
+        user2 = auth.get_user(u2_s1)
         food2 = FoodFactory(space=space_1)
     r = u1_s1.put(reverse(SHOPPING_FOOD_URL, args={food.id}))
-    r = u2_s1.put(reverse(SHOPPING_FOOD_URL, args={food.id}))
-    assert len(json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 1
-    assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 1
+    r = u2_s1.put(reverse(SHOPPING_FOOD_URL, args={food2.id}))
+    sl_1 = json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)
+    sl_2 = json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)
+    assert len(sl_1) == 1
+    assert len(sl_2) == 1
+    sl_1[0]['created_by']['id'] == user1.id
+    sl_2[0]['created_by']['id'] == user2.id
 
     with scopes_disabled():
-        user = auth.get_user(u1_s1)
-        user2 = auth.get_user(u2_s1)
-        user.userpreference.shopping_share.add(user2)
-        user.userpreference.save()
+        user1.userpreference.shopping_share.add(user2)
+        user1.userpreference.save()
     assert len(json.loads(u1_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 1
     assert len(json.loads(u2_s1.get(reverse(SHOPPING_LIST_URL)).content)) == 2

cookbook/tests/api/test_api_shopping_list.py

@@ -5,7 +5,7 @@ from django.contrib import auth
 from django.urls import reverse
 from django_scopes import scopes_disabled
 
-from cookbook.models import RecipeBook, Storage, Sync, SyncLog, ShoppingList
+from cookbook.models import RecipeBook, ShoppingList, Storage, Sync, SyncLog
 
 LIST_URL = 'api:shoppinglist-list'
 DETAIL_URL = 'api:shoppinglist-detail'
@@ -56,6 +56,21 @@ def test_share(obj_1, u1_s1, u2_s1, u1_s2):
     assert u1_s2.get(reverse(DETAIL_URL, args={obj_1.id})).status_code == 404
 
 
+def test_new_share(request, obj_1, u1_s1, u2_s1, u1_s2):
+    assert u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).status_code == 200
+    assert u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).status_code == 404
+    assert u1_s2.get(reverse(DETAIL_URL, args={obj_1.id})).status_code == 404
+
+    with scopes_disabled():
+        user = auth.get_user(u1_s1)
+        user.userpreference.shopping_share.add(auth.get_user(u2_s1))
+        user.userpreference.save()
+
+    assert u1_s1.get(reverse(DETAIL_URL, args={obj_1.id})).status_code == 200
+    assert u2_s1.get(reverse(DETAIL_URL, args={obj_1.id})).status_code == 200
+    assert u1_s2.get(reverse(DETAIL_URL, args={obj_1.id})).status_code == 404
+
+
 @pytest.mark.parametrize("arg", [
     ['a_u', 403],
     ['g1_s1', 404],

cookbook/tests/api/test_api_shopping_list_entry.py

@@ -117,18 +117,3 @@ def test_delete(u1_s1, u1_s2, obj_1):
     )
 
     assert r.status_code == 204
-
-
-# TODO test sharing
-# TODO test completed entries still visible if today, but not yesterday
-# TODO test create shopping list from recipe
-# TODO test delete shopping list from recipe -  include created by, shared with and not shared with
-# TODO test create shopping list from food
-# TODO test delete shopping list from food -  include created by, shared with and not shared with
-# TODO test create shopping list from mealplan
-# TODO test create shopping list from recipe, excluding ingredients
-# TODO test auto creating shopping list from meal plan
-# TODO test excluding on-hand when auto creating shopping list
-# test delay
-# test completed_at when checked
-# test completed_at cleared when unchecked

cookbook/tests/api/test_api_shopping_list_entryv2.py

@@ -217,8 +217,3 @@ def test_recent(sle, u1_s1):
     r = json.loads(u1_s1.get(f'{reverse(LIST_URL)}?recent=1').content)
     assert len(r) == 10
     assert [x['checked'] for x in r].count(False) == 9
-
-
-# TODO test create shopping list from food
-# TODO test delete shopping list from food -  include created by, shared with and not shared with
-# TODO test create shopping list from mealplan