Rename tasks/mailer.py to tasks/email.py

Author: mtomilov

h/jinja_extensions/navbar_data_admin.py

@@ -68,10 +68,10 @@ def navbar_data_admin(request):
         ],
     },
     {
-        "id": "mailer",
+        "id": "email",
         "permission": Permission.AdminPage.LOW_RISK,
-        "title": "Mailer",
-        "route": "admin.mailer",
+        "title": "Email",
+        "route": "admin.email",
     },
     {
         "id": "nipsa",

h/routes.py

@@ -52,11 +52,11 @@ def includeme(config):  # noqa: PLR0915
         factory="h.traversal.GroupRequiredRoot",
         traverse="/{id}",
     )
-    config.add_route("admin.mailer", "/admin/mailer")
-    config.add_route("admin.mailer_test", "/admin/mailer/test")
+    config.add_route("admin.email", "/admin/email")
+    config.add_route("admin.email_test", "/admin/email/test")
     config.add_route(
-        "admin.mailer.preview.mention_notification",
-        "/admin/mailer/preview/mention-notification",
+        "admin.email.preview.mention_notification",
+        "/admin/email/preview/mention-notification",
     )
     config.add_route("admin.nipsa", "/admin/nipsa")
     config.add_route("admin.oauthclients", "/admin/oauthclients")

h/services/email.py

@@ -49,11 +49,11 @@ def __init__(self, request: Request, mailer: IMailer) -> None:
         self._request = request
         self._mailer = mailer
 
-    def send(self, email: EmailData) -> None:
+    def send(self, email_data: EmailData) -> None:
         if self._request.debug:  # pragma: no cover
             logger.info("emailing in debug mode: check the `mail/` directory")
         try:
-            self._mailer.send_immediately(email.message)
+            self._mailer.send_immediately(email_data.message)
         except smtplib.SMTPRecipientsRefused as exc:  # pragma: no cover
             logger.warning(
                 "Recipient was refused when trying to send an email. Does the user have an invalid email address?",

h/services/user_signup.py

@@ -9,7 +9,7 @@
 from h.services import SubscriptionService
 from h.services.exceptions import ConflictError
 from h.services.user_password import UserPasswordService
-from h.tasks import mailer as tasks_mailer
+from h.tasks import email
 
 log = logging.getLogger(__name__)
 
@@ -124,13 +124,13 @@ def _require_activation(self, user):
         self.session.flush()
 
         # Send the activation email
-        email = signup.generate(
+        email_data = signup.generate(
             request=self.request,
             user_id=user.id,
             email=user.email,
             activation_code=user.activation.code,
         )
-        tasks_mailer.send.delay(asdict(email))
+        email.send.delay(asdict(email_data))
 
 
 def user_signup_service_factory(_context, request):

h/subscribers.py

@@ -12,7 +12,7 @@
 from h.notification import mention, reply
 from h.services import NotificationService
 from h.services.annotation_read import AnnotationReadService
-from h.tasks import mailer
+from h.tasks import email
 
 logger = logging.getLogger(__name__)
 
@@ -108,9 +108,9 @@ def send_reply_notifications(event):
             logger.info("Skipping reply notification for %s", notification.parent_user)
             return
 
-        email = emails.reply_notification.generate(request, notification)
+        email_data = emails.reply_notification.generate(request, notification)
         try:
-            mailer.send.delay(asdict(email))
+            email.send.delay(asdict(email_data))
         except OperationalError as err:  # pragma: no cover
             # We could not connect to rabbit! So carry on
             report_exception(err)
@@ -146,9 +146,9 @@ def send_mention_notifications(event):
                 )
                 continue
 
-            email = emails.mention_notification.generate(request, notification)
+            email_data = emails.mention_notification.generate(request, notification)
             try:
-                mailer.send.delay(asdict(email))
+                email.send.delay(asdict(email_data))
             except OperationalError as err:  # pragma: no cover
                 # We could not connect to rabbit! So carry on
                 report_exception(err)

h/tasks/celery.py

@@ -81,7 +81,7 @@
         "h.tasks.cleanup",
         "h.tasks.indexer",
         "h.tasks.job_queue",
-        "h.tasks.mailer",
+        "h.tasks.email",
         "h.tasks.url_migration",
     ),
     task_routes={

h/tasks/mailer.py h/tasks/email.py

@@ -2,7 +2,7 @@
 A module for sending email.
 
 This module defines a Celery task for sending emails in a worker process.
-"""
+"""  # noqa: A005
 
 from typing import Any
 
@@ -21,11 +21,11 @@
     max_retries=3,
     retry_jitter=False,
 )
