ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

total_comments only counts published comments

Browse Source 
Also migrate workflow state during migration.
This commit is contained in:
Paul J Stevens
2012-06-13 11:17:22 +00:00
parent 5e08d3a33e
commit 53428fe5f6
6 changed files with 76 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plone/app/discussion/tests/test_migration.py
+21
View File
@@ -21,6 +21,14 @@ class MigrationTest(unittest.TestCase):
layer = PLONE_APP_DISCUSSION_INTEGRATION_TESTING
def _publish(self, reply):
# publish the reply
status = self.portal.portal_workflow.getStatusOf(
'comment_review_workflow', reply).copy()
status['review_state'] = 'published'
self.portal.portal_workflow.setStatusOf(
'comment_review_workflow', reply, status)
def setUp(self):
self.portal = self.layer['portal']
self.request = self.layer['request']
@@ -53,6 +61,8 @@ class MigrationTest(unittest.TestCase):
reply.setReplyTo(self.doc)
reply.creation_date = DateTime(2003, 3, 11, 9, 28, 6, 'GMT')
reply.modification_date = DateTime(2009, 7, 12, 19, 38, 7, 'GMT')
self._publish(reply)
self.assertEqual(reply.Title(), 'My Title')
self.assertEqual(reply.EditableBody(), 'My Text')
self.assertTrue('Jim' in reply.listCreators())
@@ -104,12 +114,16 @@ class MigrationTest(unittest.TestCase):
talkback.createReply(title='First comment',
text='This is my first comment.')
comment1 = talkback.getReplies()[0]
self._publish(comment1)
talkback_comment1 = self.discussion.getDiscussionFor(comment1)
# Re: First comment
talkback_comment1.createReply(title='Re: First comment',
text='This is my first reply.')
comment1_1 = talkback_comment1.getReplies()[0]
self._publish(comment1_1)
talkback_comment1_1 = self.discussion.getDiscussionFor(comment1_1)
self.assertEqual(len(talkback.getReplies()), 1)
@@ -120,27 +134,34 @@ class MigrationTest(unittest.TestCase):
talkback_comment1_1.createReply(title='Re: Re: First comment',
text='This is my first re-reply.')
comment1_1_1 = talkback_comment1_1.getReplies()[0]
self._publish(comment1_1_1)
talkback_comment1_1_1 = self.discussion.getDiscussionFor(comment1_1_1)
# Re: Re: Re: First comment
talkback_comment1_1_1.createReply(title='Re: Re: Re: First comment',
text='This is my first re-re-reply.')
self._publish(talkback_comment1_1_1.getReplies()[0])
# Re: First comment (2)
talkback_comment1.createReply(title='Re: First comment (2)',
text='This is my first reply (2).')
self._publish(talkback_comment1.getReplies()[1])
# Re: First comment (3)
talkback_comment1.createReply(title='Re: First comment (3)',
text='This is my first reply (3).')
self._publish(talkback_comment1.getReplies()[2])
# Re: First comment (4)
talkback_comment1.createReply(title='Re: First comment (4)',
text='This is my first reply (4).')
self._publish(talkback_comment1.getReplies()[3])
# Second comment
talkback.createReply(title='Second comment',
text='This is my second comment.')
self._publish(talkback.getReplies()[1])
# Call migration script
self.view()
plone/app/discussion/tests/test_moderation_view.py
+2 -2
View File
@@ -171,7 +171,7 @@ class ModerationBulkActionsViewTest(unittest.TestCase):
def test_delete(self):
# Initially we have three comments
self.assertEqual(self.conversation.total_comments, 3)
self.assertEqual(len(self.conversation.objectIds()), 3)
# Delete two comments with bulk actions
self.request.set('form.select.BulkAction', 'delete')
self.request.set('paths', ['/'.join(self.comment1.getPhysicalPath()),
@@ -181,7 +181,7 @@ class ModerationBulkActionsViewTest(unittest.TestCase):
view()
# Make sure that the two comments have been deleted
self.assertEqual(self.conversation.total_comments, 1)
self.assertEqual(len(self.conversation.objectIds()), 1)
comment = self.conversation.getComments().next()
self.assertTrue(comment)
self.assertEqual(comment, self.comment2)