extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-06-21 18:11:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix inline with multipart message attachment test

Browse Source
This commit is contained in:
Christopher Broderick 2023-10-10 13:47:18 +01:00
parent 6fc7a8dd54
commit 276af1c03c
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
helpdesk/tests/test_get_email.py
View File

@ -7,6 +7,7 @@ from django.core.files.uploadedfile import SimpleUploadedFile
from django.core.management import call_command from django.core.management import call_command
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.test import override_settings, TestCase from django.test import override_settings, TestCase
from email.mime.message import MIMEMessage
from email.mime.multipart import MIMEMultipart from email.mime.multipart import MIMEMultipart
from email.mime.text import MIMEText from email.mime.text import MIMEText
import helpdesk.email import helpdesk.email
@ -69,7 +70,7 @@ class GetEmailCommonTests(TestCase):
"ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo" "ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo"
"ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo..." "ooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo..."
) )
self.assertEqual(ticket.description, "", msg=ticket.description) self.assertEqual(ticket.description.strip(), "", msg=ticket.description)
def test_email_with_quoted_printable_body(self): def test_email_with_quoted_printable_body(self):
""" """
@ -294,22 +295,27 @@ class GetEmailCommonTests(TestCase):
inline_attachment.add_header('X-Attachment-Id', inline_image_id) inline_attachment.add_header('X-Attachment-Id', inline_image_id)
inline_attachment.add_header('Content-ID', '<' + inline_image_id + '>') inline_attachment.add_header('Content-ID', '<' + inline_image_id + '>')
# Create the actual email with its plain and HTML parts # Create the actual email with its plain and HTML parts
email_message = MIMEMultipart(_subtype="alternative") alt_email_message = MIMEMultipart("alternative")
# Create the plain and HTML that will reference the inline attachment # Create the plain and HTML that will reference the inline attachment
plain_body = "Test with inline image: \n[image: " + inline_att_filename + "]\n\n" plain_body = "Test with inline image: \n[image: " + inline_att_filename + "]\n\n"
plain_msg = MIMEText(plain_body) plain_msg = MIMEText(plain_body)
email_message.attach(plain_msg) alt_email_message.attach(plain_msg)
html_body = '<div><div>Test with inline image: <img src=3D"cid:' + inline_image_id + '" alt=3D="' + inline_att_filename + '"><br></div>' html_body = '<div><div>Test with inline image: <img src=3D"cid:' + inline_image_id + '" alt=3D="' + inline_att_filename + '"><br></div>'
html_msg = MIMEText(html_body, "html") html_msg = MIMEText(html_body, "html")
email_message.attach(html_msg) alt_email_message.attach(html_msg)
# Create the email attachment and attach that as well # Create the email to be attached and attach that as well
email_attachment, _, _ = utils.generate_multipart_email(type_list=['plain', 'html']) email_to_be_attached, _, _ = utils.generate_multipart_email(type_list=['plain', 'html'])
email_att_content = email_attachment.as_string() email_as_attachment = MIMEMessage(email_to_be_attached)
email_message.attach(utils.generate_file_mime_part(filename=email_att_filename, content=email_att_content)) email_as_attachment.add_header('Content-Disposition', 'attachment', filename=email_att_filename)
# Now create the base multipart and attach all the other parts to it # Now create the base multipart and attach all the other parts to it
base_message,_ ,_ = utils.generate_multipart_email(type_list=[], sub_type="related") related_message = MIMEMultipart("related")
base_message.attach(email_message) related_message.attach(alt_email_message)
base_message.attach(inline_attachment) related_message.attach(inline_attachment)
base_message = MIMEMultipart("mixed")
base_message.attach(related_message)
base_message.attach(email_as_attachment)
utils.add_simple_email_headers(base_message, locale="en_US", use_short_email=True)
# Now send the part to the email workflow
extract_email_metadata(base_message.as_string(), self.queue_public, self.logger) extract_email_metadata(base_message.as_string(), self.queue_public, self.logger)
self.assertEqual(len(mail.outbox), 1) # @UndefinedVariable self.assertEqual(len(mail.outbox), 1) # @UndefinedVariable
@ -322,14 +328,15 @@ class GetEmailCommonTests(TestCase):
email_attachment_found = False email_attachment_found = False
for att_retrieved in followup.followupattachment_set.all(): for att_retrieved in followup.followupattachment_set.all():
if (helpdesk.email.HTML_EMAIL_ATTACHMENT_FILENAME == att_retrieved.filename): if (helpdesk.email.HTML_EMAIL_ATTACHMENT_FILENAME == att_retrieved.filename):
# Ignore the HTML formatted conntent of the email that is attached # Ignore the HTML formatted content of the email that is attached
continue continue
if att_retrieved.filename.endswith(inline_att_filename): if att_retrieved.filename.endswith(inline_att_filename):
inline_found = True inline_found = True
elif att_retrieved.filename.endswith(email_att_filename): elif att_retrieved.filename.endswith(email_att_filename):
email_attachment_found = True email_attachment_found = True
else: else:
self.assertTrue(False, "Unexpected file in ticket attachments: " % att_retrieved.filename) print(f"\n\n%%%%%% {att_retrieved}")
self.assertTrue(False, "Unexpected file in ticket attachments: %s" % att_retrieved.filename)
self.assertTrue(email_attachment_found, "Email attachment file not found ticket attachments: %s" % (email_att_filename)) self.assertTrue(email_attachment_found, "Email attachment file not found ticket attachments: %s" % (email_att_filename))
self.assertTrue(inline_found, "Inline file not found in email: %s" % (inline_att_filename)) self.assertTrue(inline_found, "Inline file not found in email: %s" % (inline_att_filename))