Added whoosh as search engine (issue #94).

3 files changed, 9 insertions, 28 deletions

diff --git a/service/test/unit/adapter/mail_service_test.py b/service/test/unit/adapter/mail_service_test.py
index 549ab05c..21f34b12 100644
--- a/service/test/unit/adapter/mail_service_test.py
+++ b/service/test/unit/adapter/mail_service_test.py
@@ -47,13 +47,6 @@ class TestMailService(unittest.TestCase):
 
         verify(mail).mark_as_read()
 
-    def test_create_draft(self):
-        mail = ''
-
-        self.mail_service.create_draft(mail)
-
-        verify(self.mailboxes).add_draft(mail)
-
     def test_delete_mail(self):
         self.mail_service.delete_mail(1)
 
diff --git a/service/test/unit/adapter/pixelated_mailboxes_test.py b/service/test/unit/adapter/pixelated_mailboxes_test.py
index 8314f7f8..fce06a22 100644
--- a/service/test/unit/adapter/pixelated_mailboxes_test.py
+++ b/service/test/unit/adapter/pixelated_mailboxes_test.py
@@ -48,20 +48,3 @@ class PixelatedMailboxesTest(unittest.TestCase):
 
         self.assertEqual(1, len(mails))
         self.assertEqual("mail", mails[0])
-
-    def test_add_draft(self):
-        mail = InputMail()
-        when(self.drafts_mailbox).add(mail).thenReturn(1)
-
-        self.mailboxes.add_draft(mail)
-
-        verify(self.drafts_mailbox).add(mail)
-
-    def test_update_draft(self):
-        mail = test_helper.input_mail()
-        when(self.drafts_mailbox).add(mail).thenReturn(mail)
-
-        self.mailboxes.update_draft(mail.ident, mail)
-
-        inorder.verify(self.drafts_mailbox).add(mail)
-        inorder.verify(self.drafts_mailbox).remove(mail.ident)
diff --git a/service/test/unit/user_agent_test.py b/service/test/unit/user_agent_test.py
index 22199333..83a35246 100644
--- a/service/test/unit/user_agent_test.py
+++ b/service/test/unit/user_agent_test.py
@@ -35,10 +35,14 @@ class UserAgentTest(unittest.TestCase):
         self.app = pixelated.user_agent.app.test_client()
         self.mail_service = mock()
         self.tag_service = mock()
-        self.mail_service.tag_service = self.tag_service
+        self.draft_service = mock()
+        self.search_engine = mock()
 
         pixelated.user_agent.DISABLED_FEATURES = []
         pixelated.user_agent.mail_service = self.mail_service
+        pixelated.user_agent.tag_service = self.tag_service
+        pixelated.user_agent.draft_service = self.draft_service
+        pixelated.user_agent.search_engine = self.search_engine
         self.input_mail = None
         pixelated.adapter.pixelated_mail.input_mail_from_dict = lambda x: self.input_mail
 
@@ -50,7 +54,7 @@ class UserAgentTest(unittest.TestCase):
 
         self.app.post('/mails', data='{}', content_type="application/json")
 
-        verify(self.mail_service).create_draft(self.input_mail)
+        verify(self.draft_service).create_draft(self.input_mail)
 
     def test_create_or_send_draft_should_send_draft_if_mail_has_ident(self):
         self.input_mail = self.draft()
@@ -61,6 +65,7 @@ class UserAgentTest(unittest.TestCase):
 
     def test_sending_mail_return_sent_mail_data_when_send_succeeds(self):
         self.input_mail = self.draft()
+        when(self.mail_service).send(1, self.input_mail).thenReturn(self.input_mail)
         self.input_mail.as_dict = lambda: {'header': {'from': 'a@a.a', 'to': 'b@b.b'},
                                            'ident': 1,
                                            'tags': [],
@@ -89,11 +94,11 @@ class UserAgentTest(unittest.TestCase):
     def test_update_draft(self):
         self.input_mail = self.draft()
 
-        when(self.mail_service).update_draft(1, self.input_mail).thenReturn(self.input_mail)
+        when(self.draft_service).update_draft(1, self.input_mail).thenReturn(self.input_mail)
 
         self.app.put('/mails', data='{"ident":1}', content_type="application/json")
 
-        verify(self.mail_service).update_draft(1, self.input_mail)
+        verify(self.draft_service).update_draft(1, self.input_mail)
 
     def draft(self):
         return test_helper.input_mail()