more test fixes

plone · Jun 1, 2015 · 2c1e940 · 2c1e940
1 parent 2d83198
commit 2c1e940
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 32 deletions.
diff --git a/plone/app/contentrules/browser/configure.zcml b/plone/app/contentrules/browser/configure.zcml
@@ -58,14 +58,14 @@
     <browser:page
       for="plone.app.contentrules.browser.interfaces.IRuleAdding"
       name="plone.ContentRule"
-      class=".rule.RuleAdd"
+      class=".rule.RuleAddFormView"
       permission="plone.app.contentrules.ManageContentRules"
       />
 
     <browser:page
       for="plone.contentrules.rule.interfaces.IRule"
       name="edit"
-      class=".rule.RuleEdit"
+      class=".rule.RuleEditFormView"
       permission="plone.app.contentrules.ManageContentRules"
       />
 

diff --git a/plone/app/contentrules/browser/rule.py b/plone/app/contentrules/browser/rule.py
@@ -32,7 +32,7 @@ def create(self, data):
         return rule
 
 
-class RuleAdd(ContentRuleFormWrapper):
+class RuleAddFormView(ContentRuleFormWrapper):
     form = RuleAddForm
 
 
@@ -49,5 +49,5 @@ def nextURL(self):
         return url + '/@@rules-controlpanel'
 
 
-class RuleEdit(ContentRuleFormWrapper):
+class RuleEditFormView(ContentRuleFormWrapper):
     form = RuleEditForm
diff --git a/plone/app/contentrules/tests/test_action_copy.py b/plone/app/contentrules/tests/test_action_copy.py
@@ -6,7 +6,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.actions.copy import CopyAction
-from plone.app.contentrules.actions.copy import CopyEditForm
+from plone.app.contentrules.actions.copy import CopyEditFormView
 
 from plone.app.contentrules.rule import Rule
 from plone.app.contentrules.tests.base import ContentRulesTestCase
@@ -47,6 +47,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+action')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         action = addview.form_instance.create(data={'target_folder': '/target', })
         addview.form_instance.add(action)
 
@@ -58,7 +59,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleAction, name='plone.actions.Copy')
         e = CopyAction()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, CopyEditForm))
+        self.assertTrue(isinstance(editview, CopyEditFormView))
 
     def testExecute(self):
         e = CopyAction()

diff --git a/plone/app/contentrules/tests/test_action_logger.py b/plone/app/contentrules/tests/test_action_logger.py
@@ -7,7 +7,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.actions.logger import LoggerAction
-from plone.app.contentrules.actions.logger import LoggerEditForm
+from plone.app.contentrules.actions.logger import LoggerEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -48,6 +48,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+action')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'targetLogger': 'foo', 'loggingLevel': 10, 'message': 'bar'})
         addview.form_instance.add(content)
 
@@ -61,7 +62,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleAction, name='plone.actions.Logger')
         e = LoggerAction()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, LoggerEditForm))
+        self.assertTrue(isinstance(editview, LoggerEditFormView))
 
     def testProcessedMessage(self):
         e = LoggerAction()

diff --git a/plone/app/contentrules/tests/test_action_mail.py b/plone/app/contentrules/tests/test_action_mail.py
@@ -7,7 +7,7 @@
 
 from plone.app.contentrules.rule import Rule
 from plone.app.contentrules.tests.base import ContentRulesTestCase
-from plone.app.contentrules.actions.mail import MailAction, MailEditForm, MailAddForm
+from plone.app.contentrules.actions.mail import MailAction, MailEditFormView, MailAddFormView
 from plone.contentrules.engine.interfaces import IRuleStorage
 from plone.contentrules.rule.interfaces import IRuleAction, IExecutable
 from plone.registry.interfaces import IRegistry
@@ -72,8 +72,9 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+action')
         addview = getMultiAdapter((adding, self.portal.REQUEST),
                                   name=element.addview)
-        self.assertTrue(isinstance(addview, MailAddForm))
+        self.assertTrue(isinstance(addview, MailAddFormView))
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'subject': 'My Subject',
                                                      'source': 'foo@bar.be',
                                                      'recipients': 'foo@bar.be,bar@foo.be',
@@ -92,7 +93,7 @@ def testInvokeEditView(self):
         e = MailAction()
         editview = getMultiAdapter((e, self.folder.REQUEST),
                                    name=element.editview)
-        self.assertTrue(isinstance(editview, MailEditForm))
+        self.assertTrue(isinstance(editview, MailEditFormView))
 
     def testExecute(self):
         self.loginAsPortalOwner()

