Containers: append warehouse to merge key (refs #4964)

1 files changed, 11 insertions, 1 deletions

diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py
index 126cc0420..c1d2e032f 100644
--- a/archaeological_warehouse/tests.py
+++ b/archaeological_warehouse/tests.py
@@ -707,7 +707,7 @@ class ContainerTest(FindInit, TestCase):
             location=self.main_warehouse,
             container_type=ct)
         init_mc = container_1.merge_candidate.count()
-        models.Container.objects.create(
+        container_2 = models.Container.objects.create(
             reference="TEST", responsible=self.main_warehouse,
             location=self.main_warehouse,
             container_type=ct)
@@ -716,6 +716,16 @@ class ContainerTest(FindInit, TestCase):
         container_1.archive()
         self.assertEqual(container_1.merge_candidate.count(),
                          init_mc)
+        container_1 = models.Container.objects.get(pk=container_1.pk)
+        container_1.archived = False
+        container_1.save()
+        container_2 = models.Container.objects.get(pk=container_2.pk)
+        self.assertEqual(container_1.merge_candidate.count(),
+                         init_mc + 1)
+        container_2.location = self.alt_warehouse
+        container_2.save()
+        self.assertEqual(container_1.merge_candidate.count(),
+                         init_mc)
 
     def test_merge_container(self):
         ct = models.ContainerType.objects.all()[0]