Skip to content

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

Never hardcode Ids. 

Use contribution_tool to create new documents.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41129 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c8fa2aca
Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 89 deletions
product/ERP5/tests/testCRM.py
View file @ 994668c5
...@@ -959,16 +959,10 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -959,16 +959,10 @@ class TestCRMMailSend(BaseTestCRM):
Make sure that pdf document is correctly attached in email Make sure that pdf document is correctly attached in email
""" """
# Add a document which will be attached. # Add a document which will be attached.
def add_document(filename, id, container, portal_type):
f = makeFileUpload(filename)
document = container.newContent(id=id, portal_type=portal_type)
document.edit(file=f, reference=filename)
return document
# pdf # pdf
document_pdf = add_document('sample_attachment.pdf', '1', filename = 'sample_attachment.pdf'
self.portal.document_module, 'PDF') file_object = makeFileUpload(filename)
document = self.portal.portal_contributions.newContent(file=file_object)
transaction.commit() transaction.commit()
self.tic() self.tic()
...@@ -987,7 +981,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -987,7 +981,7 @@ class TestCRMMailSend(BaseTestCRM):
event = self.portal.event_module.objectValues()[0] event = self.portal.event_module.objectValues()[0]
event.edit(source='person_module/me', event.edit(source='person_module/me',
destination='person_module/recipient', destination='person_module/recipient',
aggregate=document_pdf.getRelativeUrl(), aggregate=document.getRelativeUrl(),
text_content='This is an advertisement mail.') text_content='This is an advertisement mail.')
mail_text = event.send(download=True) mail_text = event.send(download=True)
...@@ -1002,36 +996,28 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1002,36 +996,28 @@ class TestCRMMailSend(BaseTestCRM):
# Check attachment # Check attachment
# pdf # pdf
self.assert_('sample_attachment.pdf' in self.assert_(filename in
[i.get_filename() for i in message.get_payload()]) [i.get_filename() for i in message.get_payload()])
part = None part = None
for i in message.get_payload(): for i in message.get_payload():
if i.get_filename()=='sample_attachment.pdf': if i.get_filename()==filename:
part = i part = i
self.assertEqual(part.get_payload(decode=True), str(document_pdf.getData())) self.assertEqual(part.get_payload(decode=True), str(document.getData()))
def test_MailAttachmentText(self): def test_MailAttachmentText(self):
""" """
Make sure that text document is correctly attached in email Make sure that text document is correctly attached in email
""" """
# Add a document which will be attached. # Add a document which will be attached.
filename = 'sample_attachment.odt'
def add_document(filename, id, container, portal_type): file_object = makeFileUpload(filename)
f = makeFileUpload(filename) document = self.portal.portal_contributions.newContent(file=file_object)
document = container.newContent(id=id, portal_type=portal_type)
document.edit(file=f, reference=filename)
return document
# odt
document_odt = add_document('sample_attachment.odt', '2',
self.portal.document_module, 'Text')
transaction.commit() transaction.commit()
self.tic() self.tic()
# Add a ticket # Add a ticket
ticket = self.portal.campaign_module.newContent(id='1', ticket = self.portal.campaign_module.newContent(portal_type='Campaign',
portal_type='Campaign',
title='Advertisement') title='Advertisement')
# Create a event # Create a event
ticket.Ticket_newEvent(portal_type='Mail Message', ticket.Ticket_newEvent(portal_type='Mail Message',
...@@ -1043,7 +1029,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1043,7 +1029,7 @@ class TestCRMMailSend(BaseTestCRM):
event = self.portal.event_module.objectValues()[0] event = self.portal.event_module.objectValues()[0]
event.edit(source='person_module/me', event.edit(source='person_module/me',
destination='person_module/recipient', destination='person_module/recipient',
aggregate=document_odt.getRelativeUrl(), aggregate=document.getRelativeUrl(),
text_content='This is an advertisement mail.') text_content='This is an advertisement mail.')
mail_text = event.send(download=True) mail_text = event.send(download=True)
...@@ -1058,11 +1044,11 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1058,11 +1044,11 @@ class TestCRMMailSend(BaseTestCRM):
# Check attachment # Check attachment
# odt # odt
self.assert_('sample_attachment.odt' in self.assert_(filename in
[i.get_filename() for i in message.get_payload()]) [i.get_filename() for i in message.get_payload()])
part = None part = None
for i in message.get_payload(): for i in message.get_payload():
if i.get_filename()=='sample_attachment.odt': if i.get_filename() == filename:
part = i part = i
self.assert_(len(part.get_payload(decode=True))>0) self.assert_(len(part.get_payload(decode=True))>0)
...@@ -1071,23 +1057,14 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1071,23 +1057,14 @@ class TestCRMMailSend(BaseTestCRM):
Make sure that file document is correctly attached in email Make sure that file document is correctly attached in email
""" """
# Add a document which will be attached. # Add a document which will be attached.
filename = 'sample_attachment.zip'
def add_document(filename, id, container, portal_type): file_object = makeFileUpload(filename)
f = makeFileUpload(filename) document = self.portal.portal_contributions.newContent(file=file_object)
document = container.newContent(id=id, portal_type=portal_type)
document.edit(file=f, reference=filename)
return document
# zip
document_zip = add_document('sample_attachment.zip', '3',
self.portal.document_module, 'File')
transaction.commit() transaction.commit()
self.tic() self.tic()
# Add a ticket # Add a ticket
ticket = self.portal.campaign_module.newContent(id='1', ticket = self.portal.campaign_module.newContent(portal_type='Campaign',
portal_type='Campaign',
title='Advertisement') title='Advertisement')
# Create a event # Create a event
ticket.Ticket_newEvent(portal_type='Mail Message', ticket.Ticket_newEvent(portal_type='Mail Message',
...@@ -1099,7 +1076,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1099,7 +1076,7 @@ class TestCRMMailSend(BaseTestCRM):
event = self.portal.event_module.objectValues()[0] event = self.portal.event_module.objectValues()[0]
event.edit(source='person_module/me', event.edit(source='person_module/me',
destination='person_module/recipient', destination='person_module/recipient',
aggregate=document_zip.getRelativeUrl(), aggregate=document.getRelativeUrl(),
text_content='This is an advertisement mail.') text_content='This is an advertisement mail.')
mail_text = event.send(download=True) mail_text = event.send(download=True)
...@@ -1114,11 +1091,11 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1114,11 +1091,11 @@ class TestCRMMailSend(BaseTestCRM):
# Check attachment # Check attachment
# zip # zip
self.assert_('sample_attachment.zip' in self.assert_(filename in
[i.get_filename() for i in message.get_payload()]) [i.get_filename() for i in message.get_payload()])
part = None part = None
for i in message.get_payload(): for i in message.get_payload():
if i.get_filename()=='sample_attachment.zip': if i.get_filename() == filename:
part = i part = i
self.assert_(len(part.get_payload(decode=True))>0) self.assert_(len(part.get_payload(decode=True))>0)
...@@ -1127,23 +1104,15 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1127,23 +1104,15 @@ class TestCRMMailSend(BaseTestCRM):
Make sure that image document is correctly attached in email Make sure that image document is correctly attached in email
""" """
# Add a document which will be attached. # Add a document which will be attached.
filename = 'sample_attachment.gif'
def add_document(filename, id, container, portal_type): file_object = makeFileUpload(filename)
f = makeFileUpload(filename) document = self.portal.portal_contributions.newContent(file=file_object)
document = container.newContent(id=id, portal_type=portal_type)
document.edit(file=f, reference=filename)
return document
# gif
document_gif = add_document('sample_attachment.gif', '4',
self.portal.image_module, 'Image')
transaction.commit() transaction.commit()
self.tic() self.tic()
# Add a ticket # Add a ticket
ticket = self.portal.campaign_module.newContent(id='1', ticket = self.portal.campaign_module.newContent(portal_type='Campaign',
portal_type='Campaign',
title='Advertisement') title='Advertisement')
# Create a event # Create a event
ticket.Ticket_newEvent(portal_type='Mail Message', ticket.Ticket_newEvent(portal_type='Mail Message',
...@@ -1155,7 +1124,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1155,7 +1124,7 @@ class TestCRMMailSend(BaseTestCRM):
event = self.portal.event_module.objectValues()[0] event = self.portal.event_module.objectValues()[0]
event.edit(source='person_module/me', event.edit(source='person_module/me',
destination='person_module/recipient', destination='person_module/recipient',
aggregate=document_gif.getRelativeUrl(), aggregate=document.getRelativeUrl(),
text_content='This is an advertisement mail.') text_content='This is an advertisement mail.')
mail_text = event.send(download=True) mail_text = event.send(download=True)
...@@ -1170,31 +1139,28 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1170,31 +1139,28 @@ class TestCRMMailSend(BaseTestCRM):
# Check attachment # Check attachment
# gif # gif
self.assert_('sample_attachment.gif' in self.assert_(filename in
[i.get_filename() for i in message.get_payload()]) [i.get_filename() for i in message.get_payload()])
part = None part = None
for i in message.get_payload(): for i in message.get_payload():
if i.get_filename()=='sample_attachment.gif': if i.get_filename() == filename:
part = i part = i
self.assertEqual(part.get_payload(decode=True), str(document_gif.getData())) self.assertEqual(part.get_payload(decode=True), str(document.getData()))
def test_MailAttachmentWebPage(self): def test_MailAttachmentWebPage(self):
""" """
Make sure that webpage document is correctly attached in email Make sure that webpage document is correctly attached in email
""" """
# Add a document which will be attached. # Add a document which will be attached.
filename = 'sample_attachment.html'
document_html = self.portal.web_page_module.newContent(id='5', document = self.portal.portal_contributions.newContent(
portal_type='Web Page') data='<html><body>Hello world!</body></html>',
document_html.edit(text_content='<html><body>Hello world!</body></html>', filename=filename)
reference='sample_attachment.html')
transaction.commit() transaction.commit()
self.tic() self.tic()
# Add a ticket # Add a ticket
ticket = self.portal.campaign_module.newContent(id='1', ticket = self.portal.campaign_module.newContent(portal_type='Campaign',
portal_type='Campaign',
title='Advertisement') title='Advertisement')
# Create a event # Create a event
ticket.Ticket_newEvent(portal_type='Mail Message', ticket.Ticket_newEvent(portal_type='Mail Message',
...@@ -1206,7 +1172,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1206,7 +1172,7 @@ class TestCRMMailSend(BaseTestCRM):
event = self.portal.event_module.objectValues()[0] event = self.portal.event_module.objectValues()[0]
event.edit(source='person_module/me', event.edit(source='person_module/me',
destination='person_module/recipient', destination='person_module/recipient',
aggregate=document_html.getRelativeUrl(), aggregate=document.getRelativeUrl(),
text_content='This is an advertisement mail.') text_content='This is an advertisement mail.')
mail_text = event.send(download=True) mail_text = event.send(download=True)
...@@ -1221,14 +1187,14 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1221,14 +1187,14 @@ class TestCRMMailSend(BaseTestCRM):
# Check attachment # Check attachment
# html # html
self.assert_('sample_attachment.html' in self.assert_(filename in
[i.get_filename() for i in message.get_payload()]) [i.get_filename() for i in message.get_payload()])
part = None part = None
for i in message.get_payload(): for i in message.get_payload():
if i.get_filename()=='sample_attachment.html': if i.get_filename() == filename:
part = i part = i
self.assertEqual(part.get_payload(decode=True), self.assertEqual(part.get_payload(decode=True),
str(document_html.getTextContent())) str(document.getTextContent()))
self.assertEqual(part.get_content_type(), 'text/html') self.assertEqual(part.get_content_type(), 'text/html')
def test_MailRespond(self): def test_MailRespond(self):
...@@ -1236,8 +1202,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1236,8 +1202,7 @@ class TestCRMMailSend(BaseTestCRM):
Test we can answer an incoming event and quote it Test we can answer an incoming event and quote it
""" """
# Add a ticket # Add a ticket
ticket = self.portal.campaign_module.newContent(id='1', ticket = self.portal.campaign_module.newContent(portal_type='Campaign',
portal_type='Campaign',
title='Advertisement') title='Advertisement')
# Create a event # Create a event
ticket.Ticket_newEvent(portal_type='Mail Message', ticket.Ticket_newEvent(portal_type='Mail Message',
...@@ -1280,22 +1245,21 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1280,22 +1245,21 @@ class TestCRMMailSend(BaseTestCRM):
""" """
# Add a document on a person which will be attached. # Add a document on a person which will be attached.
def add_document(filename, id, container, portal_type): def add_document(filename, container, portal_type):
f = makeFileUpload(filename) f = makeFileUpload(filename)
document = container.newContent(id=id, portal_type=portal_type) document = container.newContent(portal_type=portal_type)
document.edit(file=f, reference=filename) document.edit(file=f, reference=filename)
return document return document
filename = 'sample_attachment.txt'
# txt # txt
document_txt = add_document('sample_attachment.txt', '2', document_txt = add_document(filename,
self.portal.person_module['me'], 'File') self.portal.person_module['me'], 'File')
transaction.commit() transaction.commit()
self.tic() self.tic()
# Add a ticket # Add a ticket
ticket = self.portal.campaign_module.newContent(id='1', ticket = self.portal.campaign_module.newContent(portal_type='Campaign',
portal_type='Campaign',
title='Advertisement') title='Advertisement')
# Create a event # Create a event
ticket.Ticket_newEvent(portal_type='Mail Message', ticket.Ticket_newEvent(portal_type='Mail Message',
...@@ -1323,11 +1287,11 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1323,11 +1287,11 @@ class TestCRMMailSend(BaseTestCRM):
# Check attachment # Check attachment
# txt # txt
self.assert_('sample_attachment.txt' in self.assert_(filename in
[i.get_filename() for i in message.get_payload()]) [i.get_filename() for i in message.get_payload()])
part = None part = None
for i in message.get_payload(): for i in message.get_payload():
if i.get_filename()=='sample_attachment.txt': if i.get_filename() == filename:
part = i part = i
self.assert_(len(part.get_payload(decode=True))>0) self.assert_(len(part.get_payload(decode=True))>0)
...@@ -1339,22 +1303,22 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1339,22 +1303,22 @@ class TestCRMMailSend(BaseTestCRM):
""" """
# Add a document on a person which will be attached. # Add a document on a person which will be attached.
def add_document(filename, id, container, portal_type): def add_document(filename, container, portal_type):
f = makeFileUpload(filename) f = makeFileUpload(filename)
document = container.newContent(id=id, portal_type=portal_type) document = container.newContent(portal_type=portal_type)
document.edit(file=f, reference=filename) document.edit(file=f, reference=filename)
return document return document
# gif # gif
document_gif = add_document('sample_attachment.gif', '1', filename = 'sample_attachment.gif'
document_gif = add_document(filename,
self.portal.person_module['me'], 'Image') self.portal.person_module['me'], 'Image')
transaction.commit() transaction.commit()
self.tic() self.tic()
# Add a ticket # Add a ticket
ticket = self.portal.campaign_module.newContent(id='1', ticket = self.portal.campaign_module.newContent(portal_type='Campaign',
portal_type='Campaign',
title='Advertisement') title='Advertisement')
# Create a event # Create a event
ticket.Ticket_newEvent(portal_type='Mail Message', ticket.Ticket_newEvent(portal_type='Mail Message',
...@@ -1381,11 +1345,11 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1381,11 +1345,11 @@ class TestCRMMailSend(BaseTestCRM):
# Check attachment # Check attachment
# gif # gif
self.assert_('sample_attachment.gif' in self.assert_(filename in
[i.get_filename() for i in message.get_payload()]) [i.get_filename() for i in message.get_payload()])
part = None part = None
for i in message.get_payload(): for i in message.get_payload():
if i.get_filename()=='sample_attachment.gif': if i.get_filename() == filename:
part = i part = i
self.assertEqual(part.get_payload(decode=True), str(document_gif.getData())) self.assertEqual(part.get_payload(decode=True), str(document_gif.getData()))
......
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