Normalize email data subject before sending

Author: mtomilov

Diff for: h/services/email.py

@@ -34,8 +34,9 @@ def message(self) -> pyramid_mailer.message.Message:
         extra_headers = {"X-MC-Tags": self.tag}
         if self.subaccount:
             extra_headers["X-MC-Subaccount"] = self.subaccount
+        subject = " ".join(self.subject.splitlines())
         return pyramid_mailer.message.Message(
-            subject=self.subject,
+            subject=subject,
             recipients=self.recipients,
             body=self.body,
             html=self.html,

Diff for: tests/unit/h/services/email_test.py

@@ -69,6 +69,25 @@ def test_send_creates_email_message_with_subaccount(
             extra_headers={"X-MC-Tags": EmailTag.TEST, "X-MC-Subaccount": "subaccount"},
         )
 
+    def test_send_creates_email_message_normalizing_subject(
+        self, task_data, email_service, pyramid_mailer
+    ):
+        email = EmailData(
+            recipients=["[email protected]"],
+            subject="My email\r\nsubject",
+            body="Some text body",
+            tag=EmailTag.TEST,
+        )
+        email_service.send(email, task_data)
+
+        pyramid_mailer.message.Message.assert_called_once_with(
+            recipients=["[email protected]"],
+            subject="My email subject",
+            body="Some text body",
+            html=None,
+            extra_headers={"X-MC-Tags": EmailTag.TEST},
+        )
+
     def test_send_creates_mention_email_when_sender_limit_not_reached(
         self,
         mention_email_data,