Merge pull request #54 from novapost/54-add_no_reply_address

Add a no_reply address.
peopledoc · Jan 28, 2015 · d3c46e5 · d3c46e5
2 parents 74c0abe + 6dfbc08
commit d3c46e5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/mail_factory/mails.py b/mail_factory/mails.py
@@ -126,9 +126,12 @@ def create_email_msg(self, emails, attachments=None, from_email=None,
             body = h.handle(html_content)
 
         if headers is None:
-            headers = {'Reply-To': getattr(settings,
-                                           "SUPPORT_EMAIL",
-                                           settings.DEFAULT_FROM_EMAIL)}
+            reply_to = getattr(settings, "NO_REPLY_EMAIL", None)
+            if not reply_to:
+                reply_to = getattr(settings, "SUPPORT_EMAIL",
+                                   settings.DEFAULT_FROM_EMAIL)
+
+            headers = {'Reply-To': reply_to}
 
         msg = message_class(subject, body, from_email, emails, headers=headers)
         if html_content:

diff --git a/mail_factory/tests/test_mails.py b/mail_factory/tests/test_mails.py
@@ -183,3 +183,22 @@ class TestMail(BaseMail):
         TestMail().mail_admins()
         self.assertEqual(len(mail.outbox), before + 1)
         self.assertEqual(mail.outbox[-1].to, ['some_admin@example.com'])
+
+    def test_no_reply(self):
+        class TestMail(BaseMail):
+            params = []
+            template_name = 'test'
+
+        test_mail = TestMail()
+        msg = test_mail.create_email_msg([])
+
+        self.assertIn('Reply-To', msg.extra_headers)
+        self.assertEquals(msg.extra_headers['Reply-To'],
+                          settings.DEFAULT_FROM_EMAIL)
+
+        settings.NO_REPLY_EMAIL = 'no-reply@example.com'
+        msg = test_mail.create_email_msg([])
+
+        self.assertIn('Reply-To', msg.extra_headers)
+        self.assertEquals(msg.extra_headers['Reply-To'],
+                          settings.NO_REPLY_EMAIL)