Merge branch 'master' into v0.9

1 files changed, 25 insertions, 6 deletions

diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py
index f3419013a..8a4c105c6 100644
--- a/archaeological_files/tests.py
+++ b/archaeological_files/tests.py
@@ -44,9 +44,9 @@ class FileInit(object):
         self.user.set_password('tralala')
         self.user.save()
         self.o_user, created = User.objects.get_or_create(username='ousername')
-        person_type = PersonType(label=u'Test person type',
-                                 txt_idx='test_person', available=True)
-        person_type.save()
+        person_type, created = PersonType.objects.get_or_create(
+            label=u'Test ' u'person type', txt_idx='test_person',
+            available=True)
         self.extra_models['person_type'] = person_type
         self.model_list.append(person_type)
 
@@ -56,9 +56,8 @@ class FileInit(object):
         self.extra_models['person'] = person
         self.model_list.append(person)
 
-        file_type = models.FileType(label=u'Test file type',
-                                    txt_idx='test_file', available=True)
-        file_type.save()
+        file_type, created = models.FileType.objects.get_or_create(
+            label=u'Test file type', txt_idx='test_file', available=True)
         self.extra_models['file_type'] = file_type
         self.model_list.append(file_type)
 
@@ -205,6 +204,26 @@ class FileTest(TestCase, FileInit):
         self.assertTrue(data['records'] == 1)
         self.assertEqual(data['rows'][0]['internal_reference'], initial_ref)
 
+    def testPostDeleteParcels(self):
+        fle = self.item
+        town = Town.objects.create(name='plouf', numero_insee='20000')
+        parcel = Parcel.objects.create(town=town)
+        parcel_nb = Parcel.objects.count()
+        fle.parcels.add(parcel)
+        fle.delete()
+        # our parcel has no operation attached and should be deleted
+        self.assertEqual(parcel_nb - 1, Parcel.objects.count())
+
+        self.create_file()
+        fle = self.item
+        parcel = Parcel.objects.create(town=town)
+        parcel_nb = Parcel.objects.count()
+        fle.parcels.add(parcel)
+        fle.parcels.clear()  # no signal raised... should resave
+        Parcel.objects.filter(pk=parcel.pk).all()[0].save()
+        # our parcel has no operation attached and should be deleted
+        self.assertEqual(parcel_nb - 1, Parcel.objects.count())
+
 # class ImporterTest(TestCase):
 #    def testFormaters(self):
 #        from archaeological_files import data_importer