[#3793] Hopefully fix remaining tests

Author: Viicos

src/openforms/appointments/tests/test_views.py

@@ -803,7 +803,7 @@ def test_invalid_auth_value_raises_exception(self):
 
     def test_change_appointment_details_after_payment(self):
         submission = SubmissionFactory.from_components(
-            completed=True,
+            with_public_registration_reference=True,
             components_list=[
                 {
                     "key": "product",

src/openforms/emails/tests/test_confirmation_email.py

@@ -432,7 +432,7 @@ def test_email_payment_incomplete(self):
     def test_email_payment_completed(self):
         email = ConfirmationEmailTemplate(content="test {% payment_information %}")
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__product__price=Decimal("12.34"),
             form__payment_backend="test",
         )

src/openforms/payments/tests/test_e2e.py

@@ -6,11 +6,12 @@
 
 from asgiref.sync import sync_to_async
 from furl import furl
-from playwright.async_api import expect
+from playwright.async_api import Route, expect
 from rest_framework.test import APIRequestFactory
 
 from openforms.forms.tests.factories import FormFactory
 from openforms.submissions.constants import ProcessingStatuses
+from openforms.submissions.models import Submission
 from openforms.tests.e2e.base import E2ETestCase, browser_page
 
 factory = APIRequestFactory()
@@ -32,9 +33,18 @@ def get_form_url(self):
 
         return form
 
-    async def mock_status_url(self, route):
+    @sync_to_async
+    def set_submission_reference(self) -> None:
+        # Required as payment will use the submission ref.
+        submission = Submission.objects.last()
+        submission.public_registration_reference = "OF-123456"
+        submission.save()
+
+    async def mock_status_url(self, route: Route):
         response = await route.fetch()
         json = await response.json()
+        await self.set_submission_reference()
+
         json["status"] = ProcessingStatuses.done
         submission_uuid = resolve(furl(route.request.url).path).kwargs["uuid"]
         json["paymentUrl"] = str(

src/openforms/registrations/contrib/objects_api/tests/test_utils.py

@@ -90,7 +90,7 @@ def test_render_to_json_many_decimal_places(self):
         self.assertEqual("3.14", context_data["amount"])
 
     def test_multiple_public_order_ids(self):
-        submission = SubmissionFactory.create()
+        submission = SubmissionFactory.create(with_public_registration_reference=True)
         payment1, payment2 = SubmissionPaymentFactory.create_batch(
             2, submission=submission, status=PaymentStatus.completed, amount=10
         )

src/openforms/submissions/tests/factories.py

@@ -140,7 +140,7 @@ class Params:
             ),
         )
         with_public_registration_reference = factory.Trait(
-            registration_success=True,
+            completed=True,
             public_registration_reference=factory.LazyFunction(get_random_reference),
         )
 

src/openforms/submissions/tests/test_on_completion_retry_chain.py

@@ -35,10 +35,9 @@ def test_payment_status_update_now_succeeds(self):
         zgw_group = ZGWApiGroupConfigFactory.create()
         # set up a complex submission, with an appointment and payment required.
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             # set by :func:`openforms.payments.tasks.update_submission_payment_status`
             needs_on_completion_retry=True,
-            registration_success=True,
             form__registration_backend="zgw-create-zaak",
             form__registration_backend_options={"zgw_api_group": zgw_group.pk},
             form__payment_backend="ogone-legacy",

src/openforms/submissions/tests/test_post_submission_event.py

@@ -198,9 +198,6 @@ def test_submission_completed_payment_needed(self):
             subject="Confirmation of your {{ form_name }} submission",
             content="Custom content {% appointment_information %} {% payment_information %} {% cosign_information %}",
         )
-        SubmissionPaymentFactory.create(
-            submission=submission, amount=10, status=PaymentStatus.started
-        )
 
         with (
             patch(
@@ -222,6 +219,11 @@ def test_submission_completed_payment_needed(self):
 
         submission.refresh_from_db()
 
+        # We then create the submission payment, as it requires a public reference
+        SubmissionPaymentFactory.create(
+            submission=submission, amount=10, status=PaymentStatus.started
+        )
+
         self.assertEqual(submission.public_registration_reference, "OF-TEST!")
         self.assertTrue(SubmissionReport.objects.filter(submission=submission).exists())
         mock_registration.assert_called()
@@ -283,9 +285,6 @@ def test_submission_completed_payment_and_cosign_needed(self):
             subject="Confirmation of your {{ form_name }} submission",
             content="Custom content {% appointment_information %} {% payment_information %} {% cosign_information %}",
         )
-        SubmissionPaymentFactory.create(
-            submission=submission, amount=10, status=PaymentStatus.started
-        )
 
         with (
             patch(
@@ -303,6 +302,11 @@ def test_submission_completed_payment_and_cosign_needed(self):
 
         submission.refresh_from_db()
 
+        # We then create the submission payment, as it requires a public reference
+        SubmissionPaymentFactory.create(
+            submission=submission, amount=10, status=PaymentStatus.started
+        )
+
         self.assertEqual(submission.public_registration_reference, "OF-TEST!")
         self.assertTrue(SubmissionReport.objects.filter(submission=submission).exists())
         mock_registration.assert_not_called()
@@ -424,7 +428,7 @@ def test_cosign_done_payment_needed_not_done(self):
                 },
             ],
             submitted_data={"email": "test@test.nl", "cosign": "cosign@test.nl"},
-            completed=True,
+            with_public_registration_reference=True,
             cosign_request_email_sent=True,
             cosign_complete=True,
             confirmation_email_sent=True,
@@ -509,7 +513,7 @@ def test_cosign_done_payment_done(self):
                 },
             ],
             submitted_data={"email": "test@test.nl", "cosign": "cosign@test.nl"},
