From 8e57412dcd7fe8749ebed645e048309618ed01b5 Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Thu, 18 Dec 2014 14:36:10 -0200 Subject: \#203 & #204 & #205: fixing client and api for buld mark as read/unread and delete, functional tests are still broken, investigating... --- service/test/integration/delete_mail_test.py | 2 +- service/test/integration/mark_as_read_unread_test.py | 4 ++-- service/test/support/integration/soledad_test_base.py | 10 +--------- service/test/unit/controllers/mails_controller_test.py | 15 +++++++++------ 4 files changed, 13 insertions(+), 18 deletions(-) (limited to 'service/test') diff --git a/service/test/integration/delete_mail_test.py b/service/test/integration/delete_mail_test.py index 28f55840..5a3a97fb 100644 --- a/service/test/integration/delete_mail_test.py +++ b/service/test/integration/delete_mail_test.py @@ -41,7 +41,7 @@ class DeleteMailTest(SoledadTestBase): def test_delete_mail_when_trashing_mail_from_trash_mailbox(self): mails = self.client.add_multiple_to_mailbox(1, 'trash') - self.delete_mail(mails[0].ident) + self.delete_mails([mails[0].ident]) trash_mails = self.get_mails_by_tag('trash') diff --git a/service/test/integration/mark_as_read_unread_test.py b/service/test/integration/mark_as_read_unread_test.py index 55467e9e..03da404f 100644 --- a/service/test/integration/mark_as_read_unread_test.py +++ b/service/test/integration/mark_as_read_unread_test.py @@ -33,7 +33,7 @@ class MarkAsReadUnreadTest(SoledadTestBase): mails = self.get_mails_by_tag('inbox') self.assertNotIn('read', mails[0].status) - self.mark_as_read(input_mail.ident) + self.mark_many_as_read([input_mail.ident]) mails = self.get_mails_by_tag('inbox') self.assertIn('read', mails[0].status) @@ -42,7 +42,7 @@ class MarkAsReadUnreadTest(SoledadTestBase): input_mail = MailBuilder().with_status([Status.SEEN]).build_input_mail() self.client.add_mail_to_inbox(input_mail) - self.mark_as_unread(input_mail.ident) + self.mark_many_as_unread([input_mail.ident]) mail = self.get_mails_by_tag('inbox')[0] self.assertNotIn('read', mail.status) diff --git a/service/test/support/integration/soledad_test_base.py b/service/test/support/integration/soledad_test_base.py index a000349e..6368d3e8 100644 --- a/service/test/support/integration/soledad_test_base.py +++ b/service/test/support/integration/soledad_test_base.py @@ -71,15 +71,7 @@ class SoledadTestBase(unittest.TestCase): return req def delete_mails(self, idents): - res, req = self.client.delete("/mails", json.dumps({'idents': idents})) - return req - - def mark_as_read(self, mail_ident): - res, req = self.client.post("/mail/%s/read" % mail_ident) - return req - - def mark_as_unread(self, mail_ident): - res, req = self.client.post("/mail/%s/unread" % mail_ident) + res, req = self.client.post("/mails/delete", json.dumps({'idents': idents})) return req def mark_many_as_unread(self, idents): diff --git a/service/test/unit/controllers/mails_controller_test.py b/service/test/unit/controllers/mails_controller_test.py index ab87c205..c9c2c7cf 100644 --- a/service/test/unit/controllers/mails_controller_test.py +++ b/service/test/unit/controllers/mails_controller_test.py @@ -15,6 +15,7 @@ # along with Pixelated. If not, see . import json import unittest +from io import BytesIO from klein.test_resource import requestMock from mock import MagicMock @@ -77,22 +78,24 @@ class TestMailsController(unittest.TestCase): def test_marking_mail_as_read_set_mail_as_read_on_the_service(self): mail = mock() - when(self.mail_service).mark_as_read(1).thenReturn(mail) + when(self.mail_service).mark_as_read("1").thenReturn(mail) when(self.search_engine).index_mail(mail).thenReturn(None) + self.dummy_request.content = BytesIO('{"idents":["1"]}') - self.mails_controller.mark_mail_as_read(None, 1) + self.mails_controller.mark_many_mail_read(self.dummy_request) - verify(self.mail_service).mark_as_read(1) + verify(self.mail_service).mark_as_read(u'1') verify(self.search_engine).index_mail(mail) def test_marking_mail_as_unread_set_mail_as_unread_on_the_service(self): mail = mock() - when(self.mail_service).mark_as_unread(1).thenReturn(mail) + when(self.mail_service).mark_as_unread("1").thenReturn(mail) when(self.search_engine).index_mail(mail).thenReturn(None) + self.dummy_request.content = BytesIO('{"idents":["1"]}') - self.mails_controller.mark_mail_as_unread(None, 1) + self.mails_controller.mark_many_mail_unread(self.dummy_request) - verify(self.mail_service).mark_as_unread(1) + verify(self.mail_service).mark_as_unread(u'1') verify(self.search_engine).index_mail(mail) def test_move_message_to_trash(self): -- cgit v1.2.3