-def send(self, email_data: dict[str, Any]) -> None:  # noqa: ARG001
+def send(self, data: dict[str, Any]) -> None:  # noqa: ARG001
     """Send an email.
 
-    :param email_data: A dictionary containing email data compatible with EmailData class.
+    :param data: A dictionary containing email data compatible with EmailData class.
     """
     service: EmailService = celery.request.find_service(EmailService)
-    email = EmailData(**email_data)
-    service.send(email)
+    email_data = EmailData(**data)
+    service.send(email_data)

h/templates/admin/mailer.html.jinja2 h/templates/admin/email.html.jinja2

@@ -1,7 +1,7 @@
 {% extends "h:templates/layouts/admin.html.jinja2" %}
 
-{% set page_id = 'mailer' %}
-{% set page_title = 'Mailer' %}
+{% set page_id = 'email' %}
+{% set page_title = 'Email' %}
 
 {% block content %}
 
@@ -17,7 +17,7 @@
       <h3 class="card-title mb-0">Send a test email</h3>
     </div>
     <div class="card-body">
-      <form method="POST" action="{{ request.route_path('admin.mailer_test') }}" class="form-inline">
+      <form method="POST" action="{{ request.route_path('admin.email_test') }}" class="form-inline">
         <input type="hidden" name="csrf_token" value="{{ get_csrf_token() }}">
         <div class="form-group">
           <label for="recipient">Recipient</label>
@@ -35,7 +35,7 @@
     <iframe
       class="card-body p-0"
       style="height: 40em; border: none;"
-      src="{{ request.route_url("admin.mailer.preview.mention_notification") }}"
+      src="{{ request.route_url("admin.email.preview.mention_notification") }}"
     >
     </iframe>
   </div>

h/views/accounts.py

@@ -30,7 +30,7 @@
     ResetPasswordSchema,
 )
 from h.services import SubscriptionService
-from h.tasks import mailer
+from h.tasks import email
 from h.util.view import json_view
 
 _ = i18n.TranslationString
@@ -211,8 +211,8 @@ def _redirect_if_logged_in(self):
             raise httpexceptions.HTTPFound(self.request.route_path("index"))
 
     def _send_forgot_password_email(self, user):
