vintasoftware
\n join date: Aug. 22, 2016\n' + u'\n Thanks, you rock!\n') + + +ESCAPED_HTML_RESULT = (u'Hi Foo Bar,
You just signed up for my website, ' + u'using:
Thanks, you rock!
') + +NON_ESCAPED_SUBJECT_RESULT = 'My subject forvintasoftware
' + TXT_FILE = 'test' @@ -72,43 +84,52 @@ def test_inexistent_base_email(self): try: self.backend._render_email('inexistent_base.email', {}) except TemplateDoesNotExist as e: - self.assertEquals(e.args[0], 'foo') + self.assertEqual(e.args[0], 'foo') def test_inexistent_template_email(self): try: self.backend._render_email('foo', {}) except TemplateDoesNotExist as e: - self.assertEquals(e.args[0], 'templated_email/foo.email') + self.assertEqual(e.args[0], 'templated_email/foo.email') def test_render_plain_email(self): response = self.backend._render_email( 'plain_template.email', self.context) - self.assertEquals(len(response.keys()), 2) - self.assertEquals(PLAIN_RESULT, response['plain']) - self.assertEquals(SUBJECT_RESULT, response['subject']) + self.assertEqual(len(response.keys()), 2) + self.assertEqual(PLAIN_RESULT, response['plain']) + self.assertEqual(SUBJECT_RESULT, response['subject']) def test_render_html_email(self): response = self.backend._render_email( 'html_template.email', self.context) - self.assertEquals(len(response.keys()), 2) + self.assertEqual(len(response.keys()), 2) self.assertHTMLEqual(HTML_RESULT, response['html']) - self.assertEquals(SUBJECT_RESULT, response['subject']) + self.assertEqual(SUBJECT_RESULT, response['subject']) def test_render_mixed_email(self): response = self.backend._render_email( 'mixed_template.email', self.context) - self.assertEquals(len(response.keys()), 3) + self.assertEqual(len(response.keys()), 3) self.assertHTMLEqual(HTML_RESULT, response['html']) - self.assertEquals(PLAIN_RESULT, response['plain']) - self.assertEquals(SUBJECT_RESULT, response['subject']) + self.assertEqual(PLAIN_RESULT, response['plain']) + self.assertEqual(SUBJECT_RESULT, response['subject']) def test_render_inheritance_email(self): response = self.backend._render_email( 'inheritance_template.email', self.context) - self.assertEquals(len(response.keys()), 3) + self.assertEqual(len(response.keys()), 3) self.assertHTMLEqual(INHERITANCE_RESULT, response['html']) - self.assertEquals(PLAIN_RESULT, response['plain']) - self.assertEquals('Another subject for vintasoftware', response['subject']) + self.assertEqual(PLAIN_RESULT, response['plain']) + self.assertEqual('Another subject for vintasoftware', response['subject']) + + def test_email_text_escaping(self): + self.context['username'] = 'vintasoftware
' + + response = self.backend._render_email( + 'mixed_template.email', self.context) + self.assertHTMLEqual(ESCAPED_HTML_RESULT, response['html']) + self.assertEqual(NON_ESCAPED_PLAIN_RESULT, response['plain']) + self.assertEqual(NON_ESCAPED_SUBJECT_RESULT, response['subject']) @patch.object( template_backend_klass, '_render_email', @@ -120,12 +141,12 @@ def test_get_email_message(self, mock): from_email='from@example.com', cc=['cc@example.com'], bcc=['bcc@example.com'], to=['to@example.com']) self.assertTrue(isinstance(message, EmailMessage)) - self.assertEquals(message.body, PLAIN_RESULT) - self.assertEquals(message.subject, SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.body, PLAIN_RESULT) + self.assertEqual(message.subject, SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @patch.object( template_backend_klass, '_render_email', @@ -145,7 +166,7 @@ def test_get_email_message_with_create_link(self, mocked): self.assertEqual(len(second_call_context), 0) saved_email = SavedEmail.objects.get( uuid=uuid) - self.assertEquals(saved_email.content, HTML_RESULT) + self.assertEqual(saved_email.content, HTML_RESULT) @patch.object( template_backend_klass, '_render_email', @@ -188,12 +209,12 @@ def test_get_email_message_without_subject(self, mock): from_email='from@example.com', cc=['cc@example.com'], bcc=['bcc@example.com'], to=['to@example.com']) self.assertTrue(isinstance(message, EmailMessage)) - self.assertEquals(message.body, PLAIN_RESULT) - self.assertEquals(message.subject, 'foo') - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.body, PLAIN_RESULT) + self.assertEqual(message.subject, 'foo') + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @override_settings(TEMPLATED_EMAIL_DJANGO_SUBJECTS={'foo.email': 'foo\r\n'}) @@ -207,12 +228,12 @@ def test_get_email_message_without_subject_multiple_templates(self, mock): from_email='from@example.com', cc=['cc@example.com'], bcc=['bcc@example.com'], to=['to@example.com']) self.assertTrue(isinstance(message, EmailMessage)) - self.assertEquals(message.body, PLAIN_RESULT) - self.assertEquals(message.subject, 'foo') - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.body, PLAIN_RESULT) + self.assertEqual(message.subject, 'foo') + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @patch.object( template_backend_klass, '_render_email', @@ -225,13 +246,13 @@ def test_get_email_message_generated_plain_text(self, mock): bcc=['bcc@example.com'], to=['to@example.com']) self.assertTrue(isinstance(message, EmailMultiAlternatives)) self.assertHTMLEqual(message.alternatives[0][0], HTML_RESULT) - self.assertEquals(message.alternatives[0][1], 'text/html') - self.assertEquals(message.body, GENERATED_PLAIN_RESULT) - self.assertEquals(message.subject, SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.alternatives[0][1], 'text/html') + self.assertEqual(message.body, GENERATED_PLAIN_RESULT) + self.assertEqual(message.subject, SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @patch.object( template_backend_klass, '_render_email', @@ -240,43 +261,43 @@ def test_get_email_message_generated_plain_text(self, mock): @override_settings(TEMPLATED_EMAIL_PLAIN_FUNCTION=lambda x: 'hi') def test_get_email_message_custom_func_generated_plain_text(self, mock): message = self.backend.get_email_message('foo.email', {}) - self.assertEquals(message.body, 'hi') + self.assertEqual(message.body, 'hi') def test_get_multi_match_last_email_message_generated_plain_text(self): message = self.backend.get_email_message( ['multi-template.email', 'foo.email', ], {}, from_email='from@example.com', cc=['cc@example.com'], bcc=['bcc@example.com'], to=['to@example.com']) - self.assertEquals(message.body, MULTI_TEMPLATE_PLAIN_RESULT) - self.assertEquals(message.subject, MULTI_TEMPLATE_SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.body, MULTI_TEMPLATE_PLAIN_RESULT) + self.assertEqual(message.subject, MULTI_TEMPLATE_SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') def test_get_multi_first_match_email_message_generated_plain_text(self): message = self.backend.get_email_message( ['foo.email', 'multi-template.email', ], {}, from_email='from@example.com', cc=['cc@example.com'], bcc=['bcc@example.com'], to=['to@example.com']) - self.assertEquals(message.body, MULTI_TEMPLATE_PLAIN_RESULT) - self.assertEquals(message.subject, MULTI_TEMPLATE_SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.body, MULTI_TEMPLATE_PLAIN_RESULT) + self.assertEqual(message.subject, MULTI_TEMPLATE_SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') def test_get_multi_options_select_last_plain_only(self): message = self.backend.get_email_message( ['non-existing.email', 'also-non-existing.email', 'non-existing-without-suffix', 'foo.email', 'multi-template.email', ], {}, from_email='from@example.com', cc=['cc@example.com'], bcc=['bcc@example.com'], to=['to@example.com']) - self.assertEquals(message.body, MULTI_TEMPLATE_PLAIN_RESULT) - self.assertEquals(message.subject, MULTI_TEMPLATE_SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.body, MULTI_TEMPLATE_PLAIN_RESULT) + self.assertEqual(message.subject, MULTI_TEMPLATE_SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @patch.object( template_backend_klass, '_render_email', @@ -290,13 +311,13 @@ def test_get_email_message_with_plain_and_html(self, mock): bcc=['bcc@example.com'], to=['to@example.com']) self.assertTrue(isinstance(message, EmailMultiAlternatives)) self.assertHTMLEqual(message.alternatives[0][0], HTML_RESULT) - self.assertEquals(message.alternatives[0][1], 'text/html') - self.assertEquals(message.body, PLAIN_RESULT) - self.assertEquals(message.subject, SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.alternatives[0][1], 'text/html') + self.assertEqual(message.body, PLAIN_RESULT) + self.assertEqual(message.subject, SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @patch.object( template_backend_klass, '_render_email', @@ -335,12 +356,12 @@ def test_get_email_message_html_only(self, mock): bcc=['bcc@example.com'], to=['to@example.com']) self.assertTrue(isinstance(message, EmailMessage)) self.assertHTMLEqual(message.body, HTML_RESULT) - self.assertEquals(message.content_subtype, 'html') - self.assertEquals(message.subject, SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com']) - self.assertEquals(message.cc, ['cc@example.com']) - self.assertEquals(message.bcc, ['bcc@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.content_subtype, 'html') + self.assertEqual(message.subject, SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com']) + self.assertEqual(message.cc, ['cc@example.com']) + self.assertEqual(message.bcc, ['bcc@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @patch.object( template_backend_klass, '_render_email', @@ -351,17 +372,17 @@ def test_send(self, render_mock): ret = self.backend.send('mixed_template', 'from@example.com', ['to@example.com', 'to2@example.com'], {}, headers={'Message-Id': 'a_message_id'}) - self.assertEquals(ret, 'a_message_id') - self.assertEquals(len(mail.outbox), 1) + self.assertEqual(ret, 'a_message_id') + self.assertEqual(len(mail.outbox), 1) message = mail.outbox[0] - self.assertEquals(ret, message.extra_headers['Message-Id']) + self.assertEqual(ret, message.extra_headers['Message-Id']) self.assertTrue(isinstance(message, EmailMultiAlternatives)) self.assertHTMLEqual(message.alternatives[0][0], HTML_RESULT) - self.assertEquals(message.alternatives[0][1], 'text/html') - self.assertEquals(message.body, PLAIN_RESULT) - self.assertEquals(message.subject, SUBJECT_RESULT) - self.assertEquals(message.to, ['to@example.com', 'to2@example.com']) - self.assertEquals(message.from_email, 'from@example.com') + self.assertEqual(message.alternatives[0][1], 'text/html') + self.assertEqual(message.body, PLAIN_RESULT) + self.assertEqual(message.subject, SUBJECT_RESULT) + self.assertEqual(message.to, ['to@example.com', 'to2@example.com']) + self.assertEqual(message.from_email, 'from@example.com') @patch.object( template_backend_klass, 'get_email_message' @@ -425,8 +446,8 @@ def test_send_attachment_mime_base(self, render_mock): ['to@example.com', 'to2@example.com'], {}, attachments=[MIMEImage(TXT_FILE, 'text/plain')]) attachment = mail.outbox[0].attachments[0] - self.assertEquals(decode_b64_msg(attachment.get_payload()), - TXT_FILE) + self.assertEqual(decode_b64_msg(attachment.get_payload()), + TXT_FILE) @patch.object( template_backend_klass, '_render_email', @@ -438,8 +459,8 @@ def test_send_attachment_tripple(self, render_mock): ['to@example.com', 'to2@example.com'], {}, attachments=[('black_pixel.png', TXT_FILE, 'text/plain')]) attachment = mail.outbox[0].attachments[0] - self.assertEquals(('black_pixel.png', TXT_FILE, 'text/plain'), - attachment) + self.assertEqual(('black_pixel.png', TXT_FILE, 'text/plain'), + attachment) @patch.object( template_backend_klass, '_render_email', @@ -452,8 +473,8 @@ def test_get_email_message_attachment_mime_base(self, mock): bcc=['bcc@example.com'], to=['to@example.com'], attachments=[MIMEImage(TXT_FILE, 'text/plain')]) attachment = message.attachments[0] - self.assertEquals(decode_b64_msg(attachment.get_payload()), - TXT_FILE) + self.assertEqual(decode_b64_msg(attachment.get_payload()), + TXT_FILE) @patch.object( template_backend_klass, '_render_email', @@ -466,14 +487,14 @@ def test_get_email_message_attachment_tripple(self, mock): bcc=['bcc@example.com'], to=['to@example.com'], attachments=[('black_pixel.png', TXT_FILE, 'text/plain')]) attachment = message.attachments[0] - self.assertEquals(('black_pixel.png', TXT_FILE, 'text/plain'), - attachment) + self.assertEqual(('black_pixel.png', TXT_FILE, 'text/plain'), + attachment) def test_removal_of_legacy(self): try: self.backend._render_email('legacy', {}) except TemplateDoesNotExist as e: - self.assertEquals(e.args[0], 'templated_email/legacy.email') + self.assertEqual(e.args[0], 'templated_email/legacy.email') def test_host_inline_image_if_not_exist(self): inline_image = InlineImage('foo.jpg', b'bar') @@ -484,7 +505,7 @@ def test_host_inline_image_if_not_exist(self): self.assertEqual(filename, '/media/saved_url') self.storage_mock.save.assert_called_once() name, content = self.storage_mock.save.call_args[0] - self.assertEquals( + self.assertEqual( name, 'templated_email/37b51d194a7513e45b56f6524f2d51f2foo.jpg') self.assertTrue(isinstance(content, BytesIO)) diff --git a/tests/backends/utils.py b/tests/backends/utils.py index 313bc16..1f85ab2 100644 --- a/tests/backends/utils.py +++ b/tests/backends/utils.py @@ -6,17 +6,17 @@ class TempalteBackendBaseMixin(object): @override_settings(TEMPLATED_EMAIL_TEMPLATE_DIR='test_prefix') def test_uses_prefix_from_config(self): backend = self.template_backend_klass() - self.assertEquals(backend.template_prefix, 'test_prefix') + self.assertEqual(backend.template_prefix, 'test_prefix') @override_settings(TEMPLATED_EMAIL_FILE_EXTENSION='test_suffix') def test_uses_suffix_from_config(self): backend = self.template_backend_klass() - self.assertEquals(backend.template_suffix, 'test_suffix') + self.assertEqual(backend.template_suffix, 'test_suffix') def test_override_prefix_from_config(self): backend = self.template_backend_klass(template_prefix='test_prefix') - self.assertEquals(backend.template_prefix, 'test_prefix') + self.assertEqual(backend.template_prefix, 'test_prefix') def test_override_suffix_from_config(self): backend = self.template_backend_klass(template_suffix='test_suffix') - self.assertEquals(backend.template_suffix, 'test_suffix') + self.assertEqual(backend.template_suffix, 'test_suffix') diff --git a/tests/generic_views/test_views.py b/tests/generic_views/test_views.py index 56bd89b..168b8c9 100644 --- a/tests/generic_views/test_views.py +++ b/tests/generic_views/test_views.py @@ -24,11 +24,11 @@ def test_templated_email_get_template_names_raises_exception(self): def test_templated_email_get_template_names_with_template_name(self): self.mixin_object.templated_email_template_name = 'template_name' - self.assertEquals( + self.assertEqual( self.mixin_object.templated_email_get_template_names(valid=True), ['template_name'] ) - self.assertEquals( + self.assertEqual( self.mixin_object.templated_email_get_template_names(valid=False), ['template_name'] ) @@ -59,11 +59,11 @@ class FakeForm(object): form = FakeForm() kwargs = self.mixin_object.templated_email_get_send_email_kwargs( valid=True, form=form) - self.assertEquals(len(kwargs), 4) - self.assertEquals(kwargs['template_name'], ['template']) - self.assertEquals(kwargs['from_email'], None) - self.assertEquals(kwargs['recipient_list'], ['foo@example.com']) - self.assertEquals(kwargs['context'], {'form_data': 'foo'}) + self.assertEqual(len(kwargs), 4) + self.assertEqual(kwargs['template_name'], ['template']) + self.assertEqual(kwargs['from_email'], None) + self.assertEqual(kwargs['recipient_list'], ['foo@example.com']) + self.assertEqual(kwargs['context'], {'form_data': 'foo'}) @mock.patch.object(TemplatedEmailFormViewMixin, 'templated_email_get_template_names', @@ -80,11 +80,11 @@ class FakeForm(object): form = FakeForm() kwargs = self.mixin_object.templated_email_get_send_email_kwargs( valid=False, form=form) - self.assertEquals(len(kwargs), 4) - self.assertEquals(kwargs['template_name'], ['template']) - self.assertEquals(kwargs['from_email'], None) - self.assertEquals(kwargs['recipient_list'], ['foo@example.com']) - self.assertEquals(kwargs['context'], {'form_errors': 'errors foo'}) + self.assertEqual(len(kwargs), 4) + self.assertEqual(kwargs['template_name'], ['template']) + self.assertEqual(kwargs['from_email'], None) + self.assertEqual(kwargs['recipient_list'], ['foo@example.com']) + self.assertEqual(kwargs['context'], {'form_errors': 'errors foo'}) class TemplatedEmailFormViewMixinTestCase(MockedNetworkTestCaseMixin, TestCase): @@ -101,48 +101,48 @@ def setUp(self): def test_form_valid_with_send_on_success(self): response = AuthorCreateView.as_view()(self.good_request) - self.assertEquals(response.status_code, 302) - self.assertEquals(Author.objects.count(), 1) - self.assertEquals(len(mail.outbox), 1) - self.assertEquals(mail.outbox[0].alternatives[0][0].strip(), - 'Andre - author@vinta.com.br') + self.assertEqual(response.status_code, 302) + self.assertEqual(Author.objects.count(), 1) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].alternatives[0][0].strip(), + 'Andre - author@vinta.com.br') def test_form_valid_with_send_on_success_false(self): default_value = AuthorCreateView.templated_email_send_on_success AuthorCreateView.templated_email_send_on_success = False response = AuthorCreateView.as_view()(self.good_request) - self.assertEquals(response.status_code, 302) - self.assertEquals(Author.objects.count(), 1) - self.assertEquals(len(mail.outbox), 0) + self.assertEqual(response.status_code, 302) + self.assertEqual(Author.objects.count(), 1) + self.assertEqual(len(mail.outbox), 0) AuthorCreateView.templated_email_send_on_success = default_value def test_form_invalid_with_not_send_on_failure(self): response = AuthorCreateView.as_view()(self.bad_request) - self.assertEquals(response.status_code, 200) - self.assertEquals(Author.objects.count(), 0) - self.assertEquals(len(mail.outbox), 0) + self.assertEqual(response.status_code, 200) + self.assertEqual(Author.objects.count(), 0) + self.assertEqual(len(mail.outbox), 0) def test_form_invalid_with_send_on_failure(self): default_value = AuthorCreateView.templated_email_send_on_failure AuthorCreateView.templated_email_send_on_failure = True response = AuthorCreateView.as_view()(self.bad_request) - self.assertEquals(response.status_code, 200) - self.assertEquals(Author.objects.count(), 0) - self.assertEquals(len(mail.outbox), 1) - self.assertEquals(mail.outbox[0].alternatives[0][0].strip(), - '* Enter a valid email address.') + self.assertEqual(response.status_code, 200) + self.assertEqual(Author.objects.count(), 0) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].alternatives[0][0].strip(), + '* Enter a valid email address.') AuthorCreateView.templated_email_send_on_failure = default_value @override_settings(TEMPLATED_EMAIL_FROM_EMAIL='from@vinta.com.br') def test_from_email(self): AuthorCreateView.as_view()(self.good_request) - self.assertEquals(len(mail.outbox), 1) - self.assertEquals(mail.outbox[0].from_email, 'from@vinta.com.br') + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].from_email, 'from@vinta.com.br') def test_from_email_with_templated_email_from_email(self): default_value = AuthorCreateView.templated_email_from_email AuthorCreateView.templated_email_from_email = 'from2@vinta.com.br' AuthorCreateView.as_view()(self.good_request) - self.assertEquals(len(mail.outbox), 1) - self.assertEquals(mail.outbox[0].from_email, 'from2@vinta.com.br') + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].from_email, 'from2@vinta.com.br') AuthorCreateView.templated_email_from_email = default_value diff --git a/tests/test_inline_image.py b/tests/test_inline_image.py index f6f0408..85635d7 100644 --- a/tests/test_inline_image.py +++ b/tests/test_inline_image.py @@ -30,4 +30,4 @@ def test_cid_in_message(self): def test_image_in_attachments(self): mimage = self.message.attachments[0] attachment_content = base64.b64encode(mimage.get_payload(decode=True)) - self.assertEquals(attachment_content.decode(), imageb64) + self.assertEqual(attachment_content.decode(), imageb64) diff --git a/tests/test_urls.py b/tests/test_urls.py index c91a2b2..4b20eda 100644 --- a/tests/test_urls.py +++ b/tests/test_urls.py @@ -1,5 +1,6 @@ -from django.conf.urls import url, include +from django.conf.urls import include +from django.urls import re_path urlpatterns = [ - url(r'^', include('templated_email.urls', namespace='templated_email')), + re_path(r'^', include('templated_email.urls', namespace='templated_email')), ] diff --git a/tests/test_utils.py b/tests/test_utils.py index 4dc015b..10d80ae 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -48,7 +48,7 @@ def test_attach_to_message(self): message = mock.Mock() self.inline_image.attach_to_message(message) mimeimage = message.attach.call_args[0][0] - self.assertEquals(mimeimage.get('Content-ID'), - self.inline_image._content_id) - self.assertEquals(mimeimage.get('Content-Disposition'), - 'inline; filename="foo.png"') + self.assertEqual(mimeimage.get('Content-ID'), + self.inline_image._content_id) + self.assertEqual(mimeimage.get('Content-Disposition'), + 'inline; filename="foo.png"') diff --git a/tests/test_views.py b/tests/test_views.py index 815ffa2..f5358a1 100644 --- a/tests/test_views.py +++ b/tests/test_views.py @@ -1,8 +1,8 @@ import uuid +from django.urls import reverse from django.test import TestCase from django.test import Client -from django.core.urlresolvers import reverse from templated_email.models import SavedEmail @@ -18,24 +18,24 @@ def setUp(self): def test_get(self): response = self.client.get(self.url) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_get_hex(self): response = self.client.get(self.url_hex) - self.assertEquals(response.status_code, 200) + self.assertEqual(response.status_code, 200) def test_get_non_valid(self): response = self.client.get('/email/bar/') - self.assertEquals(response.status_code, 404) + self.assertEqual(response.status_code, 404) def test_url(self): - self.assertEquals( + self.assertEqual( reverse('templated_email:show_email', kwargs={'uuid': self.saved_email.uuid}), self.url) def test_url_hex(self): - self.assertEquals( + self.assertEqual( reverse('templated_email:show_email', kwargs={'uuid': self.saved_email.uuid.hex}), self.url_hex) diff --git a/tox-requirements.txt b/tox-requirements.txt index fdd9d31..871945f 100644 --- a/tox-requirements.txt +++ b/tox-requirements.txt @@ -1,10 +1,9 @@ -django-anymail==3.0 -django-pytest==0.2.0 -django-render-block==0.5 -html2text==2016.5.29 -mock==2.0.0 -pytest==4.1.0 -pytest-django==3.4.5 -pytest-pythonpath==0.7.3 -six==1.10.0 -tox==2.3.1 +django-anymail +django-pytest +django-render-block +html2text +mock +pytest +pytest-django +pytest-pythonpath +tox diff --git a/tox.ini b/tox.ini index f75f5dd..342c95b 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,8 @@ [tox] envlist = - py27-{flake8}, - {py27,py34,py35,py36}-django18, - {py27,py34,py35,py36}-django{19}, - {py27,py34,py35,py36}-django{110} - {py27,py34,py35,py36}-django{111} + py36-{flake8}, + {py36,py37,py38,py39}-django{22,31,32}, + {py38,py39}-djangomain, [testenv] @@ -13,12 +11,12 @@ commands= deps= -rtox-requirements.txt pytest-cov - django18: Django==1.8.14 - django19: Django==1.9.9 - django110: Django==1.10 - django111: Django==1.11 + django22: Django==2.2 + django31: Django==3.1 + django32: Django==3.2 + djangomain: https://github.com/django/django/archive/main.tar.gz -[testenv:py27-flake8] +[testenv:py36-flake8] commands = flake8 templated_email tests --ignore=E501 deps = flake8