diff --git a/plone/app/discussion/tests/test_moderation_view.py b/plone/app/discussion/tests/test_moderation_view.py index 0da420f..3382dd1 100644 --- a/plone/app/discussion/tests/test_moderation_view.py +++ b/plone/app/discussion/tests/test_moderation_view.py @@ -19,25 +19,22 @@ from plone.app.discussion.interfaces import IConversation class ModerationViewTest(unittest.TestCase): - + layer = PLONE_APP_DISCUSSION_INTEGRATION_TESTING - + def setUp(self): self.app = self.layer['app'] self.portal = self.layer['portal'] self.request = self.layer['request'] setRoles(self.portal, TEST_USER_ID, ['Manager']) - typetool = self.portal.portal_types typetool.constructContent('Document', self.portal, 'doc1') - self.portal_discussion = getToolByName(self.portal, 'portal_discussion', None) self.membership_tool = getToolByName(self.portal, 'portal_membership') self.memberdata = self.portal.portal_memberdata - request = self.app.REQUEST context = getattr(self.portal, 'doc1') self.view = View(context, request) @@ -99,11 +96,8 @@ class ModerationBulkActionsViewTest(unittest.TestCase): self.portal.portal_workflow.setChainForPortalTypes( ('Discussion Item',), 'comment_review_workflow') self.wf_tool = self.portal.portal_workflow - # Add a conversation with three comments - conversation = IConversation(self.portal.doc1) - comment1 = createObject('plone.Comment') comment1.title = 'Comment 1' comment1.text = 'Comment text' @@ -111,7 +105,6 @@ class ModerationBulkActionsViewTest(unittest.TestCase): new_id_1 = conversation.addComment(comment1) self.comment1 = self.portal.doc1.restrictedTraverse(\ '++conversation++default/%s' % new_id_1) - comment2 = createObject('plone.Comment') comment2.title = 'Comment 2' comment2.text = 'Comment text' @@ -119,7 +112,6 @@ class ModerationBulkActionsViewTest(unittest.TestCase): new_id_2 = conversation.addComment(comment2) self.comment2 = self.portal.doc1.restrictedTraverse(\ '++conversation++default/%s' % new_id_2) - comment3 = createObject('plone.Comment') comment3.title = 'Comment 3' comment3.text = 'Comment text' @@ -127,21 +119,23 @@ class ModerationBulkActionsViewTest(unittest.TestCase): new_id_3 = conversation.addComment(comment3) self.comment3 = self.portal.doc1.restrictedTraverse(\ '++conversation++default/%s' % new_id_3) - self.conversation = conversation def test_default_bulkaction(self): # Make sure no error is raised when no bulk actions has been supplied self.request.set('form.select.BulkAction', '-1') self.request.set('paths', ['/'.join(self.comment1.getPhysicalPath())]) + view = BulkActionsView(self.portal, self.request) + self.assertFalse(view()) - + def test_retract(self): self.request.set('form.select.BulkAction', 'retract') self.request.set('paths', ['/'.join(self.comment1.getPhysicalPath())]) + view = BulkActionsView(self.portal, self.request) - + self.assertRaises(NotImplementedError, view) @@ -149,8 +143,9 @@ class ModerationBulkActionsViewTest(unittest.TestCase): self.request.set('form.select.BulkAction', 'publish') self.request.set('paths', ['/'.join(self.comment1.getPhysicalPath())]) view = BulkActionsView(self.portal, self.request) + view() - + # Count published comments published_comments = 0 for r in self.conversation.getThreads(): @@ -158,30 +153,29 @@ class ModerationBulkActionsViewTest(unittest.TestCase): workflow_status = self.wf.getInfoFor(comment_obj, 'review_state') if workflow_status == 'published': published_comments += 1 - # Make sure the comment has been published self.assertEqual(published_comments, 1) - + def test_mark_as_spam(self): self.request.set('form.select.BulkAction', 'mark_as_spam') self.request.set('paths', ['/'.join(self.comment1.getPhysicalPath())]) view = BulkActionsView(self.portal, self.request) - + self.assertRaises(NotImplementedError, view) - + def test_delete(self): # Initially we have three comments self.assertEqual(self.conversation.total_comments, 3) - # Delete two comments with bulk actions self.request.set('form.select.BulkAction', 'delete') self.request.set('paths', ['/'.join(self.comment1.getPhysicalPath()), '/'.join(self.comment3.getPhysicalPath())]) view = BulkActionsView(self.app, self.request) + view() - + # Make sure that the two comments have been deleted self.assertEqual(self.conversation.total_comments, 1) comment = self.conversation.getComments().next()