From 51f276d7197e7a64e8e853531263e84d5ef56753 Mon Sep 17 00:00:00 2001 From: Jens Kleineheismann Date: Thu, 29 Aug 2019 10:28:25 +0200 Subject: [PATCH] FIX: update email tests, after changing the email templates. --- dav_events/tests/test_emails.py | 14 +++++++++++--- dav_events/tests/test_urls.py | 14 ++++++++------ 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dav_events/tests/test_emails.py b/dav_events/tests/test_emails.py index 5805cca..13b33f0 100644 --- a/dav_events/tests/test_emails.py +++ b/dav_events/tests/test_emails.py @@ -145,13 +145,21 @@ Der folgende Link führt zur Veranstaltung: Veröffentlichung: (sofort) ================= +Veröffentlichung starten: -- Veröffentlichung beenden: {day_after_short} 00:00:00 Erstellungsdatum: {first_day_short} 00:00:00 -Titel: {number} - {title} +Titel: {number} {title} Ausschreibung: ============== -{event_text}""" +{number} {title} + +{normalized_long_date} + +{description} + +Leitung: {trainer_firstname} {trainer_familyname} (trainer@localhost) +""" class EmailTestCase(EmailTestMixin, RoleMixin, EventMixin, TestCase): @@ -369,6 +377,6 @@ class EmailTestCase(EmailTestMixin, RoleMixin, EventMixin, TestCase): description=self.event.description, first_day_short=self.event.first_day.strftime('%d.%m.%Y'), day_after_short=(self.event.first_day + datetime.timedelta(1)).strftime('%d.%m.%Y'), - event_text=self.event.render_as_text(), + normalized_long_date=self.event.get_formated_date(format='normalized_long'), ) self.assertBody(mail, expected_body) diff --git a/dav_events/tests/test_urls.py b/dav_events/tests/test_urls.py index 96bc306..c626b84 100644 --- a/dav_events/tests/test_urls.py +++ b/dav_events/tests/test_urls.py @@ -2,13 +2,15 @@ from dav_base.tests.generic import Url, UrlsTestCase from .. import views +url_prefix = 'events' + class TestCase(UrlsTestCase): urls = ( - Url('/events/home', 'dav_events:root', views.base.HomeView.as_view()), - Url('/events/', 'dav_events:list', views.events.EventListView.as_view(), - redirect='/auth/login?next=/events/'), - Url('/events/export', 'dav_events:list_export', views.events.EventListExportView.as_view(), - redirect='/auth/login?next=/events/export'), - Url('/events/create', 'dav_events:create', views.events.EventCreateView.as_view()), + Url('/{}/home'.format(url_prefix), 'dav_events:root', views.base.HomeView.as_view()), + Url('/{}/'.format(url_prefix), 'dav_events:list', views.events.EventListView.as_view(), + redirect='/auth/login?next=/{}/'.format(url_prefix)), + Url('/{}/export'.format(url_prefix), 'dav_events:list_export', views.events.EventListExportView.as_view(), + redirect='/auth/login?next=/{}/export'.format(url_prefix)), + Url('/{}/create'.format(url_prefix), 'dav_events:create', views.events.EventCreateView.as_view()), )