Fixing tests

1 files changed, 13 insertions, 22 deletions

diff --git a/service/test/user_agent_test.py b/service/test/user_agent_test.py
index 2ae4c97d..d5432cbd 100644
--- a/service/test/user_agent_test.py
+++ b/service/test/user_agent_test.py
@@ -19,6 +19,8 @@ import pixelated.user_agent
 from pixelated.adapter.pixelated_mail import PixelatedMail
 from pixelated.adapter.pixelated_mail import InputMail
 from mockito import *
+import test.adapter.test_helper as test_helper
+import json
 import pixelated.adapter.pixelated_mail
 
 
@@ -30,44 +32,33 @@ class UserAgentTest(unittest.TestCase):
 
         pixelated.user_agent.DISABLED_FEATURES = []
         pixelated.user_agent.mail_service = self.mail_service
+        self.input_mail = None
+        pixelated.adapter.pixelated_mail.input_mail_from_dict = lambda x: self.input_mail
 
     def test_create_or_send_draft_should_create_draft_if_mail_has_no_ident(self):
-        mail = self.draft()
-        InputMail.from_dict = mock(return_value=mail)  # has no ident
+        self.input_mail = self.draft()
 
         self.app.post('/mails', data='{}', content_type="application/json")
 
-        verify(self.mail_service).create_draft(mail)
+        verify(self.mail_service).create_draft(self.input_mail)
 
-    @unittest.expectedFailure
     def test_create_or_send_draft_should_send_draft_if_mail_has_ident(self):
-        mail = self.mail_with_ident()
-        pixelated.adapter.pixelated_mail.from_dict = lambda x: mail  # does have ident
+        self.input_mail = self.draft()
 
         self.app.post('/mails', data='{"ident":1}', content_type="application/json")
 
-        verify(self.mail_service).send_draft(mail)
+        verify(self.mail_service).send_draft(self.input_mail)
 
     def test_update_draft(self):
-        mail = self.draft()
-        when(InputMail).from_dict().thenReturn(mail)
-        when(self.mail_service).update_draft().thenReturn(mail)
+        self.input_mail = self.draft()
+
+        when(self.mail_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, mail)
+        verify(self.mail_service).update_draft(1, self.input_mail)
 
-    def mail_without_ident(self):
-        mail = PixelatedMail()
-        mail.ident = ''
-        return mail
 
-    def mail_with_ident(self):
-        mail = PixelatedMail()
-        mail.ident = 1
-        return mail
 
     def draft(self):
-        mail = InputMail()
-        mail.ident = 1
-        return mail
+        return test_helper.input_mail()