From 28c885bf47b9249f95aeb875f5f558911b2193c2 Mon Sep 17 00:00:00 2001 From: Lisa Junger Date: Tue, 6 Jan 2015 11:45:04 +0100 Subject: Issue #135: Removed dead code. --- service/pixelated/adapter/services/mail_service.py | 4 ---- service/pixelated/controllers/mails_controller.py | 4 ---- service/test/unit/adapter/mail_service_test.py | 8 -------- service/test/unit/controllers/mails_controller_test.py | 7 ------- 4 files changed, 23 deletions(-) diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index cb92228c..b828222b 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -62,7 +62,3 @@ class MailService: def delete_permanent(self, mail_id): mail = self.mail(mail_id) self.querier.remove_mail(mail) - - def reply_all_template(self, mail_id): - mail = self.mail(mail_id) - return mail.to_reply_template() diff --git a/service/pixelated/controllers/mails_controller.py b/service/pixelated/controllers/mails_controller.py index dfd1c73b..fb9c9adc 100644 --- a/service/pixelated/controllers/mails_controller.py +++ b/service/pixelated/controllers/mails_controller.py @@ -119,10 +119,6 @@ class MailsController: self._search_engine.index_mail(pixelated_mail) return respond_json({'ident': pixelated_mail.ident}, request) - def reply_all_template(self, request, mail_id): - mail = self._mail_service.reply_all_template(mail_id) - return respond_json(mail, request) - def _format_exception(self, exception): exception_info = map(str, list(exception.args)) return '\n'.join(exception_info) diff --git a/service/test/unit/adapter/mail_service_test.py b/service/test/unit/adapter/mail_service_test.py index 6f80c043..fca6e79b 100644 --- a/service/test/unit/adapter/mail_service_test.py +++ b/service/test/unit/adapter/mail_service_test.py @@ -49,11 +49,3 @@ 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/controllers/mails_controller_test.py b/service/test/unit/controllers/mails_controller_test.py index c9c2c7cf..8108bc19 100644 --- a/service/test/unit/controllers/mails_controller_test.py +++ b/service/test/unit/controllers/mails_controller_test.py @@ -116,13 +116,6 @@ 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.as_dict = lambda: self.input_mail.json -- cgit v1.2.3