From dbdbfb1144689adf1733b4e21ca1f8f7e19fb419 Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Mon, 25 Sep 2023 11:55:19 +0200 Subject: [PATCH] Redirect to People Settings after removing pending invitation (#3371) --- .../controllers/invitation_controller.ex | 2 +- .../controllers/invitation_controller_test.exs | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.ex index ef21e6b01..26435f0ff 100644 --- a/lib/plausible_web/controllers/invitation_controller.ex +++ b/lib/plausible_web/controllers/invitation_controller.ex @@ -131,6 +131,6 @@ defmodule PlausibleWeb.InvitationController do conn |> put_flash(:success, "You have removed the invitation for #{invitation.email}") - |> redirect(to: Routes.site_path(conn, :settings_general, invitation.site.domain)) + |> redirect(to: Routes.site_path(conn, :settings_people, invitation.site.domain)) end end diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exs index cd1876fcf..8121b4485 100644 --- a/test/plausible_web/controllers/invitation_controller_test.exs +++ b/test/plausible_web/controllers/invitation_controller_test.exs @@ -264,10 +264,13 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do role: :admin ) - delete( - conn, - Routes.invitation_path(conn, :remove_invitation, site.domain, invitation.invitation_id) - ) + conn = + delete( + conn, + Routes.invitation_path(conn, :remove_invitation, site.domain, invitation.invitation_id) + ) + + assert redirected_to(conn, 302) == "/#{site.domain}/settings/people" refute Repo.exists?( from i in Plausible.Auth.Invitation, where: i.email == "jane@example.com"