Operation parcel: fix add/modification

1 files changed, 20 insertions, 9 deletions

diff --git a/archaeological_operations/tests.py b/archaeological_operations/tests.py
index 67f4484e2..7ff7d87ac 100644
--- a/archaeological_operations/tests.py
+++ b/archaeological_operations/tests.py
@@ -2806,7 +2806,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
             error_expected='general'
         ),
         FormData(
-            "Operation: add a parcel",
+            "Operation: change a parcel",
             form_datas={
                 'selec': {},
                 'general': {
@@ -2870,18 +2870,19 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
         for idx in range(0, 5):
             for t in towns:
                 self.form_datas[idx].append('townsgeneral', t)
-            self.form_datas[idx].append('parcelsgeneral', parcel_data)
-
-        p = parcel_data.copy()
-        p['parcel_number'] = '43'
-        self.form_datas[4].append('parcelsgeneral', p)
+            if idx != 4:
+                self.form_datas[idx].append('parcelsgeneral', parcel_data)
 
         parcel_data_2 = {
             'town': init_parcel.town.pk, 'year': init_parcel.year or '',
             'section': init_parcel.section,
+            'pk': init_parcel.pk,
             'parcel_number': init_parcel.parcel_number}
         data['parcelsgeneral'].append(parcel_data_2)
-        # no init parcel for data2 and data3
+
+        p = parcel_data.copy()
+        p['parcel_number'] = '43'
+        self.form_datas[4].form_datas['parcelsgeneral'] = [p]
 
         self.operation_number = models.Operation.objects.count()
         self.parcel_number = models.Parcel.objects.count()
@@ -2899,6 +2900,11 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
             test_object.assertEqual(operation.parcels.count(),
                                     test_object.parcel_number + 1)
 
+        def pre_second_wizard(test_object):
+            test_object.form_datas[1].form_datas[
+                      'parcelsgeneral-operation_modification'][0]["pk"] = \
+                models.Parcel.objects.get(parcel_number="42").pk
+
         def post_second_wizard(test_object, final_step_response):
             test_object.assertEqual(models.Operation.objects.count(),
                                     test_object.operation_number)
@@ -2909,6 +2915,7 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
             test_object.assertEqual(operation.year, 2017)
             test_object.assertEqual(models.Parcel.objects.count(),
                                     test_object.parcel_number + 1)
+
             # the init parcel is not submited but have a context record
             # the init parcel is not detached from the operation
             test_object.assertEqual(operation.parcels.count(),
@@ -2944,6 +2951,9 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
             operation = models.Operation.objects.get(
                 pk=test_object.operations[0].pk)
             test_object.operation_parcel_number = operation.parcels.count()
+            test_object.form_datas[4].form_datas[
+                'parcelsgeneral-operation_modification'][0]["pk"] = \
+                models.Parcel.objects.get(parcel_number="42").pk
 
         def post_fifth_wizard(test_object, final_step_response):
             test_object.assertEqual(models.Operation.objects.count(),
@@ -2951,11 +2961,12 @@ class OperationWizardModifTest(WizardTest, OperationInitTest, TestCase):
             operation = models.Operation.objects.get(
                 pk=test_object.operations[0].pk)
             test_object.assertEqual(models.Parcel.objects.count(),
-                                    test_object.parcel_number + 1)
+                                    test_object.parcel_number)
             test_object.assertEqual(operation.parcels.count(),
-                                    test_object.operation_parcel_number + 1)
+                                    test_object.operation_parcel_number)
 
         self.form_datas[0].extra_tests = [post_first_wizard]
+        self.form_datas[1].pre_tests = [pre_second_wizard]
         self.form_datas[1].extra_tests = [post_second_wizard]
         self.form_datas[2].pre_tests = [pre_third_wizard]
         self.form_datas[2].extra_tests = [post_third_wizard]