Skip to content

erp5
erp5
Commit bf975eed authored by Nicolas Delaby's avatar Nicolas Delaby
Browse files
Options

* Check that text_content is still kept after sending an email. 

* Add a expectedFailure test to notice, that there is
  a known bug for displaying outgoing emails.
  getTextContent return document.text_content
  getContentType return document.data.content_type
  Those values are sometimes different.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@39003 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5ce748e6
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 6 deletions
product/ERP5/tests/testCRM.py
View file @ bf975eed
...@@ -38,6 +38,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase,\ ...@@ -38,6 +38,7 @@ from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase,\
_getConversionServerDict _getConversionServerDict
from Products.ERP5OOo.tests.testIngestion import FILE_NAME_REGULAR_EXPRESSION from Products.ERP5OOo.tests.testIngestion import FILE_NAME_REGULAR_EXPRESSION
from Products.ERP5OOo.tests.testIngestion import REFERENCE_REGULAR_EXPRESSION from Products.ERP5OOo.tests.testIngestion import REFERENCE_REGULAR_EXPRESSION
from Products.ERP5Type.tests.backportUnittest import expectedFailure
def makeFilePath(name): def makeFilePath(name):
return os.path.join(os.path.dirname(__file__), 'test_data', 'crm_emails', name) return os.path.join(os.path.dirname(__file__), 'test_data', 'crm_emails', name)
...@@ -720,11 +721,12 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -720,11 +721,12 @@ class TestCRMMailSend(BaseTestCRM):
def test_MailFromMailMessageEvent(self): def test_MailFromMailMessageEvent(self):
# passing start_action transition on event workflow will send an email to the # passing start_action transition on event workflow will send an email to the
# person as destination # person as destination
text_content = 'Mail Content'
event = self.portal.event_module.newContent(portal_type='Mail Message') event = self.portal.event_module.newContent(portal_type='Mail Message')
event.setSource('person_module/me') event.setSource('person_module/me')
event.setDestination('person_module/recipient') event.setDestination('person_module/recipient')
event.setTitle('A Mail') event.setTitle('A Mail')
event.setTextContent('Mail Content') event.setTextContent(text_content)
self.portal.portal_workflow.doActionFor(event, 'start_action', self.portal.portal_workflow.doActionFor(event, 'start_action',
send_mail=1) send_mail=1)
transaction.commit() transaction.commit()
...@@ -734,7 +736,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -734,7 +736,7 @@ class TestCRMMailSend(BaseTestCRM):
mfrom, mto, messageText = last_message mfrom, mto, messageText = last_message
self.assertEquals('"Me," <me@erp5.org>', mfrom) self.assertEquals('"Me," <me@erp5.org>', mfrom)
self.assertEquals(['"Recipient," <recipient@example.com>'], mto) self.assertEquals(['"Recipient," <recipient@example.com>'], mto)
self.assertEquals(event.getTextContent(), text_content)
message = email.message_from_string(messageText) message = email.message_from_string(messageText)
self.assertEquals('A Mail', self.assertEquals('A Mail',
...@@ -743,7 +745,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -743,7 +745,7 @@ class TestCRMMailSend(BaseTestCRM):
for i in message.get_payload(): for i in message.get_payload():
if i.get_content_type()=='text/plain': if i.get_content_type()=='text/plain':
part = i part = i
self.assertEqual('Mail Content', part.get_payload(decode=True)) self.assertEqual(text_content, part.get_payload(decode=True))
# #
# Test multiple recipients. # Test multiple recipients.
...@@ -753,7 +755,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -753,7 +755,7 @@ class TestCRMMailSend(BaseTestCRM):
# multiple recipients. # multiple recipients.
event.setDestinationList(['person_module/recipient', 'person_module/me']) event.setDestinationList(['person_module/recipient', 'person_module/me'])
event.setTitle('A Mail') event.setTitle('A Mail')
event.setTextContent('Mail Content') event.setTextContent(text_content)
self.portal.portal_workflow.doActionFor(event, 'start_action', self.portal.portal_workflow.doActionFor(event, 'start_action',
send_mail=1) send_mail=1)
transaction.commit() transaction.commit()
...@@ -824,15 +826,17 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -824,15 +826,17 @@ class TestCRMMailSend(BaseTestCRM):
def test_MailMessageHTML(self): def test_MailMessageHTML(self):
# test sending a mail message edited as HTML (the default with FCKEditor), # test sending a mail message edited as HTML (the default with FCKEditor),
# then the mail should have HTML. # then the mail should have HTML.
text_content = 'Hello<br/>World'
event = self.portal.event_module.newContent(portal_type='Mail Message') event = self.portal.event_module.newContent(portal_type='Mail Message')
event.setSource('person_module/me') event.setSource('person_module/me')
event.setDestination('person_module/recipient') event.setDestination('person_module/recipient')
event.setContentType('text/html') event.setContentType('text/html')
event.setTextContent('Hello<br/>World') event.setTextContent(text_content)
self.portal.portal_workflow.doActionFor(event, 'start_action', self.portal.portal_workflow.doActionFor(event, 'start_action',
send_mail=1) send_mail=1)
transaction.commit() transaction.commit()
self.tic() self.tic()
self.assertEquals(event.getTextContent(), text_content)
last_message = self.portal.MailHost._last_message last_message = self.portal.MailHost._last_message
self.assertNotEquals((), last_message) self.assertNotEquals((), last_message)
mfrom, mto, messageText = last_message mfrom, mto, messageText = last_message
...@@ -845,7 +849,26 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -845,7 +849,26 @@ class TestCRMMailSend(BaseTestCRM):
if i.get_content_type()=='text/html': if i.get_content_type()=='text/html':
part = i part = i
self.assertNotEqual(part, None) self.assertNotEqual(part, None)
self.assertEqual('<html><body>Hello<br/>World</body></html>', part.get_payload(decode=True)) self.assertEqual('<html><body>%s</body></html>' % text_content, part.get_payload(decode=True))
@expectedFailure
def test_MailMessageHTMLbis(self):
# test sending a mail message edited as HTML (the default with FCKEditor),
# then the mail should have HTML
text_content = 'Hello<br/>World'
event = self.portal.event_module.newContent(portal_type='Mail Message')
event.setSource('person_module/me')
event.setDestination('person_module/recipient')
event.setContentType('text/html')
event.setTextContent(text_content)
self.portal.portal_workflow.doActionFor(event, 'start_action',
send_mail=1)
transaction.commit()
self.tic()
# This test fails because of known issue for outgoing emails.
# there is conflict between properties from data
# and properties from document.
self.assertEquals(event.getContentType(), 'text/html')
def test_MailMessageEncoding(self): def test_MailMessageEncoding(self):
# test sending a mail message with non ascii characters # test sending a mail message with non ascii characters
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7