Merge pull request #127 from plone/plonezope4

fix test layer ordering
2017-09-18 17:11:32 +02:00
parent 603ab0c395 90ba992f72
commit 66e4da0d31
2 changed files with 9 additions and 5 deletions
@@ -14,7 +14,9 @@ New features:

 Bug fixes:

- *add item here*
+- Make sure the effects of the robotframework REMOTE_LIBRARY_ROBOT_TESTING fixture
+  are not accidentally removed when tearing down the PLONE_APP_DISCUSSION_ROBOT_TESTING fixture.
+  [davisagli]


 3.0.3 (2017-08-27)
@@ -98,6 +98,11 @@ class PloneAppDiscussion(PloneSandboxLayer):

 class PloneAppDiscussionRobot(PloneAppDiscussion):

+    defaultBases = (
+        PLONE_APP_CONTENTTYPES_FIXTURE,
+        REMOTE_LIBRARY_ROBOT_TESTING,
+    )
+
    def setUpPloneSite(self, portal):
        registry = queryUtility(IRegistry)
        settings = registry.forInterface(IDiscussionSettings)
@@ -113,9 +118,6 @@ PLONE_APP_DISCUSSION_FUNCTIONAL_TESTING = FunctionalTesting(
    bases=(PLONE_APP_DISCUSSION_FIXTURE,),
    name='PloneAppDiscussion:Functional')
 PLONE_APP_DISCUSSION_ROBOT_TESTING = FunctionalTesting(
-    bases=(
-        PLONE_APP_DISCUSSION_ROBOT_FIXTURE,
-        REMOTE_LIBRARY_ROBOT_TESTING
-    ),
+    bases=(PLONE_APP_DISCUSSION_ROBOT_FIXTURE,),
    name='PloneAppDiscussion:Robot'
 )