Merge branch 'master' into develop

1 files changed, 37 insertions, 0 deletions

diff --git a/archaeological_finds/tests.py b/archaeological_finds/tests.py
index 1d5559dbb..a128b05ff 100644
--- a/archaeological_finds/tests.py
+++ b/archaeological_finds/tests.py
@@ -435,6 +435,20 @@ class FindTest(FindInit, TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertIn('class="sheet"', response.content)
 
+    def test_delete(self):
+        self.create_finds(force=True)
+        first_bf = self.base_finds[0]
+        self.finds[1].base_finds.add(first_bf)
+
+        self.finds[0].delete()
+        # on delete the selected base find is not deleted if another find
+        # is related to it
+        self.assertEqual(models.BaseFind.objects.filter(
+            pk=self.base_finds[0].pk).count(), 1)
+        self.finds[1].delete()
+        self.assertEqual(models.BaseFind.objects.filter(
+            pk=self.base_finds[0].pk).count(), 0)
+
 
 class FindSearchTest(FindInit, TestCase):
     fixtures = FIND_FIXTURES
@@ -622,3 +636,26 @@ class PackagingTest(FindInit, TestCase):
             self.assertNotIn(
                 item, self.finds,
                 msg="Other basket have not been upgraded after packaging")
+
+    def test_delete(self):
+        # manage treatment deletion
+        treatment_type = models.TreatmentType.objects.get(txt_idx='packaging')
+        treatment = models.Treatment()
+
+        initial_find = self.finds[0]
+        treatment.save(user=self.get_default_user(), items=self.basket)
+        treatment.treatment_types.add(treatment_type)
+
+        resulting_find = models.Find.objects.get(
+            upstream_treatment__upstream=initial_find,
+            base_finds__pk=initial_find.base_finds.all()[0].pk
+        )
+        resulting_find.delete()
+
+        self.assertEqual(
+            models.Treatment.objects.filter(pk=treatment.pk).count(), 0)
+        q = models.Find.objects.filter(pk=initial_find.pk)
+        # initial find not deleted
+        self.assertEqual(q.count(), 1)
+        initial_find = q.all()[0]
+        self.assertEqual(initial_find.upstream_treatment, None)