When adding draft, return the mail with the new draft id so the UI can update it later

5 files changed, 18 insertions, 12 deletions

diff --git a/service/test/adapter/mail_service_test.py b/service/test/adapter/mail_service_test.py
index 96359d30..782e891a 100644
--- a/service/test/adapter/mail_service_test.py
+++ b/service/test/adapter/mail_service_test.py
@@ -40,9 +40,8 @@ class TestMailService(unittest.TestCase):
         verify(mail).mark_as_read()
 
     def test_create_draft(self):
-        drafts_mailbox = mock()
-        when(self.mailboxes).drafts().thenReturn(drafts_mailbox)
+        mail = ''
 
-        self.mail_service.create_draft('a new draft')
+        self.mail_service.create_draft(mail)
 
-        verify(drafts_mailbox).add('a new draft')
+        verify(self.mailboxes).add_draft(mail)
diff --git a/service/test/adapter/pixelated_mail_sender_test.py b/service/test/adapter/pixelated_mail_sender_test.py
index 4bac327c..b41f1d0c 100644
--- a/service/test/adapter/pixelated_mail_sender_test.py
+++ b/service/test/adapter/pixelated_mail_sender_test.py
@@ -33,7 +33,7 @@ class PixelatedMailSenderTest(unittest.TestCase):
         mail_dict['header']['bcc'] = ['bcc@pixelated.org', 'anotherbcc@pixelated.org']
 
         mail = PixelatedMail.from_dict(mail_dict)
-        mail.to_smtp_format = lambda : "mail as smtp string"
+        mail.to_smtp_format = lambda: "mail as smtp string"
 
         self.mail_sender.sendmail(mail)
 
diff --git a/service/test/adapter/pixelated_mail_test.py b/service/test/adapter/pixelated_mail_test.py
index 922c147d..9eab3d2c 100644
--- a/service/test/adapter/pixelated_mail_test.py
+++ b/service/test/adapter/pixelated_mail_test.py
@@ -41,7 +41,7 @@ class TestPixelatedMail(unittest.TestCase):
 
         mail = PixelatedMail.from_leap_mail(leap_mail)
 
-        self.assertEqual(str(mail.date), leap_mail_date_in_iso_format)
+        self.assertEqual(str(mail.headers['date']), leap_mail_date_in_iso_format)
 
     def test_parse_date_from_leap_mail_fallback_to_received_header_if_date_header_isnt_available(self):
         leap_mail_date = "Wed, 03 Sep 2014 13:11:15 -0300"
@@ -52,7 +52,7 @@ class TestPixelatedMail(unittest.TestCase):
 
         mail = PixelatedMail.from_leap_mail(leap_mail)
 
-        self.assertEqual(str(mail.date), leap_mail_date_in_iso_format)
+        self.assertEqual(str(mail.headers['date']), leap_mail_date_in_iso_format)
 
     def test_from_dict(self):
         mail = PixelatedMail.from_dict(self.mail_dict)
diff --git a/service/test/adapter/pixelated_mailbox_test.py b/service/test/adapter/pixelated_mailbox_test.py
index bff6d6de..9ac4f53e 100644
--- a/service/test/adapter/pixelated_mailbox_test.py
+++ b/service/test/adapter/pixelated_mailbox_test.py
@@ -43,7 +43,6 @@ class TestPixelatedMailbox(unittest.TestCase):
         leap_mailbox_messages = mock()
         self.mailbox.leap_mailbox.messages = leap_mailbox_messages
 
-        self.mailbox.add(mail)
+        self.mailbox.add.wrapped_function(self.mailbox, mail)
 
         verify(leap_mailbox_messages).add_msg('the mail in smtp format')
-        
diff --git a/service/test/adapter/pixelated_mailboxes_test.py b/service/test/adapter/pixelated_mailboxes_test.py
index eebdc904..15606b51 100644
--- a/service/test/adapter/pixelated_mailboxes_test.py
+++ b/service/test/adapter/pixelated_mailboxes_test.py
@@ -23,10 +23,12 @@ from mockito import *
 class PixelatedMailboxesTest(unittest.TestCase):
     def setUp(self):
         self.account = mock()
+        self.drafts_mailbox = mock()
+        self.drafts_mailbox.mailbox_name = 'drafts'
         self.mailboxes = PixelatedMailBoxes(self.account)
+        self.mailboxes.drafts = lambda: self.drafts_mailbox
 
     def test_search_for_tags(self):
-        # given
         mailbox = mock()
         self.account.mailboxes = ['INBOX']
         tags_to_search_for = {'tags': ['inbox', 'custom_tag']}
@@ -34,10 +36,16 @@ class PixelatedMailboxesTest(unittest.TestCase):
         when(PixelatedMailbox).create(self.account, 'INBOX').thenReturn(mailbox)
         when(mailbox).mails_by_tags(any(list)).thenReturn(["mail"])
 
-        # when
         mails = self.mailboxes.mails_by_tag(tags_to_search_for['tags'])
 
-        # then
         self.assertEqual(1, len(mails))
         self.assertEqual("mail", mails[0])
 
+    def test_add_draft(self):
+        mail = mock()
+        when(self.drafts_mailbox).add(mail).thenReturn(1)
+
+        self.mailboxes.add_draft(mail)
+
+        verify(self.drafts_mailbox).add(mail)
+        verify(mail).set_ident('drafts', 1)