Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Bug 911672 - Mails sent to contribute-form@mozilla.org are bouncing #1679

Merged
merged 1 commit into from Feb 25, 2014
Merged

Fix Bug 911672 - Mails sent to contribute-form@mozilla.org are bouncing #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions bedrock/mozorg/email_contribute.py
View file
Open in desktop
Expand Up @@ -157,7 +157,7 @@ def send(request, data):
"""
functional_area = FUNCTIONAL_AREAS_DICT[data['interest']]

from_ = 'contribute-form@mozilla.org'
from_ = 'contribute@mozilla.org'
subject = 'Inquiry about Mozilla %s' % functional_area.subject
msg = jingo.render_to_string(request, 'mozorg/emails/infos.txt', data)
headers = {'Reply-To': data['email']}
Expand All @@ -184,7 +184,7 @@ def autorespond(request, data):

subject = 'Inquiry about Mozilla %s' % functional_area.subject
to = [data['email']]
from_ = 'contribute-form@mozilla.org'
from_ = 'contribute@mozilla.org'
reply_to = ['contribute@mozilla.org']
headers = {}
msg = ''
Expand Down
12 changes: 6 additions & 6 deletions bedrock/mozorg/tests/test_views.py
View file
Open in desktop
Expand Up @@ -174,7 +174,7 @@ def test_no_autoresponse(self):
eq_(len(mail.outbox), 1)

m = mail.outbox[0]
eq_(m.from_email, 'contribute-form@mozilla.org')
eq_(m.from_email, 'contribute@mozilla.org')
eq_(m.to, ['contribute@mozilla.org'])
eq_(m.cc, ['josh@joshmatthews.net'])
eq_(m.extra_headers['Reply-To'], self.contact)
Expand All @@ -188,13 +188,13 @@ def test_with_autoresponse(self):

cc = ['jay@jaygarcia.com', 'rardila@mozilla.com', 'madasan@gmail.com']
m = mail.outbox[0]
eq_(m.from_email, 'contribute-form@mozilla.org')
eq_(m.from_email, 'contribute@mozilla.org')
eq_(m.to, ['contribute@mozilla.org'])
eq_(m.cc, cc)
eq_(m.extra_headers['Reply-To'], self.contact)

m = mail.outbox[1]
eq_(m.from_email, 'contribute-form@mozilla.org')
eq_(m.from_email, 'contribute@mozilla.org')
eq_(m.to, [self.contact])
eq_(m.cc, [])
eq_(m.extra_headers['Reply-To'], ','.join(['contribute@mozilla.org'] +
Expand Down Expand Up @@ -261,7 +261,7 @@ def test_no_autoresponse_locale(self, render_mock):
eq_(len(mail.outbox), 1)

m = mail.outbox[0]
eq_(m.from_email, 'contribute-form@mozilla.org')
eq_(m.from_email, 'contribute@mozilla.org')
eq_(m.to, ['contribute@mozilla.org'])
eq_(m.cc, ['envolva-se-mozilla-brasil@googlegroups.com'])
eq_(m.extra_headers['Reply-To'], self.contact)
Expand All @@ -279,13 +279,13 @@ def test_with_autoresponse_locale(self, render_mock):

cc = ['envolva-se-mozilla-brasil@googlegroups.com']
m = mail.outbox[0]
eq_(m.from_email, 'contribute-form@mozilla.org')
eq_(m.from_email, 'contribute@mozilla.org')
eq_(m.to, ['contribute@mozilla.org'])
eq_(m.cc, cc)
eq_(m.extra_headers['Reply-To'], self.contact)

m = mail.outbox[1]
eq_(m.from_email, 'contribute-form@mozilla.org')
eq_(m.from_email, 'contribute@mozilla.org')
eq_(m.to, [self.contact])
eq_(m.cc, [])
eq_(m.extra_headers['Reply-To'], ','.join(['contribute@mozilla.org'] +
Expand Down