Skip to content

Commit

Permalink
update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcoacierno
marcoacierno committed Sep 18, 2024
1 parent 0185359 commit 6b5766e
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 19 deletions.
2 changes: 1 addition & 1 deletion backend/conferences/tests/test_admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ def test_create_speaker_vouchers_on_pretix_doesnt_work_without_pretix_config(
mock_create_voucher.assert_not_called()
mock_messages.error.assert_called_once_with(
request,
"Please configure the speaker voucher quota ID in the conference settings",
"Please configure the conference voucher quota ID in the conference settings",
)

voucher_1.refresh_from_db()
Expand Down
45 changes: 27 additions & 18 deletions backend/schedule/tests/test_admin.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ def test_mark_speakers_to_receive_vouchers(rf, mocker):
mocker.patch(
"conferences.models.conference_voucher.get_random_string",
side_effect=[
"1",
"2",
"3",
"CODE1",
"CODE2",
"CODE3",
],
)
mocker.patch("schedule.admin.messages")
Expand Down Expand Up @@ -65,15 +65,15 @@ def test_mark_speakers_to_receive_vouchers(rf, mocker):
conference_voucher_1 = ConferenceVoucher.objects.get(
user_id=schedule_item_1.submission.speaker_id
)
assert conference_voucher_1.voucher_code == "SPEAKER-1"
assert conference_voucher_1.voucher_code == "CODE1"
assert conference_voucher_1.conference_id == conference.id
assert conference_voucher_1.pretix_voucher_id is None
assert conference_voucher_1.voucher_type == ConferenceVoucher.VoucherType.SPEAKER

conference_voucher_2 = ConferenceVoucher.objects.get(
user_id=schedule_item_2.submission.speaker_id
)
assert conference_voucher_2.voucher_code == "SPEAKER-2"
assert conference_voucher_2.voucher_code == "CODE2"
assert conference_voucher_2.conference_id == conference.id
assert conference_voucher_2.pretix_voucher_id is None
assert conference_voucher_2.voucher_type == ConferenceVoucher.VoucherType.SPEAKER
Expand All @@ -82,7 +82,7 @@ def test_mark_speakers_to_receive_vouchers(rf, mocker):
def test_mark_speakers_to_receive_vouchers_includes_co_speakers(rf, mocker):
mocker.patch(
"conferences.models.conference_voucher.get_random_string",
side_effect=["1", "2"],
side_effect=["CODE1", "CODE2"],
)
mocker.patch("schedule.admin.messages")

Expand All @@ -108,13 +108,13 @@ def test_mark_speakers_to_receive_vouchers_includes_co_speakers(rf, mocker):
conference_voucher_1 = ConferenceVoucher.objects.get(
user_id=schedule_item_1.submission.speaker_id
)
assert conference_voucher_1.voucher_code == "SPEAKER-1"
assert conference_voucher_1.voucher_code == "CODE1"
assert conference_voucher_1.conference_id == conference.id
assert conference_voucher_1.pretix_voucher_id is None
assert conference_voucher_1.voucher_type == ConferenceVoucher.VoucherType.SPEAKER

conference_voucher_2 = ConferenceVoucher.objects.get(user_id=additional_speaker)
assert conference_voucher_2.voucher_code == "SPEAKER-2"
assert conference_voucher_2.voucher_code == "CODE2"
assert conference_voucher_2.conference_id == conference.id
assert conference_voucher_2.pretix_voucher_id is None
assert conference_voucher_2.voucher_type == ConferenceVoucher.VoucherType.CO_SPEAKER
Expand All @@ -124,7 +124,7 @@ def test_additional_speakers_without_main_speaker_are_marked_for_a_speaker_vouch
rf, mocker
):
mocker.patch(
"conferences.models.conference_voucher.get_random_string", side_effect=["1"]
"conferences.models.conference_voucher.get_random_string", side_effect=["CODE1"]
)
mocker.patch("schedule.admin.messages")

Expand All @@ -148,7 +148,7 @@ def test_additional_speakers_without_main_speaker_are_marked_for_a_speaker_vouch
assert ConferenceVoucher.objects.count() == 1

speaker_voucher = ConferenceVoucher.objects.get(user_id=additional_speaker)
assert speaker_voucher.voucher_code == "SPEAKER-1"
assert speaker_voucher.voucher_code == "CODE1"
assert speaker_voucher.conference_id == conference.id
assert speaker_voucher.pretix_voucher_id is None
assert speaker_voucher.voucher_type == ConferenceVoucher.VoucherType.SPEAKER
Expand All @@ -160,7 +160,7 @@ def test_speaker_with_both_main_talk_and_co_speaker_gets_a_speaker_voucher(
):
mocker.patch(
"conferences.models.conference_voucher.get_random_string",
side_effect=["1", "2", "3"],
side_effect=["CODE1", "CODE2", "CODE3"],
)
mocker.patch("schedule.admin.messages")

Expand Down Expand Up @@ -208,7 +208,10 @@ def test_mark_speakers_to_receive_vouchers_doesnt_work_with_multiple_conferences
):
mocker.patch(
"conferences.models.conference_voucher.get_random_string",
side_effect=["1", "2"],
side_effect=[
"CODE1",
"CODE2",
],
)
mock_messages = mocker.patch("schedule.admin.messages")

Expand Down Expand Up @@ -246,7 +249,7 @@ def test_mark_speakers_to_receive_vouchers_only_created_once(
mocker,
):
mocker.patch(
"conferences.models.conference_voucher.get_random_string", side_effect=["2"]
"conferences.models.conference_voucher.get_random_string", side_effect=["CODE2"]
)
mocker.patch("schedule.admin.messages")

Expand Down Expand Up @@ -288,15 +291,18 @@ def test_mark_speakers_to_receive_vouchers_only_created_once(
conference_voucher_2 = ConferenceVoucher.objects.get(
user_id=schedule_item_2.submission.speaker_id
)
assert conference_voucher_2.voucher_code == "SPEAKER-2"
assert conference_voucher_2.voucher_code == "CODE2"
assert conference_voucher_2.conference_id == conference.id
assert conference_voucher_2.pretix_voucher_id is None


def test_mark_speakers_to_receive_vouchers_ignores_excluded_speakers(rf, mocker):
mocker.patch(
"conferences.models.conference_voucher.get_random_string",
side_effect=["1", "2"],
side_effect=[
"CODE1",
"CODE2",
],
)
mocker.patch("schedule.admin.messages")

Expand Down Expand Up @@ -324,7 +330,7 @@ def test_mark_speakers_to_receive_vouchers_ignores_excluded_speakers(rf, mocker)
conference_voucher_1 = ConferenceVoucher.objects.get(
user_id=schedule_item_1.submission.speaker_id
)
assert conference_voucher_1.voucher_code == "SPEAKER-1"
assert conference_voucher_1.voucher_code == "CODE1"
assert conference_voucher_1.conference_id == conference.id
assert conference_voucher_1.pretix_voucher_id is None

Expand All @@ -334,7 +340,10 @@ def test_mark_speakers_to_receive_vouchers_ignores_excluded_speakers_multiple_it
):
mocker.patch(
"conferences.models.conference_voucher.get_random_string",
side_effect=["1", "2"],
side_effect=[
"CODE1",
"CODE2",
],
)
mocker.patch("schedule.admin.messages")

Expand Down Expand Up @@ -370,7 +379,7 @@ def test_mark_speakers_to_receive_vouchers_ignores_excluded_speakers_multiple_it
conference_voucher_1 = ConferenceVoucher.objects.get(
user_id=schedule_item_1.submission.speaker_id
)
assert conference_voucher_1.voucher_code == "SPEAKER-1"
assert conference_voucher_1.voucher_code == "CODE1"
assert conference_voucher_1.conference_id == conference.id
assert conference_voucher_1.pretix_voucher_id is None

Expand Down

0 comments on commit 6b5766e

Please sign in to comment.