[#2170] Fixed test depending on mocked old behaviour

maykinmedia · Apr 2, 2024 · 380fa83 · 380fa83
1 parent 26453fc
commit 380fa83
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 44 deletions.
diff --git a/src/open_inwoner/accounts/tests/test_contact_views.py b/src/open_inwoner/accounts/tests/test_contact_views.py
@@ -7,12 +7,13 @@
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 
-from cms import api
 from django_webtest import WebTest
 
 from open_inwoner.accounts.models import User
 from open_inwoner.utils.tests.helpers import create_image_bytes
 
+from ...cms.inbox.cms_apps import InboxApphook
+from ...cms.tests import cms_tools
 from ..choices import ContactTypeChoices
 from .factories import DigidUserFactory, UserFactory
 
@@ -98,14 +99,7 @@ def test_messages_enabled_disabled(self):
         self.assertNotContains(response, _("Stuur bericht"))
 
         # case 2: unpublished message page
-        page = api.create_page(
-            "Mijn Berichten",
-            "cms/fullwidth.html",
-            "nl",
-            slug="berichten",
-        )
-        page.application_namespace = "inbox"
-        page.save()
+        page = cms_tools.create_apphook_page(InboxApphook, publish=False)
 
         response = self.app.get(self.list_url, user=self.user)
 

diff --git a/src/open_inwoner/accounts/tests/test_profile_views.py b/src/open_inwoner/accounts/tests/test_profile_views.py
@@ -9,7 +9,6 @@
 from django.utils.translation import gettext as _
 
 import requests_mock
-from cms import api
 from django_webtest import WebTest
 from pyquery import PyQuery as PQ
 from webtest import Upload
@@ -26,6 +25,9 @@
 from open_inwoner.utils.test import ClearCachesMixin
 from open_inwoner.utils.tests.helpers import AssertTimelineLogMixin, create_image_bytes
 
+from ...cms.cases.cms_apps import CasesApphook
+from ...cms.collaborate.cms_apps import CollaborateApphook
+from ...cms.inbox.cms_apps import InboxApphook
 from ...cms.profile.cms_apps import ProfileApphook
 from ...cms.tests import cms_tools
 from ...haalcentraal.api_models import BRPData
@@ -261,14 +263,7 @@ def test_messages_enabled_disabled(self):
         self.assertNotContains(response, _("Stuur een bericht"))
 
         # case 2: unpublished message page
-        page = api.create_page(
-            "Mijn Berichten",
-            "cms/fullwidth.html",
-            "nl",
-            slug="berichten",
-        )
-        page.application_namespace = "inbox"
-        page.save()
+        page = cms_tools.create_apphook_page(InboxApphook, publish=False)
 
         response = self.app.get(self.url, user=self.user)
 
@@ -971,14 +966,7 @@ def test_inbox_notifications_display(self):
         self.assertNotIn("messages_notifications", form.fields)
 
         # inbox page created but not published
-        page = api.create_page(
-            "Mijn Berichten",
-            "cms/fullwidth.html",
-            "nl",
-            slug="berichten",
-        )
-        page.application_namespace = "inbox"
-        page.save()
+        page = cms_tools.create_apphook_page(InboxApphook, publish=False)
 
         response = self.app.get(self.url, user=self.user)
         form = response.forms["change-notifications"]
@@ -1002,15 +990,7 @@ def test_cases_notifications_display(self):
         self.assertNotIn("cases_notifications", form.fields)
 
         # cases page created but not published
-        page = api.create_page(
-            "Mijn Aanvragen",
-            "cms/fullwidth.html",
-            "nl",
-            slug="aanvragen",
-        )
-        page.application_namespace = "cases"
-        page.save()
-
+        page = cms_tools.create_apphook_page(CasesApphook, publish=False)
         response = self.app.get(self.url, user=self.user)
         form = response.forms["change-notifications"]
 
@@ -1031,14 +1011,7 @@ def test_collaborate_notifications_display(self):
         self.assertNotIn("plans_notifications", form.fields)
 
         # collaborate page created but not published
-        page = api.create_page(
-            "Samenwerken",
-            "cms/fullwidth.html",
-            "nl",
-            slug="samenwerken",
-        )
-        page.application_namespace = "collaborate"
-        page.save()
+        page = cms_tools.create_apphook_page(CollaborateApphook, publish=False)
 
         response = self.app.get(self.url, user=self.user)
         form = response.forms["change-notifications"]

diff --git a/src/open_inwoner/cms/tests/cms_tools.py b/src/open_inwoner/cms/tests/cms_tools.py
@@ -104,6 +104,7 @@ def create_apphook_page(
     extension_args: dict = None,
     config_args: dict = None,
     parent_page=None,
+    publish=True,
 ):
     p = api.create_page(
         (title or hook_class.name),
@@ -129,7 +130,7 @@ def create_apphook_page(
     #     config_args["namespace"] = hook_class.app_name
     #     p.app_config = hook_class.app_config.objects.create(**config_args)
 
-    if not p.publish("nl"):
+    if publish and not p.publish("nl"):
         raise Exception("failed to publish page")
 
     return p