Skip to content

Commit 2218449

Browse files
Fix EmailTemplateIdentifier usage in tests
- Fix grant_reply_* identifiers to use correct grant_* names - Fix sponsor_brochure to sponsorship_brochure - Fix proposal_time_slot_changed to proposal_scheduled_time_changed Co-authored-by: Marco Acierno <[email protected]>
1 parent 2b4991b commit 2218449

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

backend/grants/tests/test_tasks.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def test_send_grant_reply_rejected_email(sent_emails):
3131

3232
EmailTemplateFactory(
3333
conference=grant.conference,
34-
identifier=EmailTemplateIdentifier.grant_reply_rejected,
34+
identifier=EmailTemplateIdentifier.grant_rejected,
3535
)
3636

3737
send_grant_reply_rejected_email(grant_id=grant.id)
@@ -41,7 +41,7 @@ def test_send_grant_reply_rejected_email(sent_emails):
4141
assert emails_sent.count() == 1
4242

4343
sent_email = emails_sent.first()
44-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_reply_rejected
44+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_rejected
4545
assert sent_email.email_template.conference == grant.conference
4646
assert sent_email.recipient == user
4747

@@ -77,7 +77,7 @@ def test_send_grant_reply_waiting_list_email(settings, sent_emails):
7777

7878
EmailTemplateFactory(
7979
conference=grant.conference,
80-
identifier=EmailTemplateIdentifier.grant_reply_waiting_list,
80+
identifier=EmailTemplateIdentifier.grant_waiting_list,
8181
)
8282

8383
send_grant_reply_waiting_list_email(grant_id=grant.id)
@@ -87,7 +87,7 @@ def test_send_grant_reply_waiting_list_email(settings, sent_emails):
8787
assert emails_sent.count() == 1
8888

8989
sent_email = emails_sent.first()
90-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_reply_waiting_list
90+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_waiting_list
9191
assert sent_email.email_template.conference == grant.conference
9292
assert sent_email.recipient == user
9393

@@ -123,7 +123,7 @@ def test_handle_grant_reply_sent_reminder(settings, sent_emails):
123123

124124
EmailTemplateFactory(
125125
conference=grant.conference,
126-
identifier=EmailTemplateIdentifier.grant_reply_approved,
126+
identifier=EmailTemplateIdentifier.grant_approved,
127127
)
128128

129129
send_grant_reply_approved_email(grant_id=grant.id, is_reminder=True)
@@ -133,7 +133,7 @@ def test_handle_grant_reply_sent_reminder(settings, sent_emails):
133133
assert emails_sent.count() == 1
134134

135135
sent_email = emails_sent.first()
136-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_reply_approved
136+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_approved
137137
assert sent_email.email_template.conference == grant.conference
138138
assert sent_email.recipient == user
139139