diff --git a/plone/app/contentrules/tests/test_action_move.py b/plone/app/contentrules/tests/test_action_move.py
@@ -6,7 +6,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.actions.move import MoveAction
-from plone.app.contentrules.actions.move import MoveEditForm
+from plone.app.contentrules.actions.move import MoveEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -48,6 +48,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+action')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'target_folder': '/target', })
         addview.form_instance.add(content)
 
@@ -59,7 +60,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleAction, name='plone.actions.Move')
         e = MoveAction()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, MoveEditForm))
+        self.assertTrue(isinstance(editview, MoveEditFormView))
 
     def testExecute(self):
         e = MoveAction()

diff --git a/plone/app/contentrules/tests/test_action_notify.py b/plone/app/contentrules/tests/test_action_notify.py
@@ -6,7 +6,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.actions.notify import NotifyAction
-from plone.app.contentrules.actions.notify import NotifyEditForm
+from plone.app.contentrules.actions.notify import NotifyEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -42,6 +42,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.request), name='+action')
         addview = getMultiAdapter((adding, self.request), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'message': 'Hello world',
                                                      'message_type': 'info'})
         addview.form_instance.add(content)
@@ -55,7 +56,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleAction, name='plone.actions.Notify')
         e = NotifyAction()
         editview = getMultiAdapter((e, self.request), name=element.editview)
-        self.assertTrue(isinstance(editview, NotifyEditForm))
+        self.assertTrue(isinstance(editview, NotifyEditFormView))
 
     def testExecute(self):
         e = NotifyAction()

diff --git a/plone/app/contentrules/tests/test_action_workflow.py b/plone/app/contentrules/tests/test_action_workflow.py
@@ -6,7 +6,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.actions.workflow import WorkflowAction
-from plone.app.contentrules.actions.workflow import WorkflowEditForm
+from plone.app.contentrules.actions.workflow import WorkflowEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -44,6 +44,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+action')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'transition': 'publish', })
         addview.form_instance.add(content)
 
@@ -55,7 +56,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleAction, name='plone.actions.Workflow')
         e = WorkflowAction()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, WorkflowEditForm))
+        self.assertTrue(isinstance(editview, WorkflowEditFormView))
 
     def testExecute(self):
         e = WorkflowAction()

diff --git a/plone/app/contentrules/tests/test_condition_group.py b/plone/app/contentrules/tests/test_condition_group.py
@@ -8,7 +8,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.conditions.group import GroupCondition
-from plone.app.contentrules.conditions.group import GroupEditForm
+from plone.app.contentrules.conditions.group import GroupEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -43,6 +43,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+condition')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'group_names': ['Manager']})
         addview.form_instance.add(content)
 
@@ -54,7 +55,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleCondition, name='plone.conditions.Group')
         e = GroupCondition()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, GroupEditForm))
+        self.assertTrue(isinstance(editview, GroupEditFormView))
 
     def testExecute(self):
         e = GroupCondition()

diff --git a/plone/app/contentrules/tests/test_condition_portal_type.py b/plone/app/contentrules/tests/test_condition_portal_type.py
@@ -8,7 +8,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.conditions.portaltype import PortalTypeCondition
-from plone.app.contentrules.conditions.portaltype import PortalTypeEditForm
+from plone.app.contentrules.conditions.portaltype import PortalTypeEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -43,6 +43,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+condition')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'check_types': ['Folder', 'Image']})
         addview.form_instance.add(content)
 
@@ -54,7 +55,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleCondition, name='plone.conditions.PortalType')
         e = PortalTypeCondition()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, PortalTypeEditForm))
+        self.assertTrue(isinstance(editview, PortalTypeEditFormView))
 
     def testExecute(self):
         e = PortalTypeCondition()

diff --git a/plone/app/contentrules/tests/test_condition_role.py b/plone/app/contentrules/tests/test_condition_role.py
@@ -8,7 +8,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.conditions.role import RoleCondition
-from plone.app.contentrules.conditions.role import RoleEditForm
+from plone.app.contentrules.conditions.role import RoleEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -43,6 +43,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+condition')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'role_names': ['Manager', 'Member']})
         addview.form_instance.add(content)
 
@@ -54,7 +55,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleCondition, name='plone.conditions.Role')
         e = RoleCondition()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, RoleEditForm))
+        self.assertTrue(isinstance(editview, RoleEditFormView))
 
     def testExecute(self):
         e = RoleCondition()

