Merge branch 'master' of git://github.com/plone/Products.CMFPlone

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.membership.getMembersFolder()
+        self.assertEqual(members.layout, '@@member-search')
+
     def testMailHost(self):
         # MailHost should be of the standard variety
         mailhost = self.portal.MailHost
@@ -901,40 +905,9 @@ 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.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()