From 38d810d338ce671b6389cd47d665b87798bcd65c Mon Sep 17 00:00:00 2001 From: Folker Bernitt Date: Fri, 31 Jul 2015 17:04:25 +0200 Subject: First steps migrating mail service to new data model. --- service/test/unit/adapter/test_mailboxes.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'service/test/unit/adapter/test_mailboxes.py') diff --git a/service/test/unit/adapter/test_mailboxes.py b/service/test/unit/adapter/test_mailboxes.py index 081e47fb..814d36a1 100644 --- a/service/test/unit/adapter/test_mailboxes.py +++ b/service/test/unit/adapter/test_mailboxes.py @@ -17,7 +17,7 @@ import unittest from pixelated.adapter.model.mail import PixelatedMail from pixelated.adapter.services.mailboxes import Mailboxes -from mockito import mock, when, verify +from mockito import mock, when, verify, any as ANY from twisted.internet import defer from test.support import test_helper from mock import MagicMock @@ -27,15 +27,16 @@ class PixelatedMailboxesTest(unittest.TestCase): def setUp(self): self.querier = mock() + self.mail_store = mock() self.search_engine = mock() self.account = MagicMock() - self.mailboxes = Mailboxes(self.account, self.querier, self.search_engine) + self.mailboxes = Mailboxes(self.account, self.mail_store, self.querier, self.search_engine) @defer.inlineCallbacks def test_move_to_inbox(self): mail = PixelatedMail.from_soledad(*test_helper.leap_mail(), soledad_querier=self.querier) - when(self.querier).mail(1).thenReturn(mail) - when(mail).save().thenReturn(None) + when(self.mail_store).mail(1).thenReturn(defer.succeed(mail)) + when(self.mail_store).update_mail(ANY()).thenReturn(defer.succeed(None)) mail.set_mailbox('TRASH') recovered_mail = yield self.mailboxes.move_to_inbox(1) -- cgit v1.2.3