From cc3cd5c98c72ee1a381df3f48a2b6e4e682bab37 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sun, 20 Nov 2022 19:39:08 -0800 Subject: [PATCH 1/2] Don't use task for password reset emails --- bookwyrm/emailing.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookwyrm/emailing.py b/bookwyrm/emailing.py index 80aacf7f4..03cf4772e 100644 --- a/bookwyrm/emailing.py +++ b/bookwyrm/emailing.py @@ -38,7 +38,7 @@ def password_reset_email(reset_code): data = email_data() data["reset_link"] = reset_code.link data["user"] = reset_code.user.display_name - send_email.delay(reset_code.user.email, *format_email("password_reset", data)) + send_email(reset_code.user.email, *format_email("password_reset", data)) def moderation_report_email(report): From dd83e32f32a141c4484861aaf2f82a45b30c474c Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Wed, 23 Nov 2022 22:00:34 -0800 Subject: [PATCH 2/2] Fixes unit test --- bookwyrm/tests/test_emailing.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bookwyrm/tests/test_emailing.py b/bookwyrm/tests/test_emailing.py index ecfbd9448..b2af59f4f 100644 --- a/bookwyrm/tests/test_emailing.py +++ b/bookwyrm/tests/test_emailing.py @@ -11,6 +11,7 @@ from bookwyrm import emailing, models class Emailing(TestCase): """every response to a get request, html or json""" + # pylint: disable=invalid-name def setUp(self): """we need basic test data and mocks""" self.factory = RequestFactory() @@ -41,10 +42,12 @@ class Emailing(TestCase): self.assertEqual(args[1], "You're invited to join BookWyrm!") self.assertEqual(len(args), 4) - def test_password_reset_email(self, email_mock): + def test_password_reset_email(self, _): """load the password reset email""" reset = models.PasswordReset.objects.create(user=self.local_user) - emailing.password_reset_email(reset) + + with patch("bookwyrm.emailing.send_email") as email_mock: + emailing.password_reset_email(reset) self.assertEqual(email_mock.call_count, 1) args = email_mock.call_args[0]