fix almost all p5 tests

plone · Sep 4, 2013 · aee6217 · sunew · May 3, 2014 · datakurre
1 parent 20d4d86
commit aee6217
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/plone/app/theming/testing.py b/src/plone/app/theming/testing.py
@@ -1,5 +1,6 @@
 from plone.app.testing import PloneSandboxLayer
-from plone.app.testing import PLONE_FIXTURE
+from plone.app.contenttypes.testing import PLONE_APP_CONTENTTYPES_FIXTURE
+
 from plone.app.testing import applyProfile
 
 from zope.configuration import xmlconfig
@@ -8,7 +9,7 @@
 
 
 class Theming(PloneSandboxLayer):
-    defaultBases = (PLONE_FIXTURE,)
+    defaultBases = (PLONE_APP_CONTENTTYPES_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
         # load ZCML
@@ -25,7 +26,7 @@ def setUpPloneSite(self, portal):
 
 
 class ThemingWithCaching(Theming):
-    defaultBases = (PLONE_FIXTURE,)
+    defaultBases = (PLONE_APP_CONTENTTYPES_FIXTURE,)
 
     def setUpZope(self, app, configurationContext):
         # load ZCML

diff --git a/src/plone/app/theming/tests/test_transform.py b/src/plone/app/theming/tests/test_transform.py
@@ -479,6 +479,8 @@ def test_theme_different_path(self):
 
         setRoles(portal, TEST_USER_ID, ('Manager',))
         portal.invokeFactory('Folder', 'news', title=u"News")
+        wftool = getToolByName(portal, "portal_workflow")
+        wftool.doActionFor(portal.news, action='publish')
         setRoles(portal, TEST_USER_ID, ('Member',))
 
         self.settings.enabled = True
@@ -705,7 +707,6 @@ def test_includes(self):
 
         # In the subfolder, we've reversed alpha and beta. We should now get
         # 'one' twice, since we still get alpha from the site root.
-
         browser.open(portal['subfolder'].absolute_url())
         self.assertTrue('<div id="alpha">Number one</div>' in browser.contents)
         self.assertTrue('<div id="beta">Number one</div>' in browser.contents)