-        email = reset_password.generate(self.request, user)
-        mailer.send.delay(asdict(email))
+        email_data = reset_password.generate(self.request, user)
+        email.send.delay(asdict(email_data))
 
 
 @view_defaults(

h/views/admin/mailer.py h/views/admin/email.py

@@ -1,44 +1,44 @@
-from dataclasses import asdict
+from dataclasses import asdict  # noqa: A005
 
 from pyramid.httpexceptions import HTTPSeeOther
 from pyramid.view import view_config
 
 from h.emails import test
 from h.security import Permission
-from h.tasks import mailer
+from h.tasks import email
 
 
 @view_config(
-    route_name="admin.mailer",
+    route_name="admin.email",
     request_method="GET",
-    renderer="h:templates/admin/mailer.html.jinja2",
+    renderer="h:templates/admin/email.html.jinja2",
     permission=Permission.AdminPage.LOW_RISK,
 )
-def mailer_index(request):
-    """Show the mailer test tools."""
+def email_index(request):
+    """Show the email test tools."""
     return {"taskid": request.params.get("taskid")}
 
 
 @view_config(
-    route_name="admin.mailer_test",
+    route_name="admin.email_test",
     request_method="POST",
     permission=Permission.AdminPage.LOW_RISK,
     require_csrf=True,
 )
-def mailer_test(request):
+def email_test(request):
     """Send a test email."""
     if "recipient" not in request.params:
-        index = request.route_path("admin.mailer")
+        index = request.route_path("admin.email")
         return HTTPSeeOther(location=index)
 
-    email = test.generate(request, request.params["recipient"])
-    result = mailer.send.delay(asdict(email))
-    index = request.route_path("admin.mailer", _query={"taskid": result.task_id})
+    email_data = test.generate(request, request.params["recipient"])
+    result = email.send.delay(asdict(email_data))
+    index = request.route_path("admin.email", _query={"taskid": result.task_id})
     return HTTPSeeOther(location=index)
 
 
 @view_config(
-    route_name="admin.mailer.preview.mention_notification",
+    route_name="admin.email.preview.mention_notification",
     request_method="GET",
     permission=Permission.AdminPage.LOW_RISK,
     renderer="h:templates/emails/mention_notification.html.jinja2",

h/views/api/flags.py

@@ -6,7 +6,7 @@
 from h.emails import flag_notification
 from h.security import Permission
 from h.security.permission_map import GROUP_MODERATE_PREDICATES
-from h.tasks import mailer
+from h.tasks import email
 from h.views.api.config import api_config
 
 
@@ -38,6 +38,6 @@ def _email_group_moderators(request, annotation):
     )
 
     for membership in memberships:
-        if email := membership.user.email:
-            email = flag_notification.generate(request, email, incontext_link)
-            mailer.send.delay(asdict(email))
+        if user_email := membership.user.email:
+            email_data = flag_notification.generate(request, user_email, incontext_link)
+            email.send.delay(asdict(email_data))

tests/functional/h/views/admin/permissions_test.py

@@ -9,7 +9,7 @@ class TestAdminPermissions:
         ("/admin/badge", False),
         ("/admin/features", False),
         ("/admin/groups", True),
-        ("/admin/mailer", True),
+        ("/admin/email", True),
         ("/admin/nipsa", False),
         ("/admin/oauthclients", False),
         ("/admin/organizations", True),

tests/unit/h/jinja2_extensions/navbar_data_admin_test.py

@@ -4,7 +4,7 @@
 
 from h.jinja_extensions import navbar_data_admin
 
-STAFF_TABS = ["index", "groups", "mailer", "organizations", "users"]
+STAFF_TABS = ["index", "groups", "email", "organizations", "users"]
 
 
 class TestNavbarDataAdmin:

tests/unit/h/routes_test.py

@@ -59,11 +59,11 @@ def test_includeme():
             factory="h.traversal.GroupRequiredRoot",
             traverse="/{id}",
         ),
-        call("admin.mailer", "/admin/mailer"),
-        call("admin.mailer_test", "/admin/mailer/test"),
+        call("admin.email", "/admin/email"),
+        call("admin.email_test", "/admin/email/test"),
         call(
-            "admin.mailer.preview.mention_notification",
-            "/admin/mailer/preview/mention-notification",
+            "admin.email.preview.mention_notification",
+            "/admin/email/preview/mention-notification",
         ),
         call("admin.nipsa", "/admin/nipsa"),
         call("admin.oauthclients", "/admin/oauthclients"),

tests/unit/h/services/user_signup_test.py

