reworked MergeMixin to handle non-trees

2021-09-06 10:20:43 -05:00
parent f12558951a
commit 7053a857c2
13 changed files with 230 additions and 43 deletions
--- a/cookbook/tests/api/test_api_food.py
+++ b/cookbook/tests/api/test_api_food.py
@ -273,7 +273,7 @@ def test_integrity(u1_s1, recipe_1_s1):
        )
    )
    assert r.status_code == 204
-    
+
    with scopes_disabled():
        assert Food.objects.count() == 9
        assert Ingredient.objects.count() == 9
@ -327,7 +327,6 @@ def test_move(u1_s1, obj_1, obj_1_1, obj_1_1_1, obj_2, obj_3, space_1):
        assert Food.find_problems() == ([], [], [], [], [])


-# this seems overly long - should it be broken into smaller pieces?
 def test_merge(
    u1_s1,
    obj_1, obj_1_1, obj_1_1_1, obj_2, obj_3,