Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Ensure guest promotion e-mail is sent w/ updated team name (#5261)

hq1ab350e0b2ba1
diff --git a/lib/plausible_web/live/team_management.ex b/lib/plausible_web/live/team_management.ex
index 3e6ff456e0..ab10b38fce 100644
--- a/lib/plausible_web/live/team_management.ex
+++ b/lib/plausible_web/live/team_management.ex
@@ -283,7 +283,11 @@ defmodule PlausibleWeb.Live.TeamManagement do
%{assigns: %{layout: layout, current_team: current_team, current_user: current_user}} =
socket
) do
- result = Layout.persist(layout, %{current_user: current_user, current_team: current_team})
+ result =
+ Layout.persist(layout, %{
+ current_user: current_user,
+ current_team: Plausible.Repo.reload!(current_team)
+ })
case {result, socket.assigns.mode} do
{{:ok, _}, :team_setup} ->
diff --git a/lib/plausible_web/live/team_setup.ex b/lib/plausible_web/live/team_setup.ex
index 47126bf287..f2b38145fb 100644
--- a/lib/plausible_web/live/team_setup.ex
+++ b/lib/plausible_web/live/team_setup.ex
@@ -111,8 +111,8 @@ defmodule PlausibleWeb.Live.TeamSetup do
socket =
case Repo.update(changeset) do
- {:ok, _team} ->
- assign(socket, team_name_form: to_form(changeset))
+ {:ok, team} ->
+ assign(socket, team_name_form: to_form(changeset), current_team: team)
{:error, changeset} ->
assign(socket, team_name_form: to_form(changeset))
diff --git a/lib/plausible_web/templates/email/team_member_removed.html.heex b/lib/plausible_web/templates/email/team_member_removed.html.heex
index a4ba474eb0..74fada557c 100644
--- a/lib/plausible_web/templates/email/team_member_removed.html.heex
+++ b/lib/plausible_web/templates/email/team_member_removed.html.heex
@@ -1,4 +1,2 @@
-An administrator of \"{@team_membership.team.name}\" team has removed you as a member.
-<br /><br />
-<a href={Routes.site_url(PlausibleWeb.Endpoint, :index)}>Click here</a>
-to view your sites.
+An administrator of "{@team_membership.team.name}" team has removed you as a member. <br /><br />
+<a href={Routes.site_url(PlausibleWeb.Endpoint, :index)}>Click here</a> to view your sites.
diff --git a/test/plausible_web/live/team_setup_test.exs b/test/plausible_web/live/team_setup_test.exs
index 5c4fe28fb9..f4492d72d6 100644
--- a/test/plausible_web/live/team_setup_test.exs
+++ b/test/plausible_web/live/team_setup_test.exs
@@ -163,15 +163,22 @@ defmodule PlausibleWeb.Live.TeamSetupTest do
assert_team_membership(member2, team, :viewer)
end
- test "allows updating guest membership so it moves sections", %{
- conn: conn,
- user: user
- } do
+ test "allows updating guest membership so it moves sections and sends out promotion e-mail",
+ %{
+ conn: conn,
+ user: user,
+ team: team
+ } do
site = new_site(owner: user)
add_guest(site, role: :viewer, user: new_user(name: "Mr Guest", email: "[email protected]"))
+ {:ok, main_lv, _html} = live(conn, @url)
lv = get_child_lv(conn)
+ type_into_input(main_lv, "team[name]", "A-Team!")
+
+ assert Repo.reload!(team).name == "A-Team!"
+
html = render(lv)
assert length(find(html, member_el())) == 1
@@ -183,6 +190,13 @@ defmodule PlausibleWeb.Live.TeamSetupTest do
assert length(find(html, member_el())) == 2
refute element_exists?(html, "#guest-list")
+
+ save_layout(lv)
+
+ assert_email_delivered_with(
+ to: [nil: "[email protected]"],
+ subject: @subject_prefix <> "Welcome to \"A-Team!\" team"
+ )
end
test "fails to save layout with limits breached", %{conn: conn} do