Adapt tests, session no longer store language it seems?

Martin J. Laubach · Martin J. Laubach · commit c99476b2513a · 2022-05-10T14:50:16.000+02:00
diff --git a/feincms/extensions/translations.py b/feincms/extensions/translations.py
@@ -35,7 +35,10 @@
 logger = logging.getLogger(__name__)
 
 LANGUAGE_COOKIE_NAME: str = django_settings.LANGUAGE_COOKIE_NAME
-LANGUAGE_SESSION_KEY = translation.LANGUAGE_SESSION_KEY
+try:
+    LANGUAGE_SESSION_KEY = translation.LANGUAGE_SESSION_KEY
+except AttributeError:  # stopgap measure for django >= 4, need to revisit this later
+    LANGUAGE_SESSION_KEY = '_language'
 PRIMARY_LANGUAGE: str = django_settings.LANGUAGES[0][0]
 
 # ------------------------------------------------------------------------
diff --git a/tests/testapp/tests/test_extensions.py b/tests/testapp/tests/test_extensions.py
@@ -1,3 +1,7 @@
+
+from unittest import skipIf
+
+from django import VERSION
 from django.conf import settings as django_settings
 from django.contrib.sites.models import Site
 from django.template.defaultfilters import slugify
@@ -70,6 +74,7 @@ def testPage(self):
         # TODO:  add request tests
         # with translation.override('de'):
 
+    @skipIf(VERSION >= (4, 0), "Language no longer saved to session in django 4+")
     def test_user_has_language_set_with_session(self):
         factory = RequestFactory()
         request = factory.get(self.page_en.get_navigation_url())
@@ -84,14 +89,25 @@ def test_user_has_language_set_with_cookie(self):
 
         self.assertEqual(user_has_language_set(request), True)
 
+    @skipIf(VERSION >= (4, 0), "Language no longer saved to session in django 4+")
     def test_translation_set_language_to_session(self):
+        factory = RequestFactory()
+        request = factory.get(self.page_de.get_navigation_url())
+        setattr(request, "session", dict())
+        translation_set_language(request, "de")
+
+        self.assertEqual(request.LANGUAGE_CODE, "de")
+        self.assertEqual(request.session[self.language_session_key], "de")
+
+    @skipIf(VERSION >= (4, 0), "Language no longer saved to session in django 4+")
+    def test_translation_set_language_to_session_primary(self):
         factory = RequestFactory()
         request = factory.get(self.page_en.get_navigation_url())
         setattr(request, "session", dict())
         translation_set_language(request, "en")
 
         self.assertEqual(request.LANGUAGE_CODE, "en")
-        self.assertEqual(request.session[self.language_session_key], "en")
+        self.assertEqual(request.session.get(self.language_session_key, 'unset'), "unset")
 
     def test_translation_set_language_to_cookie(self):
         factory = RequestFactory()
