From 358ab51f58102ce133672e0d0e8367c1a78c50fd Mon Sep 17 00:00:00 2001 From: David Glick Date: Fri, 21 Feb 2014 10:15:10 -0800 Subject: [PATCH 1/2] test Plone installation policy here, not details of the folder implementation --- Products/CMFPlone/tests/testPortalCreation.py | 34 +++---------------- 1 file changed, 4 insertions(+), 30 deletions(-) diff --git a/Products/CMFPlone/tests/testPortalCreation.py b/Products/CMFPlone/tests/testPortalCreation.py index db2272d589..85c2d0f51b 100644 --- a/Products/CMFPlone/tests/testPortalCreation.py +++ b/Products/CMFPlone/tests/testPortalCreation.py @@ -121,6 +121,10 @@ def testMembersFolderOrdering(self): members = self.membership.getMembersFolder() self.assertEqual(members._ordering, 'unordered') + def testMembersFolderDefaultView(self): + members = self.members + self.assertEqual(members.layout, '@@member-search') + def testMailHost(self): # MailHost should be of the standard variety mailhost = self.portal.MailHost @@ -903,38 +907,8 @@ def afterSetUp(self): self.membership = self.portal.portal_membership self.members = self.membership.getMembersFolder() self.catalog = self.portal.portal_catalog - self.mem_index_type = "Script (Python)" self.setupAuthenticator() - def testMembersIndexHtml(self): - # index_html for Members folder should be a Page Template - members = self.members - self.assertEqual(aq_base(members).meta_type, 'ATFolder') - self.assertTrue(hasattr(aq_base(members), 'index_html')) - # getitem works - self.assertEqual(aq_base(members)['index_html'].meta_type, - self.mem_index_type) - self.assertEqual(members['index_html'].meta_type, self.mem_index_type) - # _getOb works - self.assertEqual(aq_base(members)._getOb('index_html').meta_type, - self.mem_index_type) - self.assertEqual(members._getOb('index_html').meta_type, - self.mem_index_type) - # getattr works when called explicitly - self.assertEqual(aq_base(members).__getattr__('index_html').meta_type, - self.mem_index_type) - self.assertEqual(members.__getattr__('index_html').meta_type, - self.mem_index_type) - - def testLargePloneFolderHickup(self): - # Attribute access for 'index_html' acquired the Document from the - # portal instead of returning the local Page Template. This was due to - # special treatment of 'index_html' in the PloneFolder base class and - # got fixed by hazmat. - members = self.members - self.assertEqual(aq_base(members).meta_type, 'ATFolder') - self.assertEqual(members.index_html.meta_type, self.mem_index_type) - def testSubsequentProfileImportSucceeds(self): # Subsequent profile imports fail (#5439) self.loginAsPortalOwner() From 65f164fa8d65c861cec7a5f9c81b5f80270e03cc Mon Sep 17 00:00:00 2001 From: David Glick Date: Fri, 21 Feb 2014 11:16:08 -0800 Subject: [PATCH 2/2] argh --- Products/CMFPlone/tests/testPortalCreation.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Products/CMFPlone/tests/testPortalCreation.py b/Products/CMFPlone/tests/testPortalCreation.py index 85c2d0f51b..bd12d48f82 100644 --- a/Products/CMFPlone/tests/testPortalCreation.py +++ b/Products/CMFPlone/tests/testPortalCreation.py @@ -122,7 +122,7 @@ def testMembersFolderOrdering(self): self.assertEqual(members._ordering, 'unordered') def testMembersFolderDefaultView(self): - members = self.members + members = self.membership.getMembersFolder() self.assertEqual(members.layout, '@@member-search') def testMailHost(self): @@ -905,7 +905,6 @@ class TestPortalBugs(PloneTestCase.PloneTestCase): def afterSetUp(self): self.membership = self.portal.portal_membership - self.members = self.membership.getMembersFolder() self.catalog = self.portal.portal_catalog self.setupAuthenticator()