From 8e115b0b6433bba7f6c313a6afa33b13239fe782 Mon Sep 17 00:00:00 2001 From: tisto Date: Tue, 24 Sep 2013 18:03:18 +0200 Subject: [PATCH] Make sure NameChooserTest still works if ATContentTypes is installed and a 'Document' type is already present. --- plone/app/content/testing.py | 4 ---- plone/app/content/tests/test_namechooser_unit.py | 9 ++++++++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plone/app/content/testing.py b/plone/app/content/testing.py index fa12f3ee..e6c08b4d 100644 --- a/plone/app/content/testing.py +++ b/plone/app/content/testing.py @@ -4,7 +4,6 @@ from plone.app.testing import PloneSandboxLayer from plone.app.testing import IntegrationTesting from plone.app.testing import FunctionalTesting -from plone.dexterity.fti import DexterityFTI from zope.configuration import xmlconfig @@ -62,9 +61,6 @@ def setUpPloneSite(self, portal): [], ) - fti = DexterityFTI('Document') - portal.portal_types._setObject('Document', fti) - PLONE_APP_CONTENT_FIXTURE = PloneAppContent() PLONE_APP_CONTENT_INTEGRATION_TESTING = IntegrationTesting( bases=(PLONE_APP_CONTENT_FIXTURE,), diff --git a/plone/app/content/tests/test_namechooser_unit.py b/plone/app/content/tests/test_namechooser_unit.py index 4fb64cd8..a8741785 100644 --- a/plone/app/content/tests/test_namechooser_unit.py +++ b/plone/app/content/tests/test_namechooser_unit.py @@ -1,11 +1,14 @@ -import unittest2 as unittest +from Products.CMFCore.utils import getToolByName from plone.app.content.testing import PLONE_APP_CONTENT_INTEGRATION_TESTING from plone.app.testing import TEST_USER_ID, TEST_USER_NAME from plone.app.testing import setRoles, login import transaction from plone.app.content.namechooser import ATTEMPTS +from plone.dexterity.fti import DexterityFTI from zope.container.interfaces import INameChooser +import unittest2 as unittest + class NameChooserTest(unittest.TestCase): @@ -13,6 +16,10 @@ class NameChooserTest(unittest.TestCase): def setUp(self): self.portal = self.layer['portal'] + portal_types = getToolByName(self.portal, "portal_types") + if 'Document' not in portal_types.objectIds(): + fti = DexterityFTI('Document') + portal_types._setObject('Document', fti) setRoles(self.portal, TEST_USER_ID, ['Manager']) login(self.portal, TEST_USER_NAME)