-            completed=True,
+            with_public_registration_reference=True,
             cosign_request_email_sent=True,
             cosign_complete=True,
             confirmation_email_sent=True,
@@ -584,7 +588,7 @@ def test_payment_done_cosign_not_needed(self):
                 },
             ],
             submitted_data={"email": "test@test.nl"},
-            completed=True,
+            with_public_registration_reference=True,
             confirmation_email_sent=True,
             form__registration_backend="email",
             form__registration_backend_options={"to_emails": ["test@registration.nl"]},
@@ -663,7 +667,7 @@ def test_payment_done_cosign_needed_not_done(self):
                 },
             ],
             submitted_data={"email": "test@test.nl", "cosign": "cosign@test.nl"},
-            completed=True,
+            with_public_registration_reference=True,
             cosign_request_email_sent=True,
             cosign_complete=False,
             cosign_confirmation_email_sent=False,
@@ -753,6 +757,7 @@ def test_retry_flow(self):
             auth_info__value="111222333",
             needs_on_completion_retry=True,
             registration_failed=True,
+            with_public_registration_reference=True,
             with_completed_payment=True,
         )
 
@@ -796,7 +801,7 @@ def test_payment_status_update_retry_flow(self):
                 },
             ],
             submitted_data={"email": "test@test.nl", "cosign": "cosign@test.nl"},
-            registration_success=True,
+            with_public_registration_reference=True,
             cosign_request_email_sent=True,
             cosign_complete=True,
             cosign_confirmation_email_sent=True,
@@ -1000,7 +1005,7 @@ def test_payment_required_and_not_should_wait_for_registration(self):
                     "confirmationRecipient": True,
                 }
             ],
-            completed=True,
+            with_public_registration_reference=True,
             form__registration_backend="email",
             form__registration_backend_options={"to_emails": ["test@registration.nl"]},
             form__product__price=10,
@@ -1051,7 +1056,7 @@ def test_payment_done_and_should_wait_for_payment(
             form__registration_backend_options={"to_emails": ["test@registration.nl"]},
             form__product__price=10,
             form__payment_backend="demo",
-            completed=True,
+            with_public_registration_reference=True,
             with_completed_payment=True,
         )
 
@@ -1085,7 +1090,7 @@ def test_payment_done_and_not_should_wait_for_payment(
             form__registration_backend_options={"to_emails": ["test@registration.nl"]},
             form__product__price=10,
             form__payment_backend="demo",
-            completed=True,
+            with_public_registration_reference=True,
             with_completed_payment=True,
         )