QA CR - fix tests (refs #5293)

1 files changed, 35 insertions, 15 deletions

diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py
index 0b1afe2e7..736f6eb33 100644
--- a/archaeological_context_records/tests.py
+++ b/archaeological_context_records/tests.py
@@ -588,44 +588,62 @@ class ContextRecordQATest(ContextRecordInit, TestCase):
 
     def test_bulk_update(self):
         c = Client()
-        pks = "{}-{}".format(self.context_records[0].pk, self.context_records[1].pk)
+        context_record_list = self.context_records[:2]
+        pks = "-".join([str(cr.pk) for cr in context_record_list])
         c.login(username=self.username, password=self.password)
         response = c.get(reverse("contextrecord-qa-bulk-update", args=[pks]))
         self.assertEqual(response.status_code, 200)
 
         site = models.ArchaeologicalSite.objects.create(reference="3333", name="test")
-        town = models.Town.objects.get(name="LILLE")
-        rel_type = models.RelationType.objects.get(label="Coupe")
         unit = models.Unit.objects.get(label="Anomalie")
         parcel = models.Parcel.objects.all().first()
 
+        operation = models.Operation.objects.all()[0]
+
+        parcel_2 = models.Parcel.objects.create(
+            operation=operation, town=Town.objects.all()[0],
+            public_domain=True
+        )
+
+        # verify the initial state
+        for cr in context_record_list:
+            self.assertEqual(parcel.operation, cr.operation)
+            self.assertNotEqual(cr.unit, unit)
+            self.assertNotEqual(cr.parcel, parcel_2)
+            self.assertNotEqual(cr.archaeological_site, site)
+
         data = {
             "qa_unit": unit.pk,
             "qa_archaeological_site": site.pk,
-            "qa_parcel": parcel.pk
+            "qa_parcel": parcel_2.pk
         }
 
         response = c.post(reverse(
             "contextrecord-qa-bulk-update-confirm", args=[pks]), data
         )
 
-        if response.status_code != 200:
-            self.assertRedirects(response, "/success/")
+        self.assertRedirects(response, "/success/")
 
-        crs = models.ContextRecord.objects.all()
-        for cr in crs:
+        # verify the update
+        for cr in context_record_list:
+            cr = models.ContextRecord.objects.get(pk=cr.pk)
             self.assertEqual(cr.unit, unit)
-            self.assertEqual(cr.parcel, parcel)
+            self.assertEqual(cr.parcel, parcel_2)
             self.assertEqual(cr.archaeological_site, site)
 
         self.create_context_record(data={"label": "CR 3"})
         cr_3 = self.context_records[2]
-        cr_3.operation = models.Operation.objects.all()[1]
-        cr_3.parcel = models.Parcel.objects.all()[2]
-
-        pks = "{}-{}-{}".format(
-            self.context_records[0].pk, self.context_records[1].pk, cr_3.pk
+        operation_2 = models.Operation.objects.all()[1]
+        cr_3.operation = operation_2
+        parcel_3 = models.Parcel.objects.create(
+            operation=operation_2, town=Town.objects.all()[0],
+            public_domain=True
         )
+        cr_3.parcel = parcel_3
+        cr_3.save()
+
+        context_record_list.append(cr_3)
+        pks = "-".join([str(cr.pk) for cr in context_record_list])
 
         data = {
             "qa_parcel": parcel.pk
@@ -634,7 +652,9 @@ class ContextRecordQATest(ContextRecordInit, TestCase):
         response = c.post(reverse(
             "contextrecord-qa-bulk-update-confirm", args=[pks]), data
         )
-
+        self.assertRedirects(response, "/success/")
+        cr_3 = models.ContextRecord.objects.get(pk=cr_3.pk)
+        # not on the same operation the update has not been made
         self.assertNotEqual(cr_3.parcel, parcel)