Check if we can run the tests without fiddling with the request layers

src/osha/oira/content/tests/test_risk.py

@@ -1,9 +1,7 @@
-from osha.oira import interfaces
 from osha.oira.testing import OiRAIntegrationTestCase
 from plonetheme.nuplone.z3cform.widget import SingleRadioWidget
 from z3c.form.browser.select import SelectWidget
 from z3c.form.interfaces import IFieldWidget
-from zope.interface import alsoProvides
 from zope.schema.vocabulary import SimpleTerm
 from zope.schema.vocabulary import SimpleVocabulary
 
@@ -24,17 +22,34 @@ def createModule(self, algorithm="kinney", sector_name="sector"):
         survey = self._create(surveygroup, "euphorie.survey", "survey")
         return self._create(survey, "euphorie.module", "module")
 
+    def test_request_layers(self):
+        """Test that request layers are set up correctly."""
+        from osha.oira.interfaces import IOSHAContentSkinLayer
+        from zope.interface import noLongerProvides
+
+        # Given we have the IOSHAContentSkinLayer we get the AddView defined in
+        # out custom package
+        self.assertTrue(IOSHAContentSkinLayer.providedBy(self.request))
+        self.assertEqual(
+            repr(self.portal.restrictedTraverse("++add++euphorie.risk").__class__),
+            "<class 'osha.oira.content.browser.risk.AddView'>",
+        )
+
+        # If we remove the IOSHAContentSkinLayer we get the AddView
+        # that comes from euphorie
+        noLongerProvides(self.request, IOSHAContentSkinLayer)
+        self.assertEqual(
+            repr(self.portal.restrictedTraverse("++add++euphorie.risk").__class__),
+            "<class 'euphorie.content.browser.risk.AddView'>",
+        )
+
     def testDynamicDescription(self):
         """#3343: Customize infoBubble description according to calculation
         method.
         """
         self.loginAsPortalOwner()
         for risk_type in ["kinney", "french"]:
             module = self.createModule(risk_type, "sector-" + risk_type)
-            # Merely installing the OiRA skin doesn't set it's layer on the
-            # request. This happens during IBeforeTraverseEvent, so we have to do
-            # here manually
-            alsoProvides(self.portal.REQUEST, interfaces.IOSHAContentSkinLayer)
 
             # Test AddForm
             form = module.unrestrictedTraverse("++add++euphorie.risk").form_instance
@@ -58,7 +73,6 @@ def testChoiceWidget(self):
         """#1537 The Choice fields must be uniform and all radio buttons."""
         self.loginAsPortalOwner()
         module = self.createModule()
-        alsoProvides(self.portal.REQUEST, interfaces.IOSHAContentSkinLayer)
         form = module.unrestrictedTraverse("++add++euphorie.risk").form_instance
         form.updateFields()
 

src/osha/oira/interfaces.py

@@ -1,5 +1,5 @@
+from euphorie.content.interfaces import IEuphorieContentLayer
 from osha.oira.nuplone.interfaces import IOiRAFormLayer
-from plonetheme.nuplone.skin.interfaces import NuPloneSkin
 from zope.interface import Interface
 
 
@@ -8,5 +8,5 @@ class IProductLayer(Interface):
     installed."""
 
 
-class IOSHAContentSkinLayer(IOiRAFormLayer, NuPloneSkin):
+class IOSHAContentSkinLayer(IOiRAFormLayer, IEuphorieContentLayer):
     """Marker interface for the CMS/Content editing skin."""

src/osha/oira/profiles/default/metadata.xml

@@ -4,6 +4,7 @@
     ftw.upgrade in the package osha.oira.upgrade
   -->
   <dependencies>
+    <dependency>profile-euphorie.deployment:default</dependency>
     <dependency>profile-pas.plugins.ldap:default</dependency>
     <dependency>profile-plone.restapi:default</dependency>
     <dependency>profile-ftw.upgrade:default</dependency>