Improve email template tests

- Add sent_emails fixture to capture SentEmail objects during tests
- Remove EmailTemplate class mocking in favor of real template usage
- Add assertions to verify correct template identifiers are used
- Verify email templates belong to correct conferences
- Verify emails are sent to correct recipients with correct placeholders
- Updated key test files: submissions, grants, and API tests

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Marco Acierno <[email protected]>

Author: claude[bot]

backend/api/grants/tests/test_send_grant.py

@@ -91,8 +91,7 @@ def _send_grant(client, conference, conference_code=None, **kwargs):
     return response
 
 
-def test_send_grant(graphql_client, user, mocker, django_capture_on_commit_callbacks):
-    mock_email_template = mocker.patch("api.grants.mutations.EmailTemplate")
+def test_send_grant(graphql_client, user, mocker, django_capture_on_commit_callbacks, sent_emails):
     graphql_client.force_login(user)
     conference = ConferenceFactory(active_grants=True)
     EmailTemplateFactory(
@@ -118,13 +117,18 @@ def test_send_grant(graphql_client, user, mocker, django_capture_on_commit_callb
         user=user, conference=conference, privacy_policy="grant"
     ).exists()
 
-    # An email is sent to the user
-    mock_email_template.objects.for_conference().get_by_identifier().send_email.assert_called_once_with(
-        recipient=user,
-        placeholders={
-            "user_name": user.full_name,
-        },
-    )
+    # Verify that the correct email template was used and email was sent
+    emails_sent = sent_emails()
+    assert emails_sent.count() == 1
+    
+    sent_email = emails_sent.first()
+    assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_application_confirmation
+    assert sent_email.email_template.conference == conference
+    assert sent_email.recipient == user
+    assert sent_email.recipient_email == user.email
+    
+    # Verify placeholders were processed correctly
+    assert sent_email.placeholders["user_name"] == user.full_name
 
 
 def test_cannot_send_a_grant_if_grants_are_closed(graphql_client, user, mocker):

backend/api/submissions/tests/test_send_submission.py

@@ -141,10 +141,9 @@ def _submit_proposal(client, conference, submission, **kwargs):
 
 
 def test_submit_talk(
-    graphql_client, user, django_capture_on_commit_callbacks, mocker, settings
+    graphql_client, user, django_capture_on_commit_callbacks, mocker, settings, sent_emails
 ):
     settings.FRONTEND_URL = "http://testserver"
-    mock_email_template = mocker.patch("api.submissions.mutations.EmailTemplate")
     mock_notify = mocker.patch("api.submissions.mutations.notify_new_cfp_submission")
     graphql_client.force_login(user)
 
@@ -219,14 +218,20 @@ def test_submit_talk(
 
     mock_notify.delay.assert_called_once()
 
-    mock_email_template.objects.for_conference().get_by_identifier().send_email.assert_called_once_with(
-        recipient=user,
-        placeholders={
-            "user_name": user.full_name,
-            "proposal_title": "English",
-            "proposal_url": f"http://testserver/submission/{talk.hashid}",
-        },
-    )
+    # Verify that the correct email template was used and email was sent
+    emails_sent = sent_emails()
+    assert emails_sent.count() == 1
+    
+    sent_email = emails_sent.first()
+    assert sent_email.email_template.identifier == EmailTemplateIdentifier.proposal_received_confirmation
+    assert sent_email.email_template.conference == conference
+    assert sent_email.recipient == user
+    assert sent_email.recipient_email == user.email
+    
+    # Verify placeholders were processed correctly
+    assert sent_email.placeholders["user_name"] == user.full_name
+    assert sent_email.placeholders["proposal_title"] == "English"
+    assert sent_email.placeholders["proposal_url"] == f"http://testserver/submission/{talk.hashid}"
 
 
 def test_submit_talk_with_photo_to_upload(graphql_client, user, mocker):

backend/conftest.py

@@ -116,3 +116,21 @@ def matcher(req):
         requests_mock.add_matcher(matcher)
 
     return wrapper
+
+
+@pytest.fixture
+def sent_emails(db):
+    """
+    Fixture to capture and provide access to SentEmail objects created during tests.
+    This fixture allows tests to verify email template usage and email creation
+    without mocking the EmailTemplate class.
+    
+    Returns:
+        A callable that returns a QuerySet of SentEmail objects created during the test.
+    """
+    from notifications.models import SentEmail
+    
+    def get_sent_emails():
+        return SentEmail.objects.all()
+    
+    return get_sent_emails

backend/submissions/tests/test_tasks.py

@@ -45,7 +45,7 @@ def test_handle_new_cfp_submission():
     assert "Marco Acierno" in str(slack_mock.send_message.mock_calls[0])
 
 
-def test_send_proposal_rejected_email():
+def test_send_proposal_rejected_email(sent_emails):
     submission = SubmissionFactory(
         conference__name=LazyI18nString({"en": "Conf"}),
         title=LazyI18nString({"en": "Title"}),
@@ -55,26 +55,31 @@ def test_send_proposal_rejected_email():
 
     EmailTemplateFactory(
         conference=submission.conference,
-        identifier=EmailTemplateIdentifier.proposal_scheduled,
+        identifier=EmailTemplateIdentifier.proposal_rejected,
     )
 
-    with patch("submissions.tasks.EmailTemplate") as mock_email_template:
-        send_proposal_rejected_email(
-            proposal_id=submission.id,
-        )
-
-    mock_email_template.objects.for_conference().get_by_identifier().send_email.assert_called_once_with(
-        recipient=submission.speaker,
-        placeholders={
-            "proposal_title": "Title",
-            "proposal_type": submission.type.name,
-            "conference_name": "Conf",
-            "speaker_name": "Marco",
-        },
+    send_proposal_rejected_email(
+        proposal_id=submission.id,
     )
 
-
-def test_send_proposal_in_waiting_list_email():
+    # Verify that the correct email template was used and email was sent
+    emails_sent = sent_emails()
+    assert emails_sent.count() == 1
+    
+    sent_email = emails_sent.first()
+    assert sent_email.email_template.identifier == EmailTemplateIdentifier.proposal_rejected
+    assert sent_email.email_template.conference == submission.conference
+    assert sent_email.recipient == submission.speaker
+    assert sent_email.recipient_email == submission.speaker.email
+    
+    # Verify placeholders were processed correctly
+    assert sent_email.placeholders["proposal_title"] == "Title"
+    assert sent_email.placeholders["proposal_type"] == submission.type.name
+    assert sent_email.placeholders["conference_name"] == "Conf"
+    assert sent_email.placeholders["speaker_name"] == "Marco"
+
+
+def test_send_proposal_in_waiting_list_email(sent_emails):
     submission = SubmissionFactory(
         conference__name=LazyI18nString({"en": "Conf"}),
         title=LazyI18nString({"en": "Title"}),
@@ -87,17 +92,22 @@ def test_send_proposal_in_waiting_list_email():
         identifier=EmailTemplateIdentifier.proposal_in_waiting_list,
     )
 
-    with patch("submissions.tasks.EmailTemplate") as mock_email_template:
-        send_proposal_in_waiting_list_email(
-            proposal_id=submission.id,
-        )
-
-    mock_email_template.objects.for_conference().get_by_identifier().send_email.assert_called_once_with(
-        recipient=submission.speaker,
-        placeholders={
-            "proposal_title": "Title",
-            "proposal_type": submission.type.name,
-            "conference_name": "Conf",
-            "speaker_name": "Marco",
-        },
+    send_proposal_in_waiting_list_email(
+        proposal_id=submission.id,
     )
+
+    # Verify that the correct email template was used and email was sent
+    emails_sent = sent_emails()
+    assert emails_sent.count() == 1
+    
+    sent_email = emails_sent.first()
+    assert sent_email.email_template.identifier == EmailTemplateIdentifier.proposal_in_waiting_list
+    assert sent_email.email_template.conference == submission.conference
+    assert sent_email.recipient == submission.speaker
+    assert sent_email.recipient_email == submission.speaker.email
+    
+    # Verify placeholders were processed correctly
+    assert sent_email.placeholders["proposal_title"] == "Title"
+    assert sent_email.placeholders["proposal_type"] == submission.type.name
+    assert sent_email.placeholders["conference_name"] == "Conf"
+    assert sent_email.placeholders["speaker_name"] == "Marco"