Skip to content

Commit

Permalink
Fix some breaking tests
Browse files Browse the repository at this point in the history
  • Loading branch information
rixx committed May 7, 2024
1 parent 3ee3fb4 commit 3dcadd0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/pretalx/orga/views/event.py
Expand Up @@ -726,7 +726,7 @@ def action_object_name(self):
def action_back_url(self):
return self.get_object().orga_urls.settings

def form_valid(self, form, *args, **kwargs):
def post(self, request, *args, **kwargs):
self.get_object().shred(person=self.request.user)
return redirect("/orga/")

Expand Down
13 changes: 10 additions & 3 deletions src/pretalx/orga/views/organiser.py
Expand Up @@ -151,10 +151,17 @@ def object(self):
)


class TeamUninvite(InviteMixin, PermissionRequired, DetailView):
class TeamUninvite(InviteMixin, PermissionRequired, ActionConfirmMixin, DetailView):
model = TeamInvite
template_name = "orga/settings/team_delete.html"
permission_required = "orga.change_teams"
action_title = _("Retract invitation")
action_text = _("Are you sure you want to retract the invitation to this user?")

def action_object_name(self):
return self.get_object().email

def action_back_url(self):
return self.get_object().team.orga_urls.base

def post(self, request, *args, **kwargs):
self.get_object().delete()
Expand Down Expand Up @@ -269,7 +276,7 @@ def action_object_name(self):
def action_back_url(self):
return self.get_object().orga_urls.base

def form_valid(self, form, *args, **kwargs):
def post(self, *args, **kwargs):
organiser = self.get_object()
organiser.shred(person=self.request.user)
return HttpResponseRedirect("/orga/")
4 changes: 2 additions & 2 deletions src/tests/agenda/views/test_agenda_schedule.py
Expand Up @@ -134,7 +134,7 @@ def test_speaker_page(
other_submission.slots.all().update(is_visible=True)
slot.submission.slots.all().update(is_visible=True)
url = reverse("agenda:speaker", kwargs={"code": speaker.code, "event": event.slug})
with django_assert_num_queries(23):
with django_assert_num_queries(24):
response = client.get(url, follow=True)
assert response.status_code == 200
assert len(response.context["talks"]) == 2, response.context["talks"]
Expand Down Expand Up @@ -165,7 +165,7 @@ def test_speaker_page_other_submissions_only_if_visible(
)

url = reverse("agenda:speaker", kwargs={"code": speaker.code, "event": event.slug})
with django_assert_num_queries(18):
with django_assert_num_queries(19):
response = client.get(url, follow=True)

assert response.status_code == 200
Expand Down
5 changes: 5 additions & 0 deletions src/tests/orga/views/test_orga_views_event.py
Expand Up @@ -992,6 +992,11 @@ def test_edit_review_settings_delete_review_phase(orga_client, event):
response = orga_client.get(phase.urls.delete, follow=True)
assert response.status_code == 200
event = Event.objects.get(slug=event.slug)
with scope(event=event):
assert event.review_phases.count() == 2
response = orga_client.post(phase.urls.delete, follow=True)
assert response.status_code == 200
event = Event.objects.get(slug=event.slug)
with scope(event=event):
assert event.review_phases.count() == 1

Expand Down

0 comments on commit 3dcadd0

Please sign in to comment.