Merge pull request #154 from plone/fix-duplicate-install-of-contenttypes

Avoid duplicate installation of plone.app.contenttypes profile
plone · Feb 11, 2024 · 209853f · 209853f
2 parents 07ab782 + d83d87c
commit 209853f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/news/154.bugfix b/news/154.bugfix
@@ -0,0 +1 @@
+Fix duplicate installation of plone.app.contenttypes:default profile. @davisagli
diff --git a/src/plone/app/robotframework/testing.py b/src/plone/app/robotframework/testing.py
@@ -45,7 +45,6 @@ class SimplePublicationLayer(Layer):
 
     def setUp(self):
         with ploneSite() as portal:
-            applyProfile(portal, "plone.app.contenttypes:default")
             portal.portal_workflow.setDefaultChain("simple_publication_workflow")
 
     def tearDown(self):
@@ -56,15 +55,8 @@ def tearDown(self):
 SIMPLE_PUBLICATION_FIXTURE = SimplePublicationLayer()
 
 
-class SimplePublicationWithTypesLayer(Layer):
-    defaultBases = (SIMPLE_PUBLICATION_FIXTURE,)
-
-    def setUp(self):
-        with ploneSite() as portal:
-            applyProfile(portal, "plone.app.contenttypes:default")
-
-
-SIMPLE_PUBLICATION_WITH_TYPES_FIXTURE = SimplePublicationLayer()
+SimplePublicationWithTypesLayer = SimplePublicationLayer
+SIMPLE_PUBLICATION_WITH_TYPES_FIXTURE = SIMPLE_PUBLICATION_FIXTURE
 
 
 class MockMailHostLayer(Layer):
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix duplicate installation of plone.app.contenttypes:default profile. @davisagli