Merge pull request #257 from plone/plonezope4

fix test layer ordering
plone · Sep 18, 2017 · 1e9db4e · 1e9db4e
2 parents be740ce + f9ddc83
commit 1e9db4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,7 +14,9 @@ New features:
 
 Bug fixes:
 
-- *add item here*
+- Make sure robot autologin test fixture is not accidentally torn down
+  when the Dexterity fixture's ZODB sandbox is reverted.
+  [davisagli]
 
 
 2.4.6 (2017-09-03)
@@ -23,7 +25,7 @@ Bug fixes:
 Bug fixes:
 
 - Uniformity with the "Contributors" label.
-  [arsenico13] 
+  [arsenico13]
 
 
 2.4.5 (2017-08-27)

diff --git a/plone/app/dexterity/testing.py b/plone/app/dexterity/testing.py
@@ -2,13 +2,12 @@
 from plone.app.robotframework.testing import AUTOLOGIN_LIBRARY_FIXTURE
 from plone.app.testing import FunctionalTesting
 from plone.app.testing import IntegrationTesting
-from plone.app.testing import PLONE_FIXTURE
 from plone.app.testing import PloneSandboxLayer
 from plone.testing import z2
 
 
 class DexterityFixture(PloneSandboxLayer):
-    defaultBases = (PLONE_FIXTURE,)
+    defaultBases = (AUTOLOGIN_LIBRARY_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
         import plone.app.dexterity
@@ -30,6 +29,6 @@ def setUpPloneSite(self, portal):
     name='dexterity:Functional'
 )
 DEXTERITY_ACCEPTANCE_TESTING = FunctionalTesting(
-    bases=(DEXTERITY_FIXTURE, AUTOLOGIN_LIBRARY_FIXTURE, z2.ZSERVER_FIXTURE),
+    bases=(DEXTERITY_FIXTURE, z2.ZSERVER_FIXTURE),
     name='dexterity:Acceptance'
 )