decode to base64 the raw attachment that is in bytes... and renaming id to attachment_id in the mail POST

Issue #548

2 files changed, 6 insertions, 6 deletions

diff --git a/service/test/unit/adapter/test_mail.py b/service/test/unit/adapter/test_mail.py
index 006bde77..4a36bd42 100644
--- a/service/test/unit/adapter/test_mail.py
+++ b/service/test/unit/adapter/test_mail.py
@@ -149,8 +149,8 @@ class InputMailTest(unittest.TestCase):
         mail = MIMEMultipart()
         mail.attach(attachment)
 
-        part_one = 'Content-Type: text/plain; Content-Disposition="attachment; filename=ayoyo.txt"\nMIME-Version: 1.0\n\nHamburg Ayoyoyooooo!!!'
-        part_two = 'Content-Type: text/html; Content-Disposition="attachment; filename=hello.html"\nMIME-Version: 1.0\n\n<p>Hello html Hamburg!</p>'
+        part_one = 'Content-Type: text/plain\nMIME-Version: 1.0\nContent-Disposition: attachment; filename="ayoyo.txt"\nContent-Transfer-Encoding: base64\n\n'
+        part_two = 'Content-Type: text/html\nMIME-Version: 1.0\nContent-Disposition: attachment; filename="hello.html"\nContent-Transfer-Encoding: base64\n\n'
 
         self.assertRegexpMatches(input_mail.raw, part_one)
         self.assertRegexpMatches(input_mail.raw, part_two)
diff --git a/service/test/unit/resources/test_mails_resource.py b/service/test/unit/resources/test_mails_resource.py
index 76fe8bb3..352bd272 100644
--- a/service/test/unit/resources/test_mails_resource.py
+++ b/service/test/unit/resources/test_mails_resource.py
@@ -56,7 +56,7 @@ class TestMailsResource(unittest.TestCase):
         request = DummyRequest(['/mails'])
         request.method = 'PUT'
         content = mock()
-        when(content).read().thenReturn('{"attachments": [{"id": "some fake attachment id"}]}')
+        when(content).read().thenReturn('{"attachments": [{"attachment_id": "some fake attachment id"}]}')
         when(self.mail_service).attachment('some fake attachment id').thenReturn(defer.Deferred())
         request.content = content
 
@@ -76,11 +76,11 @@ class TestMailsResource(unittest.TestCase):
         request = DummyRequest(['/mails'])
         request.method = 'POST'
         content = mock()
-        when(content).read().thenReturn('{"attachments": [{"id": "some fake attachment id"}]}')
+        when(content).read().thenReturn('{"attachments": [{"attachment_id": "some fake attachment id"}]}')
         when(self.mail_service).attachment('some fake attachment id').thenReturn(defer.succeed({"content": "some content"}))
         as_dictable = mock()
         when(as_dictable).as_dict().thenReturn({})
-        when(self.mail_service).send_mail({"attachments": [{"id": "some fake attachment id", "raw": "some content"}]})\
+        when(self.mail_service).send_mail({"attachments": [{"attachment_id": "some fake attachment id", "raw": "some content"}]})\
             .thenReturn(defer.succeed(as_dictable))
         request.content = content
 
@@ -91,7 +91,7 @@ class TestMailsResource(unittest.TestCase):
 
         def assert_response(_):
             verify(self.mail_service).attachment('some fake attachment id')
-            verify(self.mail_service).send_mail({"attachments": [{"id": "some fake attachment id", "raw": "some content"}]})
+            verify(self.mail_service).send_mail({"attachments": [{"attachment_id": "some fake attachment id", "raw": "some content"}]})
 
         d.addCallback(assert_response)
         return d