forked from mirror/django-mailbox
Switch from nose to py.test.
This commit is contained in:
parent
7bb816b9ce
commit
b4a3cdc843
11 changed files with 140 additions and 156 deletions
|
|
@ -1,6 +0,0 @@
|
|||
from .test_mailbox import *
|
||||
from .test_message_flattening import *
|
||||
from .test_process_email import *
|
||||
from .test_transports import *
|
||||
from .test_integration_imap import *
|
||||
from .test_settings import *
|
||||
|
|
@ -7,7 +7,7 @@ import six
|
|||
from django.conf import settings
|
||||
from django.test import TestCase
|
||||
|
||||
from django_mailbox import models
|
||||
from django_mailbox import models, utils
|
||||
from django_mailbox.models import Mailbox, Message
|
||||
|
||||
|
||||
|
|
@ -34,9 +34,13 @@ class EmailMessageTestCase(TestCase):
|
|||
]
|
||||
|
||||
def setUp(self):
|
||||
self._ALLOWED_MIMETYPES = models.ALLOWED_MIMETYPES
|
||||
self._STRIP_UNALLOWED_MIMETYPES = models.STRIP_UNALLOWED_MIMETYPES
|
||||
self._TEXT_STORED_MIMETYPES = models.TEXT_STORED_MIMETYPES
|
||||
dm_settings = utils.get_settings()
|
||||
|
||||
self._ALLOWED_MIMETYPES = dm_settings['allowed_mimetypes']
|
||||
self._STRIP_UNALLOWED_MIMETYPES = (
|
||||
dm_settings['strip_unallowed_mimetypes']
|
||||
)
|
||||
self._TEXT_STORED_MIMETYPES = dm_settings['text_stored_mimetypes']
|
||||
|
||||
self.mailbox = Mailbox.objects.create(from_email='from@example.com')
|
||||
|
||||
|
|
|
|||
11
django_mailbox/tests/settings.py
Normal file
11
django_mailbox/tests/settings.py
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
DATABASES = {
|
||||
'default': {
|
||||
'ENGINE': 'django.db.backends.sqlite3',
|
||||
},
|
||||
}
|
||||
INSTALLED_APPS = [
|
||||
'django.contrib.auth',
|
||||
'django.contrib.contenttypes',
|
||||
'django_mailbox',
|
||||
]
|
||||
SECRET_KEY = 'beepboop'
|
||||
|
|
@ -1,4 +1,8 @@
|
|||
from django_mailbox import models
|
||||
import copy
|
||||
|
||||
import mock
|
||||
|
||||
from django_mailbox import models, utils
|
||||
from django_mailbox.models import Message
|
||||
from django_mailbox.tests.base import EmailMessageTestCase
|
||||
|
||||
|
|
@ -74,10 +78,16 @@ class TestMessageFlattening(EmailMessageTestCase):
|
|||
expected_email_object = self._get_email_object(
|
||||
'message_with_many_multiparts_stripped_html.eml',
|
||||
)
|
||||
models.STRIP_UNALLOWED_MIMETYPES = True
|
||||
models.ALLOWED_MIMETYPES = ['text/plain']
|
||||
default_settings = utils.get_settings()
|
||||
|
||||
msg = self.mailbox.process_incoming_message(incoming_email_object)
|
||||
with mock.patch('django_mailbox.utils.get_settings') as get_settings:
|
||||
altered = copy.deepcopy(default_settings)
|
||||
altered['strip_unallowed_mimetypes'] = True
|
||||
altered['allowed_mimetypes'] = ['text/plain']
|
||||
|
||||
get_settings.return_value = altered
|
||||
|
||||
msg = self.mailbox.process_incoming_message(incoming_email_object)
|
||||
|
||||
actual_email_object = msg.get_email_object()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
from django.test import TestCase
|
||||
from django.conf import settings
|
||||
from django_mailbox.models import ATTACHMENT_UPLOAD_TO
|
||||
|
||||
|
||||
class TestSettings(TestCase):
|
||||
def test_default_attachment_upload_to(self):
|
||||
user_setting = getattr(settings, 'DJANGO_MAILBOX_ATTACHMENT_UPLOAD_TO', False)
|
||||
self.assertFalse(user_setting)
|
||||
self.assertEqual(ATTACHMENT_UPLOAD_TO, 'mailbox_attachments/%Y/%m/%d/')
|
||||
Loading…
Add table
Add a link
Reference in a new issue