mirror of
https://gitea.mueller.network/extern/django-helpdesk.git
synced 2024-11-22 16:03:19 +01:00
Merge branch 'develop' into images_for_kb
This commit is contained in:
commit
ce82ddb9f9
@ -956,6 +956,7 @@ class Attachment(models.Model):
|
||||
mimetypes.guess_type(self.filename, strict=False)[0] or \
|
||||
'application/octet-stream'
|
||||
|
||||
|
||||
return super(Attachment, self).save(*args, **kwargs)
|
||||
|
||||
def get_filename(self):
|
||||
|
15
helpdesk/tests/test_files/all-special-chars.eml
Normal file
15
helpdesk/tests/test_files/all-special-chars.eml
Normal file
@ -0,0 +1,15 @@
|
||||
To: helpdesk@auto-mat.cz
|
||||
From: Timothy Hobbs <timothy.hobbs@auto-mat.cz>
|
||||
Subject: =?UTF-8?B?VGVzdG92w6Fjw60gZW1haWw=?=
|
||||
Openpgp: preference=signencrypt
|
||||
Message-ID: <0fd7067e-2842-5b6c-3548-3cf7e6a1c9ea@auto-mat.cz>
|
||||
Date: Fri, 8 Mar 2019 23:40:04 +0100
|
||||
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
|
||||
Thunderbird/60.4.0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
Content-Language: en-US
|
||||
|
||||
íářčšáíéřášč
|
||||
|
@ -56,7 +56,7 @@ class GetEmailCommonTests(TestCase):
|
||||
self.assertEqual(ticket.title, "FollowUpAttachment without body")
|
||||
self.assertEqual(ticket.description, "")
|
||||
|
||||
def test_email_with_blank_body_and_attachment(self):
|
||||
def test_email_with_quoted_printable_body(self):
|
||||
"""
|
||||
Tests that emails with quoted-printable bodies work.
|
||||
"""
|
||||
@ -73,6 +73,17 @@ class GetEmailCommonTests(TestCase):
|
||||
attachment = attachments[0]
|
||||
self.assertEqual(attachment.file.read().decode("utf-8"), '<div dir="ltr">Tohle je test českých písmen odeslaných z gmailu.</div>\n')
|
||||
|
||||
def test_email_with_8bit_encoding_and_utf_8(self):
|
||||
"""
|
||||
Tests that emails with 8bit transfer encoding and utf-8 charset
|
||||
https://github.com/django-helpdesk/django-helpdesk/issues/732
|
||||
"""
|
||||
with open(os.path.join(THIS_DIR, "test_files/all-special-chars.eml")) as fd:
|
||||
test_email = fd.read()
|
||||
ticket = helpdesk.email.object_from_message(test_email, self.queue_public, self.logger)
|
||||
self.assertEqual(ticket.title, "Testovácí email")
|
||||
self.assertEqual(ticket.description, "íářčšáíéřášč")
|
||||
|
||||
|
||||
class GetEmailParametricTemplate(object):
|
||||
"""TestCase that checks basic email functionality across methods and socks configs."""
|
||||
|
Loading…
Reference in New Issue
Block a user