Changeset 875

Timestamp:

06/07/07 06:27:13

Author:

mylan

Message:

Fixed bug on publishing single reply

Files:

• qPloneComments/trunk/skins/qplonecomments/2.1/discussion_publish_comment.py (modified) (2 diffs)
• qPloneComments/trunk/skins/qplonecomments/2.5/discussion_publish_comment.py (modified) (2 diffs)
• qPloneComments/trunk/tests/helperNotify.py (modified) (2 diffs)
• qPloneComments/trunk/tests/testQPloneCommentsNotification.py (modified) (2 diffs)

qPloneComments/trunk/skins/qplonecomments/2.1/discussion_publish_comment.py

@@ -11 +11 @@
-from Products.CMFCore.utils import getToolByName
-from Products.qPloneComments.utils import publishDiscussion
+from Products.qPloneComments.utils import manage_mails
-
-if obj is None:
@@ -24 +25 @@
-reply = talkback.getReply( obj.getId() )
-publishDiscussion(reply)
+manage_mails(reply, context, action='publishing')
-
-portal_status_message='Comment published.'

qPloneComments/trunk/skins/qplonecomments/2.5/discussion_publish_comment.py

@@ -11 +11 @@
-from Products.CMFCore.utils import getToolByName
-from Products.qPloneComments.utils import publishDiscussion
+from Products.qPloneComments.utils import manage_mails
-
-if obj is None:
@@ -24 +25 @@
-reply = talkback.getReply( obj.getId() )
-publishDiscussion(reply)
+manage_mails(reply, context, action='publishing')
-
-portal_status_message='Comment published.'

qPloneComments/trunk/tests/helperNotify.py

@@ -54 +54 @@
-def send_SMH(self, message, mto=None, mfrom=None, subject=None, encode=None):
-    files = [f for f in os.listdir('./output') if f.startswith('mail')]
+    files.sort()
-    if files:
-        fn = files[-1]+ '1'
@@ -73 +74 @@
-
-def testMailExistance():
-'./output'
+output_file_path("")
-        if f.startswith('mail'):
-            return True
-    return False
-
+def getMails():
+    return [file(output_file_path(f),'r').read() for f in os.listdir(output_file_path("")) if f.startswith('mail')]
+
+
-def cleanOutputDir():
-    for f in os.listdir('./output'):

qPloneComments/trunk/tests/testQPloneCommentsNotification.py

@@ -1 @@
-
+   
-# Test configuration form working
-#
@@ -146 +146 @@
-        self.assert_(testMailExistance(), 'Mail was not sended when enable_approve_user_notification')
-
+    def test_bug_notification_on_single_reply_publish(self):
+        """ Bug: no notification sent on publishing single comment.
+            Must be 3 mails: for replier about replying on his commen;
+                             for replier about publishig his comment;
+                             for document creator about adding new comment.
+        """
+        properties = ['enable_approve_user_notification', 'enable_reply_user_notification',
+                      'enable_published_notification']
+        setProperties(self.prefs, *properties)
+        #setProperties(self.prefs, 'enable_published_notification', )
+        self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc')
+        reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0]
+        reply.discussion_reply('A Reply for reply for my_doc' ,'text of reply on reply for my_doc')
+        reply2 = self.discussion.getDiscussionFor(reply).getReplies()[0]
+
+        cleanOutputDir()
+        reply2.discussion_publish_comment()
+        mails = getMails()
+        self.assert_([1 for m in mails if re.search('^Subject:.*(replied).*$', m, re.I|re.M)] \
+                     ,'No notification for reply' % properties)
+        self.assert_([1 for m in mails if re.search('^Subject:.*(added).*$', m, re.I|re.M)] \
+                     , 'No notification for adding comment' % properties)
+        self.assert_([1 for m in mails if re.search('^Subject:.*(published).*$', m, re.I|re.M)] \
+                     , 'No notification for publishing comment' % properties)
+
-
-TESTS = [TestNotification]