@@ -178,7 +178,7 @@ def test_handle_grant_approved_ticket_travel_accommodation_reply_sent(settings,
178178

179179
EmailTemplateFactory(
180180
conference=grant.conference,
181-
identifier=EmailTemplateIdentifier.grant_reply_approved,
181+
identifier=EmailTemplateIdentifier.grant_approved,
182182
)
183183

184184
send_grant_reply_approved_email(grant_id=grant.id, is_reminder=False)
@@ -188,7 +188,7 @@ def test_handle_grant_approved_ticket_travel_accommodation_reply_sent(settings,
188188
assert emails_sent.count() == 1
189189

190190
sent_email = emails_sent.first()
191-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_reply_approved
191+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_approved
192192
assert sent_email.email_template.conference == grant.conference
193193
assert sent_email.recipient == user
194194

@@ -264,7 +264,7 @@ def test_handle_grant_approved_ticket_only_reply_sent(settings, sent_emails):
264264

265265
EmailTemplateFactory(
266266
conference=grant.conference,
267-
identifier=EmailTemplateIdentifier.grant_reply_approved,
267+
identifier=EmailTemplateIdentifier.grant_approved,
268268
)
269269

270270
send_grant_reply_approved_email(grant_id=grant.id, is_reminder=False)
@@ -274,7 +274,7 @@ def test_handle_grant_approved_ticket_only_reply_sent(settings, sent_emails):
274274
assert emails_sent.count() == 1
275275

276276
sent_email = emails_sent.first()
277-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_reply_approved
277+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_approved
278278
assert sent_email.email_template.conference == grant.conference
279279
assert sent_email.recipient == user
280280

@@ -320,7 +320,7 @@ def test_handle_grant_approved_travel_reply_sent(settings, sent_emails):
320320

321321
EmailTemplateFactory(
322322
conference=grant.conference,
323-
identifier=EmailTemplateIdentifier.grant_reply_approved,
323+
identifier=EmailTemplateIdentifier.grant_approved,
324324
)
325325

326326
send_grant_reply_approved_email(grant_id=grant.id, is_reminder=False)
@@ -330,7 +330,7 @@ def test_handle_grant_approved_travel_reply_sent(settings, sent_emails):
330330
assert emails_sent.count() == 1
331331

332332
sent_email = emails_sent.first()
333-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_reply_approved
333+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_approved
334334
assert sent_email.email_template.conference == grant.conference
335335
assert sent_email.recipient == user
336336

@@ -374,7 +374,7 @@ def test_send_grant_reply_waiting_list_update_email(settings, sent_emails):
374374

375375
EmailTemplateFactory(
376376
conference=grant.conference,
377-
identifier=EmailTemplateIdentifier.grant_reply_waiting_list_update,
377+
identifier=EmailTemplateIdentifier.grant_waiting_list_update,
378378
)
379379

380380
send_grant_reply_waiting_list_update_email(
@@ -386,7 +386,7 @@ def test_send_grant_reply_waiting_list_update_email(settings, sent_emails):
386386
assert emails_sent.count() == 1
387387

388388
sent_email = emails_sent.first()
389-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_reply_waiting_list_update
389+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.grant_waiting_list_update
390390
assert sent_email.email_template.conference == grant.conference
391391
assert sent_email.recipient == user
392392

backend/schedule/tests/test_tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def test_send_submission_time_slot_changed_email(sent_emails):
147147

148148
EmailTemplateFactory(
149149
conference=schedule_item.conference,
150-
identifier=EmailTemplateIdentifier.proposal_time_slot_changed,
150+
identifier=EmailTemplateIdentifier.proposal_scheduled_time_changed,
151151
)
152152

153153
send_submission_time_slot_changed_email(schedule_item_id=schedule_item.id)
@@ -157,7 +157,7 @@ def test_send_submission_time_slot_changed_email(sent_emails):
157157
assert emails_sent.count() == 1
158158

159159
sent_email = emails_sent.first()
160-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.proposal_time_slot_changed
160+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.proposal_scheduled_time_changed
161161
assert sent_email.email_template.conference == schedule_item.conference
162162
assert sent_email.recipient == schedule_item.submission.speaker
163163

backend/sponsors/tests/test_tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def test_send_sponsor_brochure_task(sent_emails):
1616

1717
EmailTemplateFactory(
1818
conference=sponsor_lead.conference,
19-
identifier=EmailTemplateIdentifier.sponsor_brochure,
19+
identifier=EmailTemplateIdentifier.sponsorship_brochure,
2020
)
2121

2222
signer = Signer()
@@ -31,7 +31,7 @@ def test_send_sponsor_brochure_task(sent_emails):
3131
assert emails_sent.count() == 1
3232

3333
sent_email = emails_sent.first()
34-
assert sent_email.email_template.identifier == EmailTemplateIdentifier.sponsor_brochure
34+
assert sent_email.email_template.identifier == EmailTemplateIdentifier.sponsorship_brochure
3535
assert sent_email.email_template.conference == sponsor_lead.conference
3636
assert sent_email.recipient_email == sponsor_lead.email
3737

0 commit comments

Comments
 (0)