send real confirmation email for user registration regardless (bug 777662)

Author: cvan

apps/amo/utils.py

@@ -139,7 +139,7 @@ def paginate(request, queryset, per_page=20, count=None):
 
 def send_mail(subject, message, from_email=None, recipient_list=None,
               fail_silently=False, use_blacklist=True, perm_setting=None,
-              manage_url=None, headers=None, cc=None):
+              manage_url=None, headers=None, cc=None, real_email=False):
     """
     A wrapper around django.core.mail.EmailMessage.
 
@@ -150,7 +150,7 @@ def send_mail(subject, message, from_email=None, recipient_list=None,
     if not recipient_list:
         return True
 
-    connection = get_email_backend()
+    connection = get_email_backend(real_email)
 
     if not from_email:
         from_email = settings.DEFAULT_FROM_EMAIL
@@ -716,12 +716,15 @@ def pop(cls, key, data=True):
         return False
 
 
-def get_email_backend():
+def get_email_backend(real_email=False):
     """Get a connection to an email backend.
 
     If settings.SEND_REAL_EMAIL is False, a debugging backend is returned.
     """
-    backend = None if settings.SEND_REAL_EMAIL else 'amo.mail.FakeEmailBackend'
+    if real_email or settings.SEND_REAL_EMAIL:
+        backend = None
+    else:
+        backend = 'amo.mail.FakeEmailBackend'
     return django.core.mail.get_connection(backend)
 
 

apps/users/tests/test_views.py

@@ -163,21 +163,31 @@ def test_password_short(self):
     def test_email_change_mail_sent(self):
         data = {'username': 'jbalogh',
                 'email': 'jbalogh.changed@mozilla.com',
-                'display_name': 'DJ SurfNTurf', }
+                'display_name': 'DJ SurfNTurf'}
 
         r = self.client.post(self.url, data, follow=True)
         self.assertRedirects(r, self.url)
-        self.assertContains(r, "An email has been sent to %s" % data['email'])
+        self.assertContains(r, 'An email has been sent to %s' % data['email'])
 
         # The email shouldn't change until they confirm, but the name should
         u = User.objects.get(id='4043307').get_profile()
         self.assertEquals(u.name, 'DJ SurfNTurf')
         self.assertEquals(u.email, 'jbalogh@mozilla.com')
 
         eq_(len(mail.outbox), 1)
-        assert mail.outbox[0].subject.find('Please confirm your email') == 0
+        eq_(mail.outbox[0].subject.find('Please confirm your email'), 0)
         assert mail.outbox[0].body.find('%s/emailchange/' % self.user.id) > 0
 
+    @patch.object(settings, 'SEND_REAL_EMAIL', False)
+    def test_email_change_mail_send_even_with_fake_email(self):
+        data = {'username': 'jbalogh',
+                'email': 'jbalogh.changed@mozilla.com',
+                'display_name': 'DJ SurfNTurf'}
+
+        self.client.post(self.url, data, follow=True)
+        eq_(len(mail.outbox), 1)
+        eq_(mail.outbox[0].subject.find('Please confirm your email'), 0)
+
     @patch.object(settings, 'APP_PREVIEW', True)
     def test_email_cant_change(self):
         data = {'username': 'jbalogh',

apps/users/views.py

@@ -220,7 +220,7 @@ def edit(request):
                 send_mail(_('Please confirm your email address '
                             'change at %s' % domain),
                     t.render(Context(c)), None, [amouser.email],
-                    use_blacklist=False)
+                    use_blacklist=False, real_email=True)
 
                 # Reset the original email back.  We aren't changing their
                 # address until they confirm the new one