diff --git a/src/tests/control/test_settings.py b/src/tests/control/test_settings.py index 16f07f84a8..026c4eb028 100644 --- a/src/tests/control/test_settings.py +++ b/src/tests/control/test_settings.py @@ -91,7 +91,7 @@ class MailSettingPreviewTest(SoupTest): res = json.loads(response.content.decode()) assert res['item'] == 'mail_text_order_free' assert len(res['msgs']) == 1 - assert res['msgs']['en'] == dummy_text + assert dummy_text in res['msgs']['en'] def test_multiple_languages(self): dummy_text = 'This is dummy sentence for test' @@ -105,8 +105,8 @@ class MailSettingPreviewTest(SoupTest): res = json.loads(response.content.decode()) assert res['item'] == 'mail_text_order_free' assert len(res['msgs']) == 2 - assert res['msgs']['en'] == dummy_text - assert res['msgs']['de-informal'] == dummy_text + assert dummy_text in res['msgs']['en'] + assert dummy_text in res['msgs']['de-informal'] def test_i18n_placeholders(self): dummy_text = '{event}' @@ -120,8 +120,8 @@ class MailSettingPreviewTest(SoupTest): res = json.loads(response.content.decode()) assert res['item'] == 'mail_text_order_placed' assert len(res['msgs']) == 2 - assert res['msgs']['en'] == self.locale_event.name['en'] - assert res['msgs']['de-informal'] == self.locale_event.name['de-informal'] + assert self.locale_event.name['en'] in res['msgs']['en'] + assert self.locale_event.name['de-informal'] in res['msgs']['de-informal'] def test_i18n_locale_order(self): self.locale_event.settings.locales = ['de-informal', 'en'] @@ -137,8 +137,8 @@ class MailSettingPreviewTest(SoupTest): res = json.loads(response.content.decode()) assert res['item'] == 'mail_text_order_placed' assert len(res['msgs']) == 2 - assert res['msgs']['de-informal'] == self.locale_event.name['de-informal'] - assert res['msgs']['en'] == self.locale_event.name['en'] + assert self.locale_event.name['de-informal'] in res['msgs']['de-informal'] + assert self.locale_event.name['en'] in res['msgs']['en'] def test_mail_text_order_placed(self): text = '{event}{total}{currency}{date}{payment_info}{url}{invoice_name}{invoice_company}' @@ -268,7 +268,7 @@ class MailSettingPreviewTest(SoupTest): res = json.loads(response.content.decode()) assert res['item'] == 'mail_text_waiting_list' assert len(res['msgs']) == 1 - assert res['msgs']['en'] == text + assert text in res['msgs']['en'] def test_localised_date(self): dummy_text = '{date}' diff --git a/src/tests/plugins/test_checkinlist.py b/src/tests/plugins/test_checkinlist.py index 05ca4a7ed5..b5bd92172f 100644 --- a/src/tests/plugins/test_checkinlist.py +++ b/src/tests/plugins/test_checkinlist.py @@ -59,6 +59,7 @@ def test_csv_simple(event): 'list': event.checkin_lists.first().pk, 'secrets': True, 'sort': 'name', + '_format': 'default', 'questions': [] }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title","Attendee name: @@ -81,6 +82,7 @@ def test_csv_order_by_name_parts(event): # noqa 'list': event.checkin_lists.first().pk, 'secrets': True, 'sort': 'name:given_name', + '_format': 'default', 'questions': [] }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title", @@ -96,6 +98,7 @@ def test_csv_order_by_name_parts(event): # noqa 'list': event.checkin_lists.first().pk, 'secrets': True, 'sort': 'name:family_name', + '_format': 'default', 'questions': [] }) assert clean(content.decode()) == clean(""""Order code","Attendee name","Attendee name: Title",