diff --git a/CHANGES.rst b/CHANGES.rst index 89b265d8..e673495a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -9,6 +9,7 @@ Changelog .. towncrier release notes start + 4.1.6 (2020-11-17) ------------------ diff --git a/news/195.bugfix b/news/195.bugfix new file mode 100644 index 00000000..56cbf4f0 --- /dev/null +++ b/news/195.bugfix @@ -0,0 +1 @@ +Fix test for restapi compatibility diff --git a/src/plone/app/theming/configure.zcml b/src/plone/app/theming/configure.zcml index c3f46bca..433e2a1e 100644 --- a/src/plone/app/theming/configure.zcml +++ b/src/plone/app/theming/configure.zcml @@ -11,6 +11,7 @@ + diff --git a/src/plone/app/theming/testing.py b/src/plone/app/theming/testing.py index ef1fb6fd..469243a7 100644 --- a/src/plone/app/theming/testing.py +++ b/src/plone/app/theming/testing.py @@ -5,6 +5,7 @@ from plone.app.testing.layers import FunctionalTesting from plone.app.testing.layers import IntegrationTesting from zope.configuration import xmlconfig +from plone.testing import z2 class Theming(PloneSandboxLayer): @@ -18,6 +19,7 @@ def setUpZope(self, app, configurationContext): plone.app.theming.tests, context=configurationContext ) + z2.installProduct(app, "plone.restapi") # Run the startup hook from plone.app.theming.plugins.hooks import onStartup @@ -26,6 +28,8 @@ def setUpZope(self, app, configurationContext): def setUpPloneSite(self, portal): # install into the Plone site applyProfile(portal, 'plone.app.theming:default') + #if portal.portal_setup.profileExists('plone.restapi:default'): + applyProfile(portal, 'plone.restapi:default') THEMING_FIXTURE = Theming() diff --git a/src/plone/app/theming/tests/test_controlpanel.py b/src/plone/app/theming/tests/test_controlpanel.py index ce0f5a41..01378de1 100644 --- a/src/plone/app/theming/tests/test_controlpanel.py +++ b/src/plone/app/theming/tests/test_controlpanel.py @@ -68,6 +68,7 @@ def test_upload_theme_file_nodata(self): self.portal.absolute_url() + '/portal_resources/themeFileUpload', '', ) + # There is a bug in restapi that causes 404 instead - https://github.com/plone/plone.rest/issues/59 self.assertIn('Status: 200', str(self.browser.headers)) self.assertIn( '{"failure": "error"}',