diff --git a/plone/app/contentrules/tests/test_condition_tales_expression.py b/plone/app/contentrules/tests/test_condition_tales_expression.py
@@ -8,7 +8,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.conditions.talesexpression import TalesExpressionCondition
-from plone.app.contentrules.conditions.talesexpression import TalesExpressionEditForm
+from plone.app.contentrules.conditions.talesexpression import TalesExpressionEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -42,6 +42,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+condition')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(
             data={'tales_expression': 'python:"plone" in object.Subject()'})
         addview.form_instance.add(content)
@@ -54,7 +55,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleCondition, name='plone.conditions.TalesExpression')
         e = TalesExpressionCondition()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, TalesExpressionEditForm))
+        self.assertTrue(isinstance(editview, TalesExpressionEditFormView))
 
     def testExecute(self):
         e = TalesExpressionCondition()

diff --git a/plone/app/contentrules/tests/test_condition_wfstate.py b/plone/app/contentrules/tests/test_condition_wfstate.py
@@ -8,7 +8,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.conditions.wfstate import WorkflowStateCondition
-from plone.app.contentrules.conditions.wfstate import WorkflowStateEditForm
+from plone.app.contentrules.conditions.wfstate import WorkflowStateEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -43,6 +43,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+condition')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'wf_states': ['visible', 'published']})
         addview.form_instance.add(content)
 
@@ -54,7 +55,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleCondition, name='plone.conditions.WorkflowState')
         e = WorkflowStateCondition()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, WorkflowStateEditForm))
+        self.assertTrue(isinstance(editview, WorkflowStateEditFormView))
 
     def testExecute(self):
         e = WorkflowStateCondition()

diff --git a/plone/app/contentrules/tests/test_condition_wftransition.py b/plone/app/contentrules/tests/test_condition_wftransition.py
@@ -5,7 +5,7 @@
 from plone.contentrules.rule.interfaces import IExecutable
 
 from plone.app.contentrules.conditions.wftransition import WorkflowTransitionCondition
-from plone.app.contentrules.conditions.wftransition import WorkflowTransitionEditForm
+from plone.app.contentrules.conditions.wftransition import WorkflowTransitionEditFormView
 
 from plone.app.contentrules.rule import Rule
 
@@ -36,6 +36,7 @@ def testInvokeAddView(self):
         adding = getMultiAdapter((rule, self.portal.REQUEST), name='+condition')
         addview = getMultiAdapter((adding, self.portal.REQUEST), name=element.addview)
 
+        addview.form_instance.update()
         content = addview.form_instance.create(data={'wf_transitions': ['publish', 'hide']})
         addview.form_instance.add(content)
 
@@ -47,7 +48,7 @@ def testInvokeEditView(self):
         element = getUtility(IRuleCondition, name='plone.conditions.WorkflowTransition')
         e = WorkflowTransitionCondition()
         editview = getMultiAdapter((e, self.folder.REQUEST), name=element.editview)
-        self.assertTrue(isinstance(editview, WorkflowTransitionEditForm))
+        self.assertTrue(isinstance(editview, WorkflowTransitionEditFormView))
 
     def testExecute(self):
         e = WorkflowTransitionCondition()

diff --git a/plone/app/contentrules/tests/test_rule_management_views.py b/plone/app/contentrules/tests/test_rule_management_views.py
@@ -4,7 +4,7 @@
 from plone.contentrules.engine.interfaces import IRuleStorage
 
 from plone.app.contentrules.rule import Rule
-from plone.app.contentrules.browser.rule import RuleEditForm
+from plone.app.contentrules.browser.rule import RuleEditFormView
 
 from plone.app.contentrules.tests.base import ContentRulesTestCase
 
@@ -38,15 +38,16 @@ def testRuleAddView(self):
         addview = getMultiAdapter((adding, self.portal.REQUEST), name='plone.ContentRule')
         storage = getUtility(IRuleStorage)
         self.assertEqual(0, len(storage))
-        content = addview.form_instance.create({'title': 'foo', 'description': 'bar', 'event': None})
+        addview.form_instance.update()
+        content = addview.form_instance.create({'title': 'foo', 'description': 'bar', 'event': None})  # noqa
         addview.form_instance.add(content)
         self.assertEqual(1, len(storage))
         self.assertEqual('foo', storage.values()[0].title)
 
     def testRuleEditView(self):
         r = Rule()
         editview = getMultiAdapter((r, self.portal.REQUEST), name='edit')
-        self.assertTrue(isinstance(editview, RuleEditForm))
+        self.assertTrue(isinstance(editview, RuleEditFormView))
 
 
 class TestRuleElementManagementViews(ContentRulesTestCase):