Changeset 17280 for main/waeup.kofa/trunk/src/waeup/kofa

Timestamp:

14 Jan 2023, 04:57:11 (22 months ago)

Author:

uli

Message:

Upgrade dolmen.beaker dependency. Requires new buildout run.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• beaker.py (deleted)
• ftesting.zcml (modified) (3 diffs)
• tests/test_beaker.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/ftesting.zcml

@@ -1 +1 @@
 <configure
    xmlns="http://namespaces.zope.org/zope"
+   xmlns:browser="http://namespaces.zope.org/browser"
    xmlns:kofa="http://namespaces.waeup.org/kofa"
    i18n_domain="waeup.kofa"
@@ -50 +51 @@
       principal="zope.Everybody"
       />
-  <grant 
+  <grant
       permission="waeup.Anonymous"
       principal="zope.Anybody"
@@ -70 +71 @@
   <grant role="zope.Manager" principal="zope.mgr" />
 
+   <!-- session -->
+   <browser:beakerSession
+        key="waeup.kofa.session.id"
+        secret="KofaRocks"
+        timeout="3600"
+        type="cookie"
+        validate_key="thisMightBeChanged"
+        />
+
 </configure>

main/waeup.kofa/trunk/src/waeup/kofa/tests/test_beaker.py

@@ +1 @@
+# We test beaker functionality, although we have no beaker-related code
+# anymore. All configuration is done in ZCML snippets in
+# site.zcml/ftesting.zcml now.
+# The dolmen.beaker package is developed on: https://github.com/trollfot/dolmen.beaker
+from dolmen.beaker.interfaces import ISessionConfig
+from zope.component import queryUtility
 from zope.component.hooks import setSite
 from zope.publisher.browser import TestRequest
 from zope.session.interfaces import ISession
 from waeup.kofa.testing import FunctionalLayer, FunctionalTestCase
+
 
 class BeakerTests(FunctionalTestCase):
@@ -18 +25 @@
         setSite(self.getRootFolder()) # needed to start transaction
         request = TestRequest()
-        session = ISession(request)
+        session = ISession(request)  # this is a Zope session
         self.assertTrue(session.__module__.startswith('dolmen.beaker'))
+        self.assertTrue(session.get("_path", None) is not None)
         return
+
+    def test_beaker_session_values(self):
+        # Ensure we get also a beaker session
+        # (which is part of a Zope session)
+        try:
+            import dolmen.beaker
+        except ImportError:
+            # no beaker installed, no test
+            return
+        setSite(self.getRootFolder()) # needed to start transaction
+        config = ISessionConfig
+        request = TestRequest()
+        session = ISession(request).session
+        self.assertEqual(session.__module__, "beaker.session")
+        self.assertTrue(session.get("_path", None) is not None)
+        return
+
+    def test_beaker_config_accessible(self):
+        # The session config is set in site.zcml / ftesting.zcml
+        # See beakerSession directive
+        # See https://github.com/trollfot/dolmen.beaker/blob/master/src/dolmen/beaker/zcml.py
+        # for options
+        config = queryUtility(ISessionConfig)
+        self.assertEqual(config.get("key"), "waeup.kofa.session.id")
+        self.assertEqual(config.get("timeout"), 3600)