conftest: fix _template_string_if_invalid_marker fixture

to reset fail to True after a mark has been used.

And add the missing marks on failing tests

tests/conftest.py

@@ -246,6 +246,22 @@ def _fail_for_invalid_template_variable_improved(_fail_for_invalid_template_vari
         )
 
 
+@pytest.fixture(autouse=True)
+def _template_string_if_invalid_marker(monkeypatch, request) -> None:
+    # TODO: remove me once https://github.com/pytest-dev/pytest-django/pull/1076 is merged & released
+    marker = request.keywords.get("ignore_template_errors", None)
+    if os.environ.get(INVALID_TEMPLATE_VARS_ENV, "false") == "true":
+        if marker and django_settings_is_configured():
+            from django.conf import settings as dj_settings
+
+            if dj_settings.TEMPLATES:
+                monkeypatch.setattr(
+                    dj_settings.TEMPLATES[0]["OPTIONS"]["string_if_invalid"],
+                    "fail",
+                    False,
+                )
+
+
 @pytest.fixture(scope="session", autouse=True)
 def make_unordered_queries_randomly_ordered():
     """

tests/www/approvals_views/test_detail.py

@@ -20,6 +20,9 @@
 from tests.utils.test import parse_response_to_soup
 
 
+pytestmark = pytest.mark.ignore_template_errors
+
+
 class TestApprovalDetailView:
     def test_anonymous_user(self, client):
         approval = ApprovalFactory()

tests/www/approvals_views/test_display.py

@@ -1,5 +1,6 @@
 from unittest.mock import PropertyMock, patch
 
+import pytest
 from dateutil.relativedelta import relativedelta
 from django.urls import reverse
 from freezegun import freeze_time
@@ -11,6 +12,9 @@
 from tests.utils.test import TestCase
 
 
+pytestmark = pytest.mark.ignore_template_errors
+
+
 @patch.object(JobApplication, "can_be_cancelled", new_callable=PropertyMock, return_value=False)
 class TestDisplayApproval(TestCase):
     @freeze_time("2023-04-26")

tests/www/invitations_views/test_prescriber_organization.py

@@ -1,6 +1,7 @@
 from datetime import timedelta
 from urllib.parse import urlencode
 
+import pytest
 import respx
 from allauth.account.models import EmailAddress
 from django.conf import settings
@@ -36,6 +37,9 @@
 INVITATION_URL = reverse("invitations_views:invite_prescriber_with_org")
 
 
+pytestmark = pytest.mark.ignore_template_errors
+
+
 class TestSendPrescriberWithOrgInvitation(TestCase):
     def setUp(self):
         super().setUp()

tests/www/invitations_views/test_siae_accept.py

@@ -1,5 +1,6 @@
 from urllib.parse import urlencode
 
+import pytest
 import respx
 from django.conf import settings
 from django.contrib import messages
@@ -21,6 +22,9 @@
 from tests.utils.test import assertMessages
 
 
+pytestmark = pytest.mark.ignore_template_errors
+
+
 class TestAcceptInvitation(InclusionConnectBaseTestCase):
     def assert_accepted_invitation(self, response, invitation, user):
         user.refresh_from_db()