diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py index 34ba136a..7069286d 100644 --- a/bookwyrm/emailing.py +++ b/bookwyrm/emailing.py @@ -29,15 +29,19 @@ def password_reset_email(reset_code): @app.task def send_email(recipient, message_name, data): """ use a task to send the email """ - subject = get_template( - "email/{}/subject.html".format(message_name) - ).render(data).strip() - html_content = get_template( - "email/{}/html_content.html".format(message_name) - ).render(data).strip() - text_content = get_template( - "email/{}/text_content.html".format(message_name) - ).render(data).strip() + subject = ( + get_template("email/{}/subject.html".format(message_name)).render(data).strip() + ) + html_content = ( + get_template("email/{}/html_content.html".format(message_name)) + .render(data) + .strip() + ) + text_content = ( + get_template("email/{}/text_content.html".format(message_name)) + .render(data) + .strip() + ) email = EmailMultiAlternatives(subject, text_content, None, [recipient]) email.attach_alternative(html_content, "text/html") diff --git a/bookwyrm/tests/views/test_invite.py b/bookwyrm/tests/views/test_invite.py index 9cb2f9ee..7bfc8fe5 100644 --- a/bookwyrm/tests/views/test_invite.py +++ b/bookwyrm/tests/views/test_invite.py @@ -101,14 +101,15 @@ class InviteViews(TestCase): """ send an invite """ req = models.InviteRequest.objects.create(email="fish@example.com") - view = views.InviteRequest.as_view() - request = self.factory.post("", {"id": req.id}) + view = views.ManageInviteRequests.as_view() + request = self.factory.post("", {"invite-request": req.id}) request.user = self.local_user request.user.is_superuser = True with patch("bookwyrm.emailing.send_email.delay") as mock: view(request) self.assertEqual(mock.call_count, 1) + req.refresh_from_db() self.assertIsNotNone(req.invite) def test_ignore_invite_request(self): diff --git a/bookwyrm/views/invite.py b/bookwyrm/views/invite.py index c0532e98..e4b98cba 100644 --- a/bookwyrm/views/invite.py +++ b/bookwyrm/views/invite.py @@ -118,7 +118,7 @@ class ManageInviteRequests(View): invite_request.save() emailing.invite_email(invite_request) - return redirect('settings-invite-requests') + return redirect("settings-invite-requests") class InviteRequest(View):