@@ -93,9 +93,7 @@ def test_signup_sets_password_using_password_service(
 
         user_password_service.update_password.assert_called_once_with(user, "wibble")
 
-    def test_signup_sends_email(
-        self, svc, signup, tasks_mailer, pyramid_request, asdict
-    ):
+    def test_signup_sends_email(self, svc, signup, email, pyramid_request, asdict):
         signup.generate.return_value = sentinel.email
         asdict.return_value = sentinel.email_data
 
@@ -109,15 +107,15 @@ def test_signup_sends_email(
         )
 
         asdict.assert_called_once_with(signup.generate.return_value)
-        tasks_mailer.send.delay.assert_called_once_with(asdict.return_value)
+        email.send.delay.assert_called_once_with(asdict.return_value)
 
     def test_signup_does_not_send_email_when_activation_not_required(
-        self, svc, signup, tasks_mailer
+        self, svc, signup, email
     ):
         svc.signup(require_activation=False, username="foo", email="foo@bar.com")
 
         signup.generate.assert_not_called()
-        tasks_mailer.send.delay.assert_not_called()
+        email.send.delay.assert_not_called()
 
     def test_signup_creates_subscriptions(self, svc, subscription_service, factories):
         subscription = factories.Subscriptions(active=False)
@@ -144,7 +142,7 @@ def test_signup_logs_conflict_error_when_account_with_email_already_exists(
         )
 
     @pytest.mark.parametrize(
-        "username,email",
+        "username,user_email",
         [
             # In the real world these values would be identical to the first signup but
             # since we need to force one to error before the other, only the email or
@@ -157,16 +155,16 @@ def test_signup_logs_conflict_error_when_account_with_email_already_exists(
         ],
     )
     def test_signup_raises_conflict_error_when_account_already_exists(
-        self, svc, username, email
+        self, svc, username, user_email
     ):
         # This happens when two or more identical
         # concurrent signup requests race each other to the db.
         with pytest.raises(  # noqa: PT012
             ConflictError,
-            match=f"The email address {email} has already been registered.",
+            match=f"The email address {user_email} has already been registered.",
         ):
             svc.signup(username="foo", email="foo@bar.com")
-            svc.signup(username=username, email=email)
+            svc.signup(username=username, email=user_email)
 
     @pytest.fixture
     def svc(self, pyramid_request, user_password_service, subscription_service):
@@ -178,8 +176,8 @@ def svc(self, pyramid_request, user_password_service, subscription_service):
         )
 
     @pytest.fixture(autouse=True)
-    def tasks_mailer(self, patch):
-        return patch("h.services.user_signup.tasks_mailer")
+    def email(self, patch):
+        return patch("h.services.user_signup.email")
 
     @pytest.fixture(autouse=True)
     def signup(self, patch):

tests/unit/h/subscribers_test.py

@@ -120,7 +120,7 @@ def test_it_sends_emails(
         reply,
         mention,
         emails,
-        mailer,
+        email,
         asdict,
     ):
         asdict.return_value = sentinel.email_data
@@ -151,32 +151,32 @@ def test_it_sends_emails(
         notification_service.allow_notifications.assert_called_once_with(
             annotation, notification.parent_user
         )
-        email = emails.reply_notification.generate.return_value
-        asdict.assert_called_once_with(email)
+        email_data = emails.reply_notification.generate.return_value
+        asdict.assert_called_once_with(email_data)
 
-        mailer.send.delay.assert_called_once_with(asdict.return_value)
+        email.send.delay.assert_called_once_with(asdict.return_value)
 
         notification_service.save_notification.assert_called_once_with(
             annotation=annotation,
             recipient=notification.parent_user,
             notification_type=NotificationType.REPLY,
         )
 
-    def test_it_does_nothing_if_no_notification_is_required(self, event, reply, mailer):
+    def test_it_does_nothing_if_no_notification_is_required(self, event, reply, email):
         reply.get_notification.return_value = None
 
         subscribers.send_reply_notifications(event)
 
-        mailer.send.delay.assert_not_called()
+        email.send.delay.assert_not_called()
 
-    def test_it_fails_gracefully_if_the_task_does_not_queue(self, event, mailer):
-        mailer.send.side_effect = OperationalError
+    def test_it_fails_gracefully_if_the_task_does_not_queue(self, event, email):
+        email.send.side_effect = OperationalError
 
         # No explosions please
         subscribers.send_reply_notifications(event)
 
     def test_it_does_nothing_if_the_reply_user_is_mentioned(
-        self, event, reply, mailer, mention
+        self, event, reply, email, mention
     ):
         reply_notification = mock.MagicMock()
         reply.get_notification.return_value = reply_notification
@@ -187,16 +187,16 @@ def test_it_does_nothing_if_the_reply_user_is_mentioned(
 
         subscribers.send_reply_notifications(event)
 
-        mailer.send.delay.assert_not_called()
+        email.send.delay.assert_not_called()
 
     def test_it_does_nothing_if_notifications_arent_allowed(
-        self, event, mailer, notification_service
+        self, event, email, notification_service
     ):
         notification_service.allow_notifications.return_value = False
 
         subscribers.send_reply_notifications(event)
 
-        mailer.send.delay.assert_not_called()
+        email.send.delay.assert_not_called()
 
     @pytest.fixture
     def event(self, pyramid_request):
@@ -218,7 +218,7 @@ def test_it_sends_emails(
         notification_service,
         mention,
         emails,
-        mailer,
+        email,
         asdict,
     ):
         notifications = mention.get_notifications.return_value
@@ -244,9 +244,9 @@ def test_it_sends_emails(
         notification_service.allow_notifications.assert_called_once_with(
             annotation, notifications[0].mentioned_user
         )
-        email = emails.mention_notification.generate.return_value
-        asdict.assert_called_once_with(email)
-        mailer.send.delay.assert_called_once_with(asdict.return_value)
+        email_data = emails.mention_notification.generate.return_value
+        asdict.assert_called_once_with(email_data)
+        email.send.delay.assert_called_once_with(asdict.return_value)
 
         notification_service.save_notification.assert_called_once_with(
             annotation=annotation,
@@ -255,28 +255,28 @@ def test_it_sends_emails(
         )
 
     def test_it_does_nothing_if_no_notification_is_required(
-        self, event, mention, mailer
+        self, event, mention, email
     ):
         mention.get_notifications.return_value = []
 
         subscribers.send_mention_notifications(event)
 
-        mailer.send.delay.assert_not_called()
+        email.send.delay.assert_not_called()
 
-    def test_it_fails_gracefully_if_the_task_does_not_queue(self, event, mailer):
-        mailer.send.side_effect = OperationalError
+    def test_it_fails_gracefully_if_the_task_does_not_queue(self, event, email):
+        email.send.side_effect = OperationalError
 
         # No explosions please
         subscribers.send_mention_notifications(event)
 
     def test_it_does_nothing_if_notifications_arent_allowed(
-        self, event, mailer, notification_service
+        self, event, email, notification_service
     ):
         notification_service.allow_notifications.return_value = False
 
         subscribers.send_mention_notifications(event)
 
-        mailer.send.delay.assert_not_called()
+        email.send.delay.assert_not_called()
 
     @pytest.fixture
     def event(self, pyramid_request):
@@ -321,8 +321,8 @@ def mention(patch):
 
 
 @pytest.fixture(autouse=True)
-def mailer(patch):
-    return patch("h.subscribers.mailer")
+def email(patch):
+    return patch("h.subscribers.email")
 
 
 @pytest.fixture(autouse=True)

tests/unit/h/tasks/mailer_test.py tests/unit/h/tasks/email_test.py

@@ -3,23 +3,23 @@
 import pytest
 
 from h.services.email import EmailTag
-from h.tasks import mailer
+from h.tasks import email
 
 
 def test_send_retries_if_mailing_fails(email_service):
     email_service.send.side_effect = Exception()
-    mailer.send.retry = mock.Mock(wraps=mailer.send.retry)
+    email.send.retry = mock.Mock(wraps=email.send.retry)
 
-    email_data = {
+    data = {
         "recipients": ["foo@example.com"],
         "subject": "My email subject",
         "body": "Some text body",
         "tag": EmailTag.TEST,
     }
     with pytest.raises(Exception):  # noqa: B017, PT011
-        mailer.send(email_data)
+        email.send(data)
 
-    assert mailer.send.retry.called
+    assert email.send.retry.called
 
 
 @pytest.fixture
@@ -30,6 +30,6 @@ def pyramid_request(pyramid_request):
 
 @pytest.fixture(autouse=True)
 def celery(patch, pyramid_request):
-    celery = patch("h.tasks.mailer.celery")
+    celery = patch("h.tasks.email.celery")
     celery.request = pyramid_request
     return celery

tests/unit/h/views/accounts_test.py

@@ -227,7 +227,7 @@ def routes(self, pyramid_config):
         pyramid_config.add_route("stream", "/stream")
 
 
-@pytest.mark.usefixtures("activation_model", "mailer", "reset_password_email", "routes")
+@pytest.mark.usefixtures("activation_model", "email", "reset_password_email", "routes")
 class TestForgotPasswordController:
     def test_post_returns_form_when_validation_fails(
         self, invalid_form, pyramid_request
@@ -269,7 +269,7 @@ def test_post_sends_mail(
         self,
         factories,
         form_validating_to,
-        mailer,
+        email,
         pyramid_request,
     ):
         pyramid_request.registry.password_reset_serializer = FakeSerializer()
@@ -279,14 +279,14 @@ def test_post_sends_mail(
 
         controller.post()
 
-        email = EmailData(
+        email_data = EmailData(
             recipients=["giraffe@thezoo.org"],
             subject="Reset yer passwor!",
             body="Text output",
             tag=EmailTag.TEST,
             html="HTML output",
         )
-        mailer.send.delay.assert_called_once_with(asdict(email))
+        email.send.delay.assert_called_once_with(asdict(email_data))
 
     def test_post_redirects_on_success(
         self, factories, form_validating_to, pyramid_request
@@ -1026,8 +1026,8 @@ def ActivationEvent(patch):
 
 
 @pytest.fixture
-def mailer(patch):
-    return patch("h.views.accounts.mailer")
+def email(patch):
+    return patch("h.views.accounts.email")
 
 
 @pytest.fixture(autouse=True)

tests/unit/h/views/admin/mailer_test.py tests/unit/h/views/admin/email_test.py

@@ -4,57 +4,57 @@
 from pyramid.httpexceptions import HTTPSeeOther
 
 from h.services.email import EmailData, EmailTag
-from h.views.admin.mailer import mailer_index, mailer_test, preview_mention_notification
+from h.views.admin.email import email_index, email_test, preview_mention_notification
 
 
-class TestMailerIndex:
+class TestEmailIndex:
     def test_when_no_taskid(self, pyramid_request):
-        result = mailer_index(pyramid_request)
+        result = email_index(pyramid_request)
 
         assert result == {"taskid": None}
 
     def test_with_taskid(self, pyramid_request):
         pyramid_request.params["taskid"] = "abcd1234"
 
-        result = mailer_index(pyramid_request)
+        result = email_index(pyramid_request)
 
         assert result == {"taskid": "abcd1234"}
 
 
-@pytest.mark.usefixtures("mailer", "testmail", "routes")
-class TestMailerTest:
-    def test_doesnt_mail_when_no_recipient(self, mailer, pyramid_request):
-        mailer_test(pyramid_request)
+@pytest.mark.usefixtures("email", "testmail", "routes")
+class TestEmailTest:
+    def test_doesnt_mail_when_no_recipient(self, email, pyramid_request):
+        email_test(pyramid_request)
 
-        assert not mailer.send.delay.called
+        assert not email.send.delay.called
 
     def test_redirects_when_no_recipient(self, pyramid_request):
-        result = mailer_test(pyramid_request)
+        result = email_test(pyramid_request)
 
         assert isinstance(result, HTTPSeeOther)
-        assert result.location == "/adm/mailer"
+        assert result.location == "/adm/email"
 
-    def test_sends_mail(self, mailer, pyramid_request):
+    def test_sends_mail(self, email, pyramid_request):
         pyramid_request.params["recipient"] = "meerkat@example.com"
 
-        mailer_test(pyramid_request)
+        email_test(pyramid_request)
 
-        email = EmailData(
+        email_data = EmailData(
             recipients=["meerkat@example.com"],
             subject="TEST",
             body="text",
             tag=EmailTag.TEST,
             html="html",
         )
-        mailer.send.delay.assert_called_once_with(asdict(email))
+        email.send.delay.assert_called_once_with(asdict(email_data))
 
     def test_redirects(self, pyramid_request):
         pyramid_request.params["recipient"] = "meerkat@example.com"
 
-        result = mailer_test(pyramid_request)
+        result = email_test(pyramid_request)
 
         assert isinstance(result, HTTPSeeOther)
-        assert result.location == "/adm/mailer?taskid=a1b2c3"
+        assert result.location == "/adm/email?taskid=a1b2c3"
 
 
 class TestPreviewMentionNotification:
@@ -80,15 +80,15 @@ def __init__(self):
 
 
 @pytest.fixture
-def mailer(patch):
-    mailer = patch("h.views.admin.mailer.mailer")
-    mailer.send.delay.return_value = FakeResult()
-    return mailer
+def email(patch):
+    email = patch("h.views.admin.email.email")
+    email.send.delay.return_value = FakeResult()
+    return email
 
 
 @pytest.fixture
 def testmail(patch):
-    test = patch("h.views.admin.mailer.test")
+    test = patch("h.views.admin.email.test")
     test.generate.side_effect = lambda _, r: EmailData(
         recipients=[r], subject="TEST", body="text", tag=EmailTag.TEST, html="html"
     )
@@ -97,4 +97,4 @@ def testmail(patch):
 
 @pytest.fixture
 def routes(pyramid_config):
-    pyramid_config.add_route("admin.mailer", "/adm/mailer")
+    pyramid_config.add_route("admin.email", "/adm/email")

tests/unit/h/views/api/flags_test.py

@@ -19,7 +19,7 @@ def test_it(
         flag_service,
         links,
         group_members_service,
-        mailer,
+        email,
         flag_notification,
         moderators,
     ):
@@ -39,7 +39,7 @@ def test_it(
             call(pyramid_request, user.email, links.incontext_link.return_value)
             for user in moderators
         ]
-        assert mailer.send.delay.call_args_list == [
+        assert email.send.delay.call_args_list == [
             call(
                 {
                     "recipients": sentinel.email1,
@@ -82,14 +82,14 @@ def test_when_a_moderator_has_no_email(
         ]
 
     def test_when_there_are_no_moderators(
-        self, context, pyramid_request, group_members_service, flag_notification, mailer
+        self, context, pyramid_request, group_members_service, flag_notification, email
     ):
         group_members_service.get_memberships.return_value = []
 
         flags.create(context, pyramid_request)
 
         flag_notification.generate.assert_not_called()
-        mailer.send.delay.assert_not_called()
+        email.send.delay.assert_not_called()
 
     @pytest.fixture(autouse=True)
     def moderators(self, factories, group_members_service):
@@ -138,5 +138,5 @@ def flag_notification(mocker):
 
 
 @pytest.fixture(autouse=True)
-def mailer(mocker):
-    return mocker.patch("h.views.api.flags.mailer", autospec=True)
+def email(mocker):
+    return mocker.patch("h.views.api.flags.email", autospec=True)