diff options
author | Bruno Wagner <bwgpro@gmail.com> | 2015-06-05 19:36:08 -0300 |
---|---|---|
committer | Bruno Wagner <bwgpro@gmail.com> | 2015-06-05 19:36:08 -0300 |
commit | 103cb481bc46e9dc8c5ca047b460265b5d68ee32 (patch) | |
tree | acb7cf1395b879fcd9730766498415fce58d137f /service/test/unit/adapter | |
parent | a2886f31583722c5f08a965325156f8eb1e18509 (diff) |
Added creation of input mail from python message
That way we don't need extra logic for the welcome
mail, we just have to read the file and send the contents
to the input mail parser and that's it.
Also moved the logic of adding a welcome mail to the mailboxes
because it has knowledge of mailbox methods anyways.
Diffstat (limited to 'service/test/unit/adapter')
-rw-r--r-- | service/test/unit/adapter/test_draft_service.py | 2 | ||||
-rw-r--r-- | service/test/unit/adapter/test_mail_service.py | 6 | ||||
-rw-r--r-- | service/test/unit/adapter/test_mailboxes.py | 1 |
3 files changed, 5 insertions, 4 deletions
diff --git a/service/test/unit/adapter/test_draft_service.py b/service/test/unit/adapter/test_draft_service.py index 0dd6cd2a..79eca5f6 100644 --- a/service/test/unit/adapter/test_draft_service.py +++ b/service/test/unit/adapter/test_draft_service.py @@ -12,7 +12,7 @@ class DraftServiceTest(unittest.TestCase): self.mailboxes = mock() self.drafts_mailbox = mock() self.draft_service = DraftService(self.mailboxes) - when(self.mailboxes).drafts().thenReturn(self.drafts_mailbox) + self.mailboxes.drafts = self.drafts_mailbox def test_add_draft(self): mail = InputMail() diff --git a/service/test/unit/adapter/test_mail_service.py b/service/test/unit/adapter/test_mail_service.py index f4b89f57..f5e29b0c 100644 --- a/service/test/unit/adapter/test_mail_service.py +++ b/service/test/unit/adapter/test_mail_service.py @@ -27,9 +27,9 @@ class TestMailService(unittest.TestCase): self.drafts = mock() self.querier = mock() self.mailboxes = mock() - self.mailboxes.drafts = lambda: self.drafts - self.mailboxes.trash = lambda: mock() - self.mailboxes.sent = lambda: mock() + self.mailboxes.drafts = self.drafts + self.mailboxes.trash = mock() + self.mailboxes.sent = mock() self.mail_sender = mock() self.search_engine = mock() diff --git a/service/test/unit/adapter/test_mailboxes.py b/service/test/unit/adapter/test_mailboxes.py index 5b4548eb..6ff3849b 100644 --- a/service/test/unit/adapter/test_mailboxes.py +++ b/service/test/unit/adapter/test_mailboxes.py @@ -23,6 +23,7 @@ from mock import MagicMock class PixelatedMailboxesTest(unittest.TestCase): + def setUp(self): self.querier = mock() self.search_engine = mock() |