From f273d2abeefa0d77d306bcfab3135195afbc31c3 Mon Sep 17 00:00:00 2001 From: Lisa Junger Date: Wed, 19 Nov 2014 10:44:08 +0100 Subject: added functionality for reply all to service. --- service/test/unit/adapter/mail_service_test.py | 8 ++++++++ service/test/unit/adapter/mail_test.py | 9 +++++++++ service/test/unit/controllers/mails_controller_test.py | 7 +++++++ 3 files changed, 24 insertions(+) (limited to 'service/test/unit') diff --git a/service/test/unit/adapter/mail_service_test.py b/service/test/unit/adapter/mail_service_test.py index c69f8f74..e5085724 100644 --- a/service/test/unit/adapter/mail_service_test.py +++ b/service/test/unit/adapter/mail_service_test.py @@ -49,3 +49,11 @@ class TestMailService(unittest.TestCase): self.mail_service.delete_mail(1) verify(self.mailboxes).move_to_trash(1) + + def test_reply_all_template(self): + mail = mock() + when(self.mail_service).mail(1).thenReturn(mail) + + self.mail_service.reply_all_template(1) + + verify(mail).to_reply_template() diff --git a/service/test/unit/adapter/mail_test.py b/service/test/unit/adapter/mail_test.py index e0879b44..cf821035 100644 --- a/service/test/unit/adapter/mail_test.py +++ b/service/test/unit/adapter/mail_test.py @@ -125,6 +125,15 @@ class TestPixelatedMail(unittest.TestCase): self.assertNotIn('\n', address) self.assertNotIn(',', address) self.assertEquals(4, len(mail.headers[header_label])) + def test_to_reply_template_removes_user_from_to(self): + InputMail.FROM_EMAIL_ADDRESS = 'user@pixelated.org' + fdoc, hdoc, bdoc = test_helper.leap_mail(flags=['\\Recent']) + mail = PixelatedMail.from_soledad(fdoc, hdoc, bdoc, soledad_querier=self.querier) + hdoc.content['headers']['To'] = ['me@pixelated.org', 'user@pixelated.org'] + + template = mail.to_reply_template() + + self.assertFalse('user@pixelated.org' in template['header']['to'][0]) def test_content_type_is_read_from_headers_for_plain_mail_when_converted_to_raw(self): fdoc, hdoc, bdoc = test_helper.leap_mail(flags=['\\Recent'], body=u'some umlaut \xc3', extra_headers={'Content-Type': 'text/plain; charset=ISO-8859-1'}) diff --git a/service/test/unit/controllers/mails_controller_test.py b/service/test/unit/controllers/mails_controller_test.py index 6d566c83..c5234039 100644 --- a/service/test/unit/controllers/mails_controller_test.py +++ b/service/test/unit/controllers/mails_controller_test.py @@ -113,6 +113,13 @@ class TestMailsController(unittest.TestCase): verify(self.mail_service).delete_permanent(1) + def test_reply_all_returns_template(self): + when(self.mail_service).reply_all_template(1).thenReturn(self.input_mail.json) + + self.mails_controller.reply_all_template(self.dummy_request, 1) + + verify(self.mail_service).reply_all_template(1) + def _successfuly_send_mail(self, ident, mail): sent_mail = mock() sent_mail.mailbox_name = 'TRASH' -- cgit v1.2.3