From 598cbc4f090d3305d6f37d389a5ee898ff62defd Mon Sep 17 00:00:00 2001
From: Johannes Raggam <raggam-nl@adm.at>
Date: Fri, 27 Feb 2015 04:26:04 +0100
Subject: [PATCH] Fix tests for plone.app.contenttypes unified view names,
 which uses listing_view for Folder and Collection types.

---
 CHANGES.rst                                   | 4 ++++
 Products/CMFPlone/browser/ploneview.py        | 4 ++--
 Products/CMFPlone/tests/testBrowserDefault.py | 8 ++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 225b805df2..087bce2879 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,10 @@ Changelog
 5.0b1 (unreleased)
 ------------------
 
+- Fix tests for plone.app.contenttypes unified view names, which uses
+  ``listing_view`` for Folder and Collection types.
+  [thet]
+
 - Remove ``selectable_views`` from ``properties.xml``, which isn't used
   anywhere anymore.
   [thet]
diff --git a/Products/CMFPlone/browser/ploneview.py b/Products/CMFPlone/browser/ploneview.py
index dd61f2ee33..02c11edfa3 100644
--- a/Products/CMFPlone/browser/ploneview.py
+++ b/Products/CMFPlone/browser/ploneview.py
@@ -116,9 +116,9 @@ def showEditableBorder(self):
             idActions[obj.get('id', '')] = 1
 
         if 'edit' in idActions:
-            if (template_id in idActions or \
+            if (template_id in idActions or
                 template_id in ['synPropertiesForm', 'folder_contents',
-                                'folder_listing']):
+                                'folder_listing', 'listing_view']):
                 return True
 
         # Check to see if the user is able to add content
diff --git a/Products/CMFPlone/tests/testBrowserDefault.py b/Products/CMFPlone/tests/testBrowserDefault.py
index b4615c56db..f264f506be 100644
--- a/Products/CMFPlone/tests/testBrowserDefault.py
+++ b/Products/CMFPlone/tests/testBrowserDefault.py
@@ -228,8 +228,12 @@ def testFolderDefaultPageSameAsSelfWithPageMissing(self):
         self.assertEqual(self.putils.browserDefault(f),
                          (f, [f.getId()],))
         f._delObject(f.getId())
-        self.assertEqual(self.putils.browserDefault(f),
-                         (f, ['folder_listing'],))
+        self.assertTrue(
+            self.putils.browserDefault(f) == (f, ['folder_listing'],)
+            or
+            self.putils.browserDefault(f) == (f, ['listing_view'],)
+            # plone.app.contenttypes has unified views
+        )
 
     def testDefaultPageSetting(self):
         sp = getToolByName(self.portal, "portal_properties").site_properties