[#797] reinstating use of the provided email body charstet encoding

2 files changed, 17 insertions, 0 deletions

diff --git a/service/test/integration/test_search.py b/service/test/integration/test_search.py
index afad12b7..c36e29aa 100644
--- a/service/test/integration/test_search.py
+++ b/service/test/integration/test_search.py
@@ -134,3 +134,14 @@ class SearchTest(SoledadTestBase):
         results = yield self.app_test_client.get_mails_by_tag('inbox')
         self.assertEqual(results[0].ident, mail2.ident)
         self.assertEqual(results[1].ident, mail1.ident)
+
+    @defer.inlineCallbacks
+    def test_search_base64_body(self):
+        body = u'bl\xe1'
+        input_mail = MailBuilder().with_body(body.encode('utf-8')).build_input_mail()
+
+        mail = yield self.app_test_client.add_mail_to_inbox(input_mail)
+        results = yield self.app_test_client.search(body)
+
+        self.assertGreater(len(results), 0, 'No results returned from search')
+        self.assertEquals(results[0].ident, mail.ident)
diff --git a/service/test/unit/adapter/mailstore/test_body_parser.py b/service/test/unit/adapter/mailstore/test_body_parser.py
index 9d58637c..155b326c 100644
--- a/service/test/unit/adapter/mailstore/test_body_parser.py
+++ b/service/test/unit/adapter/mailstore/test_body_parser.py
@@ -55,3 +55,9 @@ class BodyParserTest(unittest.TestCase):
 
         self.assertEqual(u'unkown char: ', parser.parsed_content())
         logger_mock.warn.assert_called_with(u'Failed to encode content for charset iso-8859-1. Ignoring invalid chars: \'latin-1\' codec can\'t encode character u\'\\ufffd\' in position 13: ordinal not in range(256)')
+
+    def test_charset_can_be_explicitely_set_and_take_precedence_over_content_type_if_set(self):
+        parser = BodyParser('YmzDoQ==\n', content_type='text/plain; us-ascii', content_transfer_encoding='base64',
+                            charset="utf-8")
+
+        self.assertEqual(u'bl\xe1', parser.parsed_content())