Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
select team members by email hash instead of list position (#6705)
RobertJoonase38de9fe107d
diff --git a/test/plausible_web/live/team_management_test.exs b/test/plausible_web/live/team_management_test.exsindex b38bde4b1e..4f1dd12f73 100644--- a/test/plausible_web/live/team_management_test.exs+++ b/test/plausible_web/live/team_management_test.exs@@ -86,17 +86,16 @@ defmodule PlausibleWeb.Live.TeamMangementTest dohtml = render(lv)- assert text_of_element(- html,- "#{member_el()}:nth-of-type(1) button"- ) == "Owner"+ self_row = "#member-row-#{:erlang.phash2(user.email)}"+ member_row = "#member-row-#{:erlang.phash2(member.email)}"- assert text_of_element(html, "#{member_el()}:nth-of-type(1)") =~ "You (SSO)"+ assert text_of_element(html, "#{self_row} button") == "Owner"+ assert text_of_element(html, self_row) =~ "You (SSO)"- assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Viewer"- assert text_of_element(html, "#{member_el()}:nth-of-type(2)") =~ "SSO"+ assert text_of_element(html, "#{member_row} button") == "Viewer"+ assert text_of_element(html, member_row) =~ "SSO"- change_role(lv, 2, "owner")+ change_role(lv, member.email, "owner")html = render(lv)assert html =~ "User must have 2FA enabled to become an owner"@@ -133,23 +132,22 @@ defmodule PlausibleWeb.Live.TeamMangementTest do)end- test "allows updating membership role in place", %{conn: conn, team: team} do+ test "allows updating membership role in place", %{conn: conn, team: team, user: user} domember2 = add_member(team, role: :admin)lv = get_liveview(conn)html = render(lv)- assert text_of_element(- html,- "#{member_el()}:nth-of-type(1) button"- ) == "Owner"+ self_row = "#member-row-#{:erlang.phash2(user.email)}"+ member2_row = "#member-row-#{:erlang.phash2(member2.email)}"- assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Admin"+ assert text_of_element(html, "#{self_row} button") == "Owner"+ assert text_of_element(html, "#{member2_row} button") == "Admin"- change_role(lv, 2, "viewer")+ change_role(lv, member2.email, "viewer")html = render(lv)- assert text_of_element(html, "#{member_el()}:nth-of-type(2) button") == "Viewer"+ assert text_of_element(html, "#{member2_row} button") == "Viewer"assert_no_emails_delivered()@@ -168,7 +166,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert text_of_element(html, "#{guest_el()}:first-of-type button") == "Guest"- change_role(lv, 1, "viewer", guest_el())+ change_role(lv, "[email protected]", "viewer")html = render(lv)assert elem_count(html, member_el()) == 2@@ -227,10 +225,13 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert elem_count(html, member_el()) == 4assert elem_count(html, guest_el()) == 1- pending = find(html, "#{member_el()}:nth-of-type(1)") |> text()- sent = find(html, "#{member_el()}:nth-of-type(2)") |> text()- owner = find(html, "#{member_el()}:nth-of-type(3)") |> text()- admin = find(html, "#{member_el()}:nth-of-type(4)") |> text()+ pending_email = "[email protected]"+ sent_email = "[email protected]"++ pending = text_of_element(html, "#member-row-#{:erlang.phash2(pending_email)}")+ sent = text_of_element(html, "#member-row-#{:erlang.phash2(sent_email)}")+ owner = text_of_element(html, "#member-row-#{:erlang.phash2(user.email)}")+ admin = text_of_element(html, "#member-row-#{:erlang.phash2(member2.email)}")guest_member = find(html, "#{guest_el()}:first-of-type") |> text()@@ -240,14 +241,12 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert admin != ""assert guest_member =~ "Guest"- remove_member(lv, 1)- # next becomes first- remove_member(lv, 1)- # last becomes second- remove_member(lv, 2)+ remove_member(lv, pending_email)+ remove_member(lv, sent_email)+ remove_member(lv, member2.email)# remove guest- remove_member(lv, 1, guest_el())+ remove_member(lv, guest.email)html = render(lv) |> text()@@ -297,9 +296,11 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert elem_count(html, member_el()) == 3assert elem_count(html, guest_el()) == 1- sent = find(html, "#{member_el()}:nth-of-type(1)") |> text()- owner = find(html, "#{member_el()}:nth-of-type(2)") |> text()- admin = find(html, "#{member_el()}:nth-of-type(3)") |> text()+ sent_email = "[email protected]"++ sent = text_of_element(html, "#member-row-#{:erlang.phash2(sent_email)}")+ owner = text_of_element(html, "#member-row-#{:erlang.phash2(user.email)}")+ admin = text_of_element(html, "#member-row-#{:erlang.phash2(member2.email)}")guest_member = find(html, "#{guest_el()}:first-of-type") |> text()@@ -308,12 +309,11 @@ defmodule PlausibleWeb.Live.TeamMangementTest doassert admin != ""assert guest_member =~ "Guest"- remove_member(lv, 1)- # last becomes second- remove_member(lv, 2)+ remove_member(lv, sent_email)+ remove_member(lv, member2.email)# remove guest- remove_member(lv, 1, guest_el())+ remove_member(lv, guest.email)html = render(lv) |> text()@@ -354,7 +354,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest dolv = get_liveview(conn)- change_role(lv, 1, "owner", guest_el())+ change_role(lv, member2.email, "owner")html = render(lv)refute html =~ "Error!"@@ -378,7 +378,7 @@ defmodule PlausibleWeb.Live.TeamMangementTest dolv = get_liveview(conn)- change_role(lv, 2, "owner")+ change_role(lv, member2.email, "owner")html = render(lv)refute html =~ "Error!"@@ -429,38 +429,40 @@ defmodule PlausibleWeb.Live.TeamMangementTest doendend- test "removes self, redirecting away from team", %{conn: conn, team: team} do+ test "removes self, redirecting away from team", %{conn: conn, team: team, user: user} do_owner2 = add_member(team, role: :owner)lv = get_liveview(conn)- remove_member(lv, 1)+ remove_member(lv, user.email)assert_redirect(lv, "/sites?__team=none")endtest "demotes self to billing, redirecting to team general", %{conn: conn,- team: team+ team: team,+ user: user} do_owner2 = add_member(team, role: :owner)lv = get_liveview(conn)- change_role(lv, 1, "billing")+ change_role(lv, user.email, "billing")assert_redirect(lv, "/settings/team/general?__team=#{team.identifier}")endtest "demotes self to viewer, redirecting to team general", %{conn: conn,- team: team+ team: team,+ user: user} do_owner2 = add_member(team, role: :owner)lv = get_liveview(conn)- change_role(lv, 1, "viewer")+ change_role(lv, user.email, "viewer")assert_redirect(lv, "/settings/team/general?__team=#{team.identifier}")end@@ -474,33 +476,34 @@ defmodule PlausibleWeb.Live.TeamMangementTest dolv = get_liveview(conn)- change_role(lv, 2, "billing")+ change_role(lv, member2.email, "billing")assert_team_membership(member2, team, :billing)endtest "demotes self to editor, redirecting to team general", %{conn: conn,- team: team+ team: team,+ user: user} do_owner2 = add_member(team, role: :owner)lv = get_liveview(conn)- change_role(lv, 1, "editor")+ change_role(lv, user.email, "editor")assert_redirect(lv, "/settings/team/general?__team=#{team.identifier}")endend- defp change_role(lv, index, role, main_selector \\ member_el()) do+ defp change_role(lv, email, role) dolv- |> element(~s|#{main_selector}:nth-of-type(#{index}) a[phx-value-role="#{role}"]|)+ |> element(~s|#option-#{:erlang.phash2(email)}-#{role}|)|> render_click()end- defp remove_member(lv, index, main_selector \\ member_el()) do+ defp remove_member(lv, email) dolv- |> element(~s|#{main_selector}:nth-of-type(#{index}) a[phx-click="remove-member"]|)+ |> element(~s|##{:erlang.phash2(email)}-remove|)|> render_click()end