Use plone.api to create folder in test

Remove redundant code
plone · Jul 21, 2018 · 34af500 · 34af500
1 parent 9b54c87
commit 34af500
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 31 deletions.
diff --git a/bobtemplates/plone/view/profiles/default/structure/.objects b/bobtemplates/plone/view/profiles/default/structure/.objects
diff --git a/bobtemplates/plone/view/profiles/default/structure/.preserve b/bobtemplates/plone/view/profiles/default/structure/.preserve
diff --git a/bobtemplates/plone/view/profiles/default/structure/my-books/.properties b/bobtemplates/plone/view/profiles/default/structure/my-books/.properties
diff --git a/bobtemplates/plone/view/tests/test_view_+view_name_normalized+.py.bob b/bobtemplates/plone/view/tests/test_view_+view_name_normalized+.py.bob
@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 from {{{package.dottedname}}}.testing import {{{package.uppercasename}}}_FUNCTIONAL_TESTING
 from {{{package.dottedname}}}.testing import {{{package.uppercasename}}}_INTEGRATION_TESTING
+from plone import api
 from plone.app.testing import setRoles
 from plone.app.testing import TEST_USER_ID
 from zope.component import getMultiAdapter
+from zope.component.interfaces import ComponentLookupError
 
 import unittest
 
@@ -15,10 +17,12 @@ class ViewsIntegrationTest(unittest.TestCase):
     def setUp(self):
         self.portal = self.layer['portal']
         setRoles(self.portal, TEST_USER_ID, ['Manager'])
+        api.content.create(self.portal, 'Folder', 'other-folder')
+        api.content.create(self.portal, 'Collection', 'my-collection')
 
     def test_{{{view_name_normalized}}}_is_registered(self):
         view = getMultiAdapter(
-            (self.portal, self.portal.REQUEST),
+            (self.portal['other-folder'], self.portal.REQUEST),
             name='{{{ view_name }}}'
         )
         self.assertTrue(view(), '{{{ view_name }}} is not found')
@@ -38,6 +42,13 @@ class ViewsIntegrationTest(unittest.TestCase):
         )
 {{% endif %}}
 
+    def test_{{{view_name_normalized}}}_in_my_collection(self):
+        with self.assertRaises(ComponentLookupError):
+            getMultiAdapter(
+                (self.portal['my-collection'], self.portal.REQUEST),
+                name='{{{ view_name }}}'
+            )
+
 
 class ViewsFunctionalTest(unittest.TestCase):
 

diff --git a/bobtemplates/plone/view/views/+view_python_file_name+.py.bob b/bobtemplates/plone/view/views/+view_python_file_name+.py.bob
@@ -19,13 +19,11 @@ class {{{ view_python_class_name }}}(BrowserView):
 
     def __call__(self):
         self.msg = _(u'A small message')
-        if self.context._get__name__() == u'my-folder':
-            return self.template()
+        return self.template()
 {{% else %}}
     def __call__(self):
         template = '''<li class="heading" i18n:translate="">
           Sample View
         </li>'''
-        if self.context._get__name__() == u'my-folder':
-            return template
+        return template
 {{% endif %}}
diff --git a/skeleton-tests/test_addon_view.py b/skeleton-tests/test_addon_view.py
@@ -109,27 +109,6 @@ def test_addon_view(tmpdir, capsys, config):
     )
     assert result == 0
 
-#     # generate subtemplate view:
-#     template = """[variables]
-# subtemplate_warning=True
-# view_python_class=False
-# view_name=my_view
-# view_template=False
-# """
-#     generate_answers_ini(wd, template)
-#
-#     config.template = 'view'
-#     result = subprocess.call(
-#         [
-#             'mrbob',
-#             'bobtemplates.plone:' + config.template,
-#             '--config', 'answers.ini',
-#             '--non-interactive',
-#         ],
-#         cwd=wd,
-#     )
-#     assert result == 0
-
     assert file_exists(wd, '/src/collective/sample/configure.zcml')
 
     with capsys.disabled() if config.verbose else dummy_contextmanager():