From 187e646fa0b19b5738cfb8a0d72d8d937968d154 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 13 Apr 2018 10:19:17 +0200 Subject: [PATCH] Fix tests and style for last commit --- src/pretix/control/views/dashboards.py | 2 +- src/pretix/control/views/typeahead.py | 2 +- src/tests/control/test_events.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pretix/control/views/dashboards.py b/src/pretix/control/views/dashboards.py index 398df7d2a5..6ec8375ad1 100644 --- a/src/pretix/control/views/dashboards.py +++ b/src/pretix/control/views/dashboards.py @@ -14,7 +14,7 @@ from django.utils import formats from django.utils.formats import date_format from django.utils.html import escape from django.utils.timezone import now -from django.utils.translation import ugettext_lazy as _, ungettext, pgettext +from django.utils.translation import pgettext, ugettext_lazy as _, ungettext from pretix.base.models import ( Item, Order, OrderPosition, RequiredAction, SubEvent, Voucher, diff --git a/src/pretix/control/views/typeahead.py b/src/pretix/control/views/typeahead.py index 6bb6ab3b8e..7048c05fa6 100644 --- a/src/pretix/control/views/typeahead.py +++ b/src/pretix/control/views/typeahead.py @@ -8,7 +8,7 @@ from django.db.models.functions import Coalesce, Greatest from django.http import JsonResponse from django.urls import reverse from django.utils.timezone import make_aware -from django.utils.translation import ugettext as _, pgettext +from django.utils.translation import pgettext, ugettext as _ from pretix.base.models import Organizer, User from pretix.control.permissions import event_permission_required diff --git a/src/tests/control/test_events.py b/src/tests/control/test_events.py index 19d28d655a..7047c4cfef 100644 --- a/src/tests/control/test_events.py +++ b/src/tests/control/test_events.py @@ -829,8 +829,8 @@ class SubEventsTest(SoupTest): assert doc.select(".alert-success") # deleting the second event doc = self.post_doc('/control/event/ccc/30c3/subevents/%d/delete' % self.subevent2.pk, {}) - assert doc.select(".alert-danger") - assert SubEvent.objects.filter(pk=self.subevent2.pk).exists() + assert doc.select(".alert-success") + assert not SubEvent.objects.filter(pk=self.subevent2.pk).exists() assert not SubEvent.objects.filter(pk=self.subevent1.pk).exists() def test_delete_with_orders(self):