fix refund requests email so they say "marketplace.mozilla.org" (bug 749718)

Author: cvan

apps/market/cron.py

@@ -41,7 +41,6 @@ def mail_pending_refunds():
     log.info('Mailing pending refunds: %s refunds found' % len(pending))
 
     # Find all owners of those addons.
-    from mkt import settings as mkt_settings
     users = (AddonUser.objects.filter(role=amo.AUTHOR_ROLE_OWNER,
                                       addon__in=pending.keys())
                               .values_list('addon_id', 'user__email'))
@@ -59,10 +58,11 @@ def mail_pending_refunds():
                  (email, ', '.join([str(i) for i in addon_ids])))
         addons = Addon.objects.filter(pk__in=addon_ids)
         is_webapp = addons[0].is_webapp()
-        site_url = mkt_settings.SITE_URL if is_webapp else settings.SITE_URL
+        site_url = ('https://marketplace.mozilla.org/' if is_webapp
+                    else settings.SITE_URL)
+        from_email = ('Mozilla Marketplace <nobody@mozilla.org>' if is_webapp
+                      else settings.NOBODY_EMAIL)
         ctx = {'addons': addons, 'refunds': pending, 'site_url': site_url}
-        from_email = (settings.NOBODY_EMAIL if is_webapp
-                                            else mkt_settings.NOBODY_EMAIL)
         send_mail_jinja('Pending refund requests at the Mozilla Marketplace',
                         'market/emails/refund-nag.txt', ctx,
                         from_email=from_email, recipient_list=[owner])

apps/market/tests/test_cron.py

@@ -101,6 +101,11 @@ def test_two_addons(self):
         eq_(len(mail.outbox), 1)
         eq_(mail.outbox[0].body.count('1 request'), 2)
 
+    def test_email_url(self):
+        mail_pending_refunds()
+        eq_(len(mail.outbox), 1)
+        assert 'https://marketplace.mozilla.org/' in mail.outbox[0].body
+
     @mock.patch.object(settings, 'SITE_URL', 'not.this.domain.com')
     def test_email_escaping(self):
         self.webapp.name = 'You <3 My App'
@@ -111,4 +116,4 @@ def test_email_escaping(self):
         assert str(self.webapp.name) in email.body
         assert '1 request' in email.body
         assert not 'not.this.domain.com' in email.body
-        assert [self.author.email] == email.to
+        eq_(email.to, [self.author.email])