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
Switch `AcceptInvitation` ops to read from team schemas behind FF (#4847)
Adrian Gruntkowski95471c00852b
diff --git a/lib/plausible/site/admin.ex b/lib/plausible/site/admin.exindex 6b87e5f906..09881e600a 100644--- a/lib/plausible/site/admin.ex+++ b/lib/plausible/site/admin.ex@@ -131,9 +131,16 @@ defmodule Plausible.SiteAdmin do{:error, "Please select at least one site from the list"}end- defp transfer_ownership_direct(_conn, sites, %{"email" => email}) do+ defp transfer_ownership_direct(conn, sites, %{"email" => email}) do+ current_user = conn.assigns.current_user+with {:ok, new_owner} <- Plausible.Auth.get_user_by(email: email),- {:ok, _} <- Plausible.Site.Memberships.bulk_transfer_ownership_direct(sites, new_owner) do+ {:ok, _} <-+ Plausible.Site.Memberships.bulk_transfer_ownership_direct(+ current_user,+ sites,+ new_owner+ ) do:okelse{:error, :user_not_found} ->diff --git a/lib/plausible/site/memberships.ex b/lib/plausible/site/memberships.exindex 3e520b7e81..73a8be7d7d 100644--- a/lib/plausible/site/memberships.ex+++ b/lib/plausible/site/memberships.ex@@ -9,7 +9,6 @@ defmodule Plausible.Site.Memberships doalias Plausible.Repoalias Plausible.Site.Memberships- defdelegate transfer_ownership(site, user), to: Memberships.AcceptInvitationdefdelegate accept_invitation(invitation_id, user), to: Memberships.AcceptInvitationdefdelegate reject_invitation(invitation_id, user), to: Memberships.RejectInvitationdefdelegate remove_invitation(invitation_id, site), to: Memberships.RemoveInvitation@@ -20,7 +19,8 @@ defmodule Plausible.Site.Memberships dodefdelegate bulk_create_invitation(sites, inviter, invitee_email, role, opts),to: Memberships.CreateInvitation- defdelegate bulk_transfer_ownership_direct(sites, new_owner), to: Memberships.CreateInvitation+ defdelegate bulk_transfer_ownership_direct(current_user, sites, new_owner),+ to: Memberships.AcceptInvitation@spec any?(Auth.User.t()) :: boolean()def any?(user) dodiff --git a/lib/plausible/site/memberships/accept_invitation.ex b/lib/plausible/site/memberships/accept_invitation.exindex f5c9d6b39b..90d265a3aa 100644--- a/lib/plausible/site/memberships/accept_invitation.ex+++ b/lib/plausible/site/memberships/accept_invitation.ex@@ -23,43 +23,36 @@ defmodule Plausible.Site.Memberships.AcceptInvitation dorequire Logger- @spec transfer_ownership(Site.t(), Auth.User.t()) ::- {:ok, Site.Membership.t()}- | {:error,- Billing.Quota.Limits.over_limits_error()- | Ecto.Changeset.t()- | :transfer_to_self- | :no_plan}- def transfer_ownership(site, user) do- site = Repo.preload(site, :owner)-- with :ok <- Invitations.ensure_transfer_valid(site, user, :owner),- :ok <- Invitations.ensure_can_take_ownership(site, user) do- membership = get_or_create_owner_membership(site, user)-- multi = add_and_transfer_ownership(site, membership, user)-- case Repo.transaction(multi) do- {:ok, changes} ->- Plausible.Teams.Invitations.transfer_site_sync(site, user)-- membership = Repo.preload(changes.membership, [:site, :user])-- {:ok, membership}-- {:error, _operation, error, _changes} ->- {:error, error}+ @type transfer_error() ::+ Billing.Quota.Limits.over_limits_error()+ | Ecto.Changeset.t()+ | :transfer_to_self+ | :no_plan++ @type accept_error() ::+ :invitation_not_found+ | Billing.Quota.Limits.over_limits_error()+ | Ecto.Changeset.t()+ | :no_plan++ @spec bulk_transfer_ownership_direct(Auth.User.t(), [Site.t()], Auth.User.t()) ::+ {:ok, [Site.Membership.t()]} | {:error, transfer_error()}+ def bulk_transfer_ownership_direct(current_user, sites, new_owner) do+ Repo.transaction(fn ->+ for site <- sites do+ case transfer_ownership(current_user, site, new_owner) do+ {:ok, membership} ->+ membership++ {:error, error} ->+ Repo.rollback(error)+ endend- end+ end)end@spec accept_invitation(String.t(), Auth.User.t()) ::- {:ok, Site.Membership.t()}- | {:error,- :invitation_not_found- | Billing.Quota.Limits.over_limits_error()- | Ecto.Changeset.t()- | :no_plan}+ {:ok, Site.Membership.t()} | {:error, accept_error()}def accept_invitation(invitation_id, user) dowith {:ok, invitation} <- Invitations.find_for_user(invitation_id, user) doif invitation.role == :owner do@@ -70,11 +63,45 @@ defmodule Plausible.Site.Memberships.AcceptInvitation doendend+ defp transfer_ownership(current_user, site, new_owner) do+ with :ok <-+ Plausible.Teams.Adapter.Read.Invitations.ensure_transfer_valid(+ current_user,+ site,+ new_owner,+ :owner+ ),+ :ok <- Plausible.Teams.Adapter.Read.Ownership.ensure_can_take_ownership(site, new_owner) do+ membership = get_or_create_owner_membership(site, new_owner)++ multi = add_and_transfer_ownership(site, membership, new_owner)++ case Repo.transaction(multi) do+ {:ok, changes} ->+ Plausible.Teams.Invitations.transfer_site_sync(site, new_owner)++ membership = Repo.preload(changes.membership, [:site, :user])++ {:ok, membership}++ {:error, _operation, error, _changes} ->+ {:error, error}+ end+ end+ end+defp do_accept_ownership_transfer(invitation, user) domembership = get_or_create_membership(invitation, user)- site = Repo.preload(invitation.site, :owner)-- with :ok <- Invitations.ensure_can_take_ownership(site, user) do+ site = invitation.site++ with :ok <-+ Plausible.Teams.Adapter.Read.Invitations.ensure_transfer_valid(+ user,+ site,+ user,+ :owner+ ),+ :ok <- Plausible.Teams.Adapter.Read.Ownership.ensure_can_take_ownership(site, user) dosite|> add_and_transfer_ownership(membership, user)|> Multi.delete(:invitation, invitation)diff --git a/lib/plausible/site/memberships/create_invitation.ex b/lib/plausible/site/memberships/create_invitation.exindex 7d3f8f3ba7..c084c25101 100644--- a/lib/plausible/site/memberships/create_invitation.ex+++ b/lib/plausible/site/memberships/create_invitation.ex@@ -37,27 +37,6 @@ defmodule Plausible.Site.Memberships.CreateInvitation doend)end- @spec bulk_transfer_ownership_direct([Site.t()], User.t()) ::- {:ok, [Membership.t()]}- | {:error,- invite_error()- | Quota.Limits.over_limits_error()}- def bulk_transfer_ownership_direct(sites, new_owner) do- Plausible.Repo.transaction(fn ->- for site <- sites do- site = Plausible.Repo.preload(site, :owner)-- case Site.Memberships.transfer_ownership(site, new_owner) do- {:ok, membership} ->- membership-- {:error, error} ->- Plausible.Repo.rollback(error)- end- end- end)- end-@spec bulk_create_invitation([Site.t()], User.t(), String.t(), atom(), Keyword.t()) ::{:ok, [Invitation.t()]} | {:error, invite_error()}def bulk_create_invitation(sites, inviter, invitee_email, role, opts \\ []) dodiff --git a/lib/plausible/teams/adapter/read/invitations.ex b/lib/plausible/teams/adapter/read/invitations.exindex 369a1e1d05..9170df3829 100644--- a/lib/plausible/teams/adapter/read/invitations.ex+++ b/lib/plausible/teams/adapter/read/invitations.ex@@ -51,9 +51,9 @@ defmodule Plausible.Teams.Adapter.Read.Invitations do)end- def ensure_transfer_valid(inviter, site, invitee, role) do+ def ensure_transfer_valid(current_user, site, invitee, role) doswitch(- inviter,+ current_user,team_fn: fn _ ->site_team = Repo.preload(site, :team).teamdiff --git a/lib/plausible/teams/adapter/read/sites.ex b/lib/plausible/teams/adapter/read/sites.exindex 34a4e4df77..0b7936ada7 100644--- a/lib/plausible/teams/adapter/read/sites.ex+++ b/lib/plausible/teams/adapter/read/sites.ex@@ -176,7 +176,19 @@ defmodule Plausible.Teams.Adapter.Read.Sites do)|> Repo.all()- %{memberships: memberships, invitations: invitations}+ site_transfers =+ from(+ st in Teams.SiteTransfer,+ where: st.site_id == ^site.id,+ select: %Plausible.Auth.Invitation{+ invitation_id: st.transfer_id,+ email: st.email,+ role: :owner+ }+ )+ |> Repo.all()++ %{memberships: memberships, invitations: site_transfers ++ invitations}elsesite|> Repo.preload([:invitations, memberships: :user])diff --git a/lib/plausible/teams/sites.ex b/lib/plausible/teams/sites.exindex 4d2e4995ca..6270e8b7c5 100644--- a/lib/plausible/teams/sites.ex+++ b/lib/plausible/teams/sites.ex@@ -214,6 +214,7 @@ defmodule Plausible.Teams.Sites doinner_join: u in assoc(tm, :user),where: tm.team_id == parent_as(:site).team_id,where: u.email == parent_as(:site_transfer).email,+ where: tm.role == :owner,select: 1),select: %{diff --git a/test/plausible/site/admin_test.exs b/test/plausible/site/admin_test.exsindex 99590dd388..20ef337cfb 100644--- a/test/plausible/site/admin_test.exs+++ b/test/plausible/site/admin_test.exs@@ -75,16 +75,15 @@ defmodule Plausible.Site.AdminTest doendtest "new owner must be an existing user", %{conn: conn, transfer_direct_action: action} do- site = insert(:site)+ site = new_site()assert action.(conn, [site], %{"email" => "[email protected]"}) =={:error, "User could not be found"}endtest "new owner can't be the same as old owner", %{conn: conn, transfer_direct_action: action} do- current_owner = insert(:user)-- site = insert(:site, members: [current_owner])+ current_owner = new_user()+ site = new_site(owner: current_owner)assert {:error, "User is already an owner of one of the sites"} =action.(conn, [site], %{"email" => current_owner.email})@@ -96,20 +95,16 @@ defmodule Plausible.Site.AdminTest dotransfer_direct_action: action} dotoday = Date.utc_today()- current_owner = insert(:user)+ current_owner = new_user()new_owner =- insert(:user,- subscription:- build(:growth_subscription,- last_bill_date: Timex.shift(today, days: -5)- )- )+ new_user()+ |> subscribe_to_growth_plan(last_bill_date: Date.shift(today, day: -5))# fills the site limit quota- insert_list(10, :site, members: [new_owner])+ for _ <- 1..10, do: new_site(owner: new_owner)- site = insert(:site, members: [current_owner])+ site = new_site(owner: current_owner)assert {:error, "Plan limits exceeded" <> _} =action.(conn, [site], %{"email" => new_owner.email})@@ -120,18 +115,14 @@ defmodule Plausible.Site.AdminTest dotransfer_direct_action: action} dotoday = Date.utc_today()- current_owner = insert(:user)+ current_owner = new_user()new_owner =- insert(:user,- subscription: build(:subscription, last_bill_date: Timex.shift(today, days: -5))- )-- site1 =- insert(:site, memberships: [build(:site_membership, user: current_owner, role: :owner)])+ new_user()+ |> subscribe_to_growth_plan(last_bill_date: Date.shift(today, day: -5))- site2 =- insert(:site, memberships: [build(:site_membership, user: current_owner, role: :owner)])+ site1 = new_site(owner: current_owner)+ site2 = new_site(owner: current_owner)assert :ok = action.(conn, [site1, site2], %{"email" => new_owner.email})enddiff --git a/test/plausible/site/memberships/accept_invitation_test.exs b/test/plausible/site/memberships/accept_invitation_test.exsindex 88be6a24de..ed9ae82a62 100644--- a/test/plausible/site/memberships/accept_invitation_test.exs+++ b/test/plausible/site/memberships/accept_invitation_test.exs@@ -9,238 +9,100 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do@subject_prefix if ee?(), do: "[Plausible Analytics] ", else: "[Plausible CE] "- describe "transfer_ownership/3" do- test "transfers ownership successfully" do- site = insert(:site, memberships: [])-- existing_owner = insert(:user)-- existing_membership =- insert(:site_membership, user: existing_owner, site: site, role: :owner)-- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)-- assert {:ok, new_membership} =- AcceptInvitation.transfer_ownership(site, new_owner)-- assert new_membership.site_id == site.id- assert new_membership.user_id == new_owner.id- assert new_membership.role == :owner-- existing_membership = Repo.reload!(existing_membership)- assert existing_membership.user_id == existing_owner.id- assert existing_membership.site_id == site.id- assert existing_membership.role == :admin-- assert_no_emails_delivered()- end-- test "transfers ownership with pending invites" do- existing_owner = new_user()- site = new_site(owner: existing_owner)-- invite_guest(site, "[email protected]", role: :viewer, inviter: existing_owner)-+ describe "bulk_transfer_ownership_direct/2" do+ test "transfers ownership for multiple sites in one action" do+ current_owner = new_user()new_owner = new_user() |> subscribe_to_growth_plan()+ site1 = new_site(owner: current_owner)+ site2 = new_site(owner: current_owner)- assert {:ok, _new_membership} =- AcceptInvitation.transfer_ownership(site, new_owner)- end-- @tag :teams- test "syncs ownership transfers provided memberships exist already" do- site = insert(:site, memberships: [])- existing_owner = insert(:user)-- _existing_membership =- insert(:site_membership, user: existing_owner, site: site, role: :owner)-- {:ok, old_team} = Plausible.Teams.get_or_create(existing_owner)-- another_user = insert(:user)-- insert(:site_membership, user: another_user, site: site, role: :viewer)-- another_team_membership =- insert(:team_membership, user: another_user, team: old_team, role: :guest)-- _another_guest_membership =- insert(:guest_membership,- team_membership: another_team_membership,- site: site,- role: :viewer- )-- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)-- assert {:ok, new_membership} =- AcceptInvitation.transfer_ownership(site, new_owner)-- assert new_membership.site_id == site.id- assert new_membership.user_id == new_owner.id- assert new_membership.role == :owner+ assert {:ok, _} =+ AcceptInvitation.bulk_transfer_ownership_direct(+ current_owner,+ [site1, site2],+ new_owner+ )team = assert_team_exists(new_owner)- assert team.id != old_team.id- assert_team_attached(site, team.id)-- assert_guest_membership(team, site, another_user, :viewer)- assert_guest_membership(team, site, existing_owner, :editor)+ assert_team_membership(new_owner, team, :owner)+ assert_team_membership(new_owner, team, :owner)+ assert_guest_membership(team, site1, current_owner, :editor)+ assert_guest_membership(team, site2, current_owner, :editor)end- @tag :ee_only- test "unlocks the site if it was previously locked" do- site = insert(:site, locked: true, memberships: [])- existing_owner = insert(:user)-- insert(:site_membership, user: existing_owner, site: site, role: :owner)-- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)-- assert {:ok, new_membership} =- AcceptInvitation.transfer_ownership(site, new_owner)-- assert new_membership.site_id == site.id- assert new_membership.user_id == new_owner.id- assert new_membership.role == :owner-- refute Repo.reload!(site).locked- end-- for role <- [:viewer, :admin] do- test "upgrades existing #{role} membership into an owner" do- existing_owner = insert(:user)- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)-- site =- insert(:site,- memberships: [- build(:site_membership, user: existing_owner, role: :owner),- build(:site_membership, user: new_owner, role: unquote(role))- ]- )-- assert {:ok, %{id: membership_id}} = AcceptInvitation.transfer_ownership(site, new_owner)-- assert %{role: :admin} =- Plausible.Repo.get_by(Plausible.Site.Membership, user_id: existing_owner.id)-- assert %{id: ^membership_id, role: :owner} =- Plausible.Repo.get_by(Plausible.Site.Membership, user_id: new_owner.id)- end- end+ test "returns error when user is already an owner for one of the sites" do+ current_owner = new_user()+ new_owner = new_user() |> subscribe_to_growth_plan()- test "trial transferring to themselves gets a transfer_to_self error" do- owner = insert(:user, trial_expiry_date: nil)- site = insert(:site, memberships: [build(:site_membership, user: owner, role: :owner)])+ site1 = new_site(owner: current_owner)+ site2 = new_site(owner: new_owner)- assert {:error, :transfer_to_self} = AcceptInvitation.transfer_ownership(site, owner)+ assert {:error, :transfer_to_self} =+ AcceptInvitation.bulk_transfer_ownership_direct(+ current_owner,+ [site1, site2],+ new_owner+ )- assert %{role: :owner} = Plausible.Repo.get_by(Plausible.Site.Membership, user_id: owner.id)- assert Repo.reload!(owner).trial_expiry_date == nil+ assert_team_membership(current_owner, site1.team, :owner)+ assert_team_membership(new_owner, site2.team, :owner)end@tag :ee_only- test "does not allow transferring to an account without an active subscription" do- current_owner = insert(:user)- site = insert(:site, members: [current_owner])-- trial_user = insert(:user)- invited_user = insert(:user, trial_expiry_date: nil)-- user_on_free_10k =- insert(:user, subscription: build(:subscription, paddle_plan_id: "free_10k"))-- user_on_expired_subscription =- insert(:user,- subscription:- build(:growth_subscription,- status: Plausible.Billing.Subscription.Status.deleted(),- next_bill_date: Timex.shift(Timex.today(), days: -1)- )- )-- user_on_paused_subscription =- insert(:user,- subscription:- build(:growth_subscription, status: Plausible.Billing.Subscription.Status.paused())- )-- assert {:error, :no_plan} = AcceptInvitation.transfer_ownership(site, trial_user)- assert {:error, :no_plan} = AcceptInvitation.transfer_ownership(site, invited_user)- assert {:error, :no_plan} = AcceptInvitation.transfer_ownership(site, user_on_free_10k)-- assert {:error, :no_plan} =- AcceptInvitation.transfer_ownership(site, user_on_expired_subscription)+ test "does not allow transferring ownership to a non-member user when at team members limit" do+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()+ site = new_site(owner: old_owner)+ for _ <- 1..3, do: add_guest(site, role: :editor)- assert {:error, :no_plan} =- AcceptInvitation.transfer_ownership(site, user_on_paused_subscription)+ assert {:error, {:over_plan_limits, [:team_member_limit]}} =+ AcceptInvitation.bulk_transfer_ownership_direct(old_owner, [site], new_owner)end- test "does not allow transferring to self" do- current_owner = insert(:user)- site = insert(:site, members: [current_owner])+ @tag :ee_only+ test "allows transferring ownership to existing site member when at team members limit" do+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()+ site = new_site(owner: old_owner)+ add_guest(site, user: new_owner, role: :editor)+ for _ <- 1..2, do: add_guest(site, role: :editor)- assert {:error, :transfer_to_self} =- AcceptInvitation.transfer_ownership(site, current_owner)+ assert {:ok, _} =+ AcceptInvitation.bulk_transfer_ownership_direct(old_owner, [site], new_owner)end@tag :ee_only- test "does not allow transferring to and account without suitable plan" do- current_owner = insert(:user)- site = insert(:site, members: [current_owner])+ test "does not allow transferring ownership when sites limit exceeded" do+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()- new_owner =- insert(:user, subscription: build(:growth_subscription))+ for _ <- 1..10, do: new_site(owner: new_owner)- # fill site quota- insert_list(10, :site, members: [new_owner])+ site = new_site(owner: old_owner)assert {:error, {:over_plan_limits, [:site_limit]}} =- AcceptInvitation.transfer_ownership(site, new_owner)+ AcceptInvitation.bulk_transfer_ownership_direct(old_owner, [site], new_owner)end- @tag :ce_build_only- test "allows transferring to an account without a subscription on self hosted" do- current_owner = insert(:user)- site = insert(:site, members: [current_owner])-- trial_user = insert(:user)- invited_user = insert(:user, trial_expiry_date: nil)-- user_on_free_10k =- insert(:user, subscription: build(:subscription, paddle_plan_id: "free_10k"))+ @tag :ee_only+ test "exceeding limits error takes precedence over missing features" do+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()- user_on_expired_subscription =- insert(:user,- subscription:- build(:growth_subscription,- status: Plausible.Billing.Subscription.Status.deleted(),- next_bill_date: Timex.shift(Timex.today(), days: -1)- )- )+ insert_list(10, :site, members: [new_owner])+ for _ <- 1..10, do: new_site(owner: new_owner)- user_on_paused_subscription =- insert(:user,- subscription:- build(:growth_subscription, status: Plausible.Billing.Subscription.Status.paused())+ site =+ new_site(+ owner: old_owner,+ props_enabled: true,+ allowed_event_props: ["author"])- assert {:ok, _} = AcceptInvitation.transfer_ownership(site, trial_user)- assert {:ok, _} = AcceptInvitation.transfer_ownership(site, invited_user)-- assert {:ok, _} =- AcceptInvitation.transfer_ownership(site, user_on_free_10k)-- assert {:ok, _} =- AcceptInvitation.transfer_ownership(site, user_on_expired_subscription)+ for _ <- 1..3, do: add_guest(site, role: :editor)- assert {:ok, _} =- AcceptInvitation.transfer_ownership(site, user_on_paused_subscription)+ assert {:error, {:over_plan_limits, [:team_member_limit, :site_limit]}} =+ AcceptInvitation.bulk_transfer_ownership_direct(old_owner, [site], new_owner)endend@@ -382,38 +244,25 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dodescribe "accept_invitation/3 - ownership transfers" dotest "converts an ownership transfer into a membership" do- site = insert(:site, memberships: [])- existing_owner = insert(:user)+ existing_owner = new_user()+ site = new_site(owner: existing_owner)- existing_membership =- insert(:site_membership, user: existing_owner, site: site, role: :owner)+ new_owner = new_user() |> subscribe_to_growth_plan()+ new_team = team_of(new_owner)- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)+ invitation = invite_transfer(site, new_owner, inviter: existing_owner)- invitation =- insert(:invitation,- site_id: site.id,- inviter: existing_owner,- email: new_owner.email,- role: :owner- )-- assert {:ok, new_membership} =+ assert {:ok, _new_membership} =AcceptInvitation.accept_invitation(invitation.invitation_id,new_owner)- assert new_membership.site_id == site.id- assert new_membership.user_id == new_owner.id- assert new_membership.role == :owner+ assert_team_attached(site, new_team.id)+refute Repo.reload(invitation)- existing_membership = Repo.reload!(existing_membership)- assert existing_membership.user_id == existing_owner.id- assert existing_membership.site_id == site.id- assert existing_membership.role == :admin+ assert_guest_membership(new_team, site, existing_owner, :editor)assert_email_delivered_with(to: [nil: existing_owner.email],@@ -423,151 +272,74 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do)end- @tag :teams- test "syncs accepted ownership transfer to teams" do- site = insert(:site, memberships: [])- existing_owner = insert(:user)-- _existing_membership =- insert(:site_membership, user: existing_owner, site: site, role: :owner)-- site = Plausible.Teams.load_for_site(site)- old_team = site.team- # site = Repo.reload!(site)-- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)+ test "transfers ownership with pending invites" do+ existing_owner = new_user()+ site = new_site(owner: existing_owner)+ invite_guest(site, "[email protected]", role: :viewer, inviter: existing_owner)+ new_owner = new_user() |> subscribe_to_growth_plan()+ new_team = team_of(new_owner)- invitation =- insert(:invitation,- site_id: site.id,- inviter: existing_owner,- email: new_owner.email,- role: :owner- )+ site_transfer =+ invite_transfer(site, new_owner, inviter: existing_owner)assert {:ok, _new_membership} =- AcceptInvitation.accept_invitation(- invitation.invitation_id,- new_owner- )-- team = assert_team_exists(new_owner)- assert team.id != old_team.id- assert_team_attached(site, team.id)+ AcceptInvitation.accept_invitation(site_transfer.invitation_id, new_owner)- assert_guest_membership(team, site, existing_owner, :editor)+ assert_guest_invitation(new_team, site, "[email protected]", :viewer)+ assert_team_attached(site, new_team.id)end@tag :ee_onlytest "unlocks a previously locked site after transfer" do- site = insert(:site, locked: true, memberships: [])- existing_owner = insert(:user)-- insert(:site_membership, user: existing_owner, site: site, role: :owner)-- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)+ existing_owner = new_user()+ site = new_site(owner: existing_owner, locked: true)+ new_owner = new_user() |> subscribe_to_growth_plan()- invitation =- insert(:invitation,- site_id: site.id,- inviter: existing_owner,- email: new_owner.email,- role: :owner- )+ invitation = invite_transfer(site, new_owner, inviter: existing_owner)- assert {:ok, new_membership} =+ assert {:ok, _new_membership} =AcceptInvitation.accept_invitation(invitation.invitation_id,new_owner)- assert new_membership.site_id == site.id- assert new_membership.user_id == new_owner.id- assert new_membership.role == :ownerrefute Repo.reload(invitation)refute Repo.reload!(site).lockedend- for role <- [:viewer, :admin] do+ for role <- [:viewer, :editor] dotest "upgrades existing #{role} membership into an owner" do- existing_owner = insert(:user)- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)-- site =- insert(:site,- memberships: [- build(:site_membership, user: existing_owner, role: :owner),- build(:site_membership, user: new_owner, role: unquote(role))- ]- )+ existing_owner = new_user()+ new_owner = new_user() |> subscribe_to_growth_plan()+ new_team = team_of(new_owner)++ site = new_site(owner: existing_owner)+ add_guest(site, user: new_owner, role: unquote(role))invitation =- insert(:invitation,- site_id: site.id,- inviter: existing_owner,- email: new_owner.email,- role: :owner- )-- assert {:ok, %{id: membership_id}} =+ invite_transfer(site, new_owner, inviter: existing_owner)++ assert {:ok, _} =AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)- assert %{role: :admin} =- Plausible.Repo.get_by(Plausible.Site.Membership, user_id: existing_owner.id)+ assert_guest_membership(new_team, site, existing_owner, :editor)- assert %{id: ^membership_id, role: :owner} =- Plausible.Repo.get_by(Plausible.Site.Membership, user_id: new_owner.id)+ assert_team_membership(new_owner, new_team, :owner)refute Repo.reload(invitation)endend- test "does note degrade or alter trial when accepting ownership transfer by self" do- owner = insert(:user, trial_expiry_date: nil)- insert(:growth_subscription, user: owner)- site = insert(:site, memberships: [build(:site_membership, user: owner, role: :owner)])-- invitation =- insert(:invitation,- site_id: site.id,- inviter: owner,- email: owner.email,- role: :owner- )-- assert {:ok, %{id: membership_id}} =- AcceptInvitation.accept_invitation(invitation.invitation_id, owner)-- assert %{id: ^membership_id, role: :owner} =- Plausible.Repo.get_by(Plausible.Site.Membership, user_id: owner.id)-- assert Repo.reload!(owner).trial_expiry_date == nil- refute Repo.reload(invitation)- end-@tag :ee_onlytest "does not allow transferring ownership to a non-member user when at team members limit" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()+ site = new_site(owner: old_owner)- site =- insert(:site,- memberships:- [build(:site_membership, user: old_owner, role: :owner)] ++- build_list(3, :site_membership, role: :admin)- )+ for _ <- 1..3, do: add_guest(site, role: :editor)- invitation =- insert(:invitation,- site_id: site.id,- inviter: old_owner,- email: new_owner.email,- role: :owner- )+ invitation = invite_transfer(site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:team_member_limit]}} =AcceptInvitation.accept_invitation(@@ -578,26 +350,15 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do@tag :ee_onlytest "allows transferring ownership to existing site member when at team members limit" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()- site =- insert(:site,- memberships:- [- build(:site_membership, user: old_owner, role: :owner),- build(:site_membership, user: new_owner, role: :admin)- ] ++- build_list(2, :site_membership, role: :admin)- )+ site = new_site(owner: old_owner)- invitation =- insert(:invitation,- site_id: site.id,- inviter: old_owner,- email: new_owner.email,- role: :owner- )+ add_guest(site, user: new_owner, role: :editor)+ for _ <- 1..2, do: add_guest(site, role: :editor)++ invitation = invite_transfer(site, new_owner, inviter: old_owner)assert {:ok, _} =AcceptInvitation.accept_invitation(@@ -608,20 +369,14 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do@tag :ee_onlytest "does not allow transferring ownership when sites limit exceeded" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()- insert_list(10, :site, members: [new_owner])+ for _ <- 1..10, do: new_site(owner: new_owner)- site = insert(:site, members: [old_owner])+ site = new_site(owner: old_owner)- invitation =- insert(:invitation,- site_id: site.id,- inviter: old_owner,- email: new_owner.email,- role: :owner- )+ invitation = invite_transfer(site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:site_limit]}} =AcceptInvitation.accept_invitation(@@ -632,11 +387,11 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do@tag :ee_onlytest "does not allow transferring ownership when pageview limit exceeded" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()- new_owner_site = insert(:site, members: [new_owner])- old_owner_site = insert(:site, members: [old_owner])+ new_owner_site = new_site(owner: new_owner)+ old_owner_site = new_site(owner: old_owner)somewhere_last_month = NaiveDateTime.utc_now() |> Timex.shift(days: -5)somewhere_penultimate_month = NaiveDateTime.utc_now() |> Timex.shift(days: -35)@@ -647,13 +402,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dogenerate_usage_for(old_owner_site, 6_000, somewhere_last_month)generate_usage_for(old_owner_site, 10_000, somewhere_penultimate_month)- invitation =- insert(:invitation,- site_id: old_owner_site.id,- inviter: old_owner,- email: new_owner.email,- role: :owner- )+ invitation = invite_transfer(old_owner_site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:monthly_pageview_limit]}} =AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)@@ -661,16 +410,11 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do@tag :ee_onlytest "allow_next_upgrade_override field has no effect when checking the pageview limit on ownership transfer" do- old_owner = insert(:user, subscription: build(:business_subscription))-- new_owner =- insert(:user,- subscription: build(:growth_subscription),- allow_next_upgrade_override: true- )+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user(allow_next_upgrade_override: true) |> subscribe_to_growth_plan()- new_owner_site = insert(:site, members: [new_owner])- old_owner_site = insert(:site, members: [old_owner])+ new_owner_site = new_site(owner: new_owner)+ old_owner_site = new_site(owner: old_owner)somewhere_last_month = NaiveDateTime.utc_now() |> Timex.shift(days: -5)somewhere_penultimate_month = NaiveDateTime.utc_now() |> Timex.shift(days: -35)@@ -681,13 +425,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest dogenerate_usage_for(old_owner_site, 6_000, somewhere_last_month)generate_usage_for(old_owner_site, 10_000, somewhere_penultimate_month)- invitation =- insert(:invitation,- site_id: old_owner_site.id,- inviter: old_owner,- email: new_owner.email,- role: :owner- )+ invitation = invite_transfer(old_owner_site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:monthly_pageview_limit]}} =AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)@@ -695,30 +433,164 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do@tag :ee_onlytest "does not allow transferring ownership when many limits exceeded at once" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))+ old_owner = new_user() |> subscribe_to_business_plan()+ new_owner = new_user() |> subscribe_to_growth_plan()- insert_list(10, :site, members: [new_owner])+ for _ <- 1..10, do: new_site(owner: new_owner)site =- insert(:site,+ new_site(+ owner: old_owner,props_enabled: true,- allowed_event_props: ["author"],- memberships:- [build(:site_membership, user: old_owner, role: :owner)] ++- build_list(3, :site_membership, role: :admin)+ allowed_event_props: ["author"])- invitation =- insert(:invitation,- site_id: site.id,- inviter: old_owner,- email: new_owner.email,- role: :owner- )+ for _ <- 1..3, do: add_guest(site, role: :editor)++ invitation = invite_transfer(site, new_owner, inviter: old_owner)assert {:error, {:over_plan_limits, [:team_member_limit, :site_limit]}} =AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)end++ @tag :ee_only+ test "does not allow transferring to an account without an active subscription" do+ current_owner = new_user()+ site = new_site(owner: current_owner)++ trial_user = new_user()+ invited_user = new_user(trial_expiry_date: nil)+ user_on_free_10k = new_user() |> subscribe_to_plan("free_10k")++ user_on_expired_subscription =+ new_user()+ |> subscribe_to_growth_plan(+ status: Plausible.Billing.Subscription.Status.deleted(),+ next_bill_date: Timex.shift(Timex.today(), days: -1)+ )++ user_on_paused_subscription =+ new_user()+ |> subscribe_to_growth_plan(status: Plausible.Billing.Subscription.Status.paused())++ transfer = invite_transfer(site, trial_user, inviter: current_owner)++ assert {:error, :no_plan} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, trial_user)++ Repo.delete!(transfer)++ transfer = invite_transfer(site, invited_user, inviter: current_owner)++ assert {:error, :no_plan} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, invited_user)++ Repo.delete!(transfer)++ transfer = invite_transfer(site, user_on_free_10k, inviter: current_owner)++ assert {:error, :no_plan} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, user_on_free_10k)++ Repo.delete!(transfer)++ transfer = invite_transfer(site, user_on_expired_subscription, inviter: current_owner)++ assert {:error, :no_plan} =+ AcceptInvitation.accept_invitation(+ transfer.invitation_id,+ user_on_expired_subscription+ )++ Repo.delete!(transfer)++ transfer = invite_transfer(site, user_on_paused_subscription, inviter: current_owner)++ assert {:error, :no_plan} =+ AcceptInvitation.accept_invitation(+ transfer.invitation_id,+ user_on_paused_subscription+ )++ Repo.delete!(transfer)+ end++ test "does not allow transferring to self" do+ current_owner = new_user() |> subscribe_to_growth_plan()+ site = new_site(owner: current_owner)++ transfer = invite_transfer(site, current_owner, inviter: current_owner)++ assert {:error, :transfer_to_self} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, current_owner)+ end++ @tag :ee_only+ test "does not allow transferring to and account without suitable plan" do+ current_owner = new_user()+ site = new_site(owner: current_owner)+ new_owner = new_user() |> subscribe_to_growth_plan()++ # fill site quota+ for _ <- 1..10, do: new_site(owner: new_owner)+ insert_list(10, :site, members: [new_owner])++ transfer = invite_transfer(site, new_owner, inviter: current_owner)++ assert {:error, {:over_plan_limits, [:site_limit]}} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, new_owner)+ end++ @tag :ce_build_only+ test "allows transferring to an account without a subscription on self hosted" do+ current_owner = new_user()+ site = new_site(owner: current_owner)++ trial_user = new_user()+ invited_user = new_user(trial_expiry_date: nil)+ user_on_free_10k = new_user() |> subscribe_to_plan("free_10k")++ user_on_expired_subscription =+ new_user()+ |> subscribe_to_growth_plan(+ status: Plausible.Billing.Subscription.Status.deleted(),+ next_bill_date: Timex.shift(Timex.today(), days: -1)+ )++ user_on_paused_subscription =+ new_user()+ |> subscribe_to_growth_plan(status: Plausible.Billing.Subscription.Status.paused())++ transfer = invite_transfer(site, trial_user, inviter: current_owner)++ assert {:ok, _} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, trial_user)++ transfer = invite_transfer(site, invited_user, inviter: current_owner)++ assert {:ok, _} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, invited_user)++ transfer = invite_transfer(site, user_on_free_10k, inviter: current_owner)++ assert {:ok, _} =+ AcceptInvitation.accept_invitation(transfer.invitation_id, user_on_free_10k)++ transfer = invite_transfer(site, user_on_expired_subscription, inviter: current_owner)++ assert {:ok, _} =+ AcceptInvitation.accept_invitation(+ transfer.invitation_id,+ user_on_expired_subscription+ )++ transfer = invite_transfer(site, user_on_paused_subscription, inviter: current_owner)++ assert {:ok, _} =+ AcceptInvitation.accept_invitation(+ transfer.invitation_id,+ user_on_paused_subscription+ )+ endendenddiff --git a/test/plausible/site/memberships/create_invitation_test.exs b/test/plausible/site/memberships/create_invitation_test.exsindex cd0d2fc4e6..daa94c57fd 100644--- a/test/plausible/site/memberships/create_invitation_test.exs+++ b/test/plausible/site/memberships/create_invitation_test.exs@@ -270,140 +270,6 @@ defmodule Plausible.Site.Memberships.CreateInvitationTest doendend- describe "bulk_transfer_ownership_direct/2" do- test "transfers ownership for multiple sites in one action" do- current_owner = insert(:user)- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)-- site1 =- insert(:site, memberships: [build(:site_membership, user: current_owner, role: :owner)])-- site2 =- insert(:site, memberships: [build(:site_membership, user: current_owner, role: :owner)])-- assert {:ok, _} = CreateInvitation.bulk_transfer_ownership_direct([site1, site2], new_owner)-- assert Repo.get_by(Plausible.Site.Membership,- site_id: site1.id,- user_id: new_owner.id,- role: :owner- )-- assert Repo.get_by(Plausible.Site.Membership,- site_id: site2.id,- user_id: new_owner.id,- role: :owner- )-- assert Repo.get_by(Plausible.Site.Membership,- site_id: site1.id,- user_id: current_owner.id,- role: :admin- )-- assert Repo.get_by(Plausible.Site.Membership,- site_id: site2.id,- user_id: current_owner.id,- role: :admin- )- end-- test "returns error when user is already an owner for one of the sites" do- current_owner = insert(:user)- new_owner = insert(:user)- insert(:growth_subscription, user: new_owner)-- site1 =- insert(:site, memberships: [build(:site_membership, user: current_owner, role: :owner)])-- site2 = insert(:site, memberships: [build(:site_membership, user: new_owner, role: :owner)])-- assert {:error, :transfer_to_self} =- CreateInvitation.bulk_transfer_ownership_direct([site1, site2], new_owner)-- assert Repo.get_by(Plausible.Site.Membership,- site_id: site1.id,- user_id: current_owner.id,- role: :owner- )-- assert Repo.get_by(Plausible.Site.Membership,- site_id: site2.id,- user_id: new_owner.id,- role: :owner- )- end-- @tag :ee_only- test "does not allow transferring ownership to a non-member user when at team members limit" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))-- site =- insert(:site,- memberships:- [build(:site_membership, user: old_owner, role: :owner)] ++- build_list(3, :site_membership, role: :admin)- )-- assert {:error, {:over_plan_limits, [:team_member_limit]}} =- CreateInvitation.bulk_transfer_ownership_direct([site], new_owner)- end-- @tag :ee_only- test "allows transferring ownership to existing site member when at team members limit" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))-- site =- insert(:site,- memberships:- [- build(:site_membership, user: old_owner, role: :owner),- build(:site_membership, user: new_owner, role: :admin)- ] ++- build_list(2, :site_membership, role: :admin)- )-- assert {:ok, _} =- CreateInvitation.bulk_transfer_ownership_direct([site], new_owner)- end-- @tag :ee_only- test "does not allow transferring ownership when sites limit exceeded" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))-- insert_list(10, :site, members: [new_owner])-- site = insert(:site, members: [old_owner])-- assert {:error, {:over_plan_limits, [:site_limit]}} =- CreateInvitation.bulk_transfer_ownership_direct([site], new_owner)- end-- @tag :ee_only- test "exceeding limits error takes precedence over missing features" do- old_owner = insert(:user, subscription: build(:business_subscription))- new_owner = insert(:user, subscription: build(:growth_subscription))-- insert_list(10, :site, members: [new_owner])-- site =- insert(:site,- props_enabled: true,- allowed_event_props: ["author"],- memberships:- [build(:site_membership, user: old_owner, role: :owner)] ++- build_list(3, :site_membership, role: :admin)- )-- assert {:error, {:over_plan_limits, [:team_member_limit, :site_limit]}} =- CreateInvitation.bulk_transfer_ownership_direct([site], new_owner)- end- end-defp assert_invitation_exists(site, email, role) doassert Repo.exists?(from(i in Plausible.Auth.Invitation,diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exsindex 9376ff7ddc..d6d9786db5 100644--- a/test/plausible/site/sites_test.exs+++ b/test/plausible/site/sites_test.exs@@ -295,7 +295,7 @@ defmodule Plausible.SitesTest dosite1 = new_site(owner: user1, domain: "one.example.com")site2 = new_site(owner: user2, domain: "two.example.com")- site3 = new_site(domain: "three.example.com")+ site3 = new_site(owner: user3, domain: "three.example.com")site4 = new_site(domain: "four.example.com")site5 = new_site(owner: user3, domain: "five.example.com")diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex 269c302e5c..6c9493966c 100644--- a/test/plausible_web/controllers/invitation_controller_test.exs+++ b/test/plausible_web/controllers/invitation_controller_test.exs@@ -1,6 +1,7 @@defmodule PlausibleWeb.Site.InvitationControllerTest douse PlausibleWeb.ConnCase, async: trueuse Plausible.Repo+ use Plausible.Teams.Testuse Bamboo.Testsetup [:create_user, :log_in]@@ -107,13 +108,13 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dodescribe "POST /sites/invitations/:invitation_id/accept - ownership transfer" dotest "downgrades previous owner to admin", %{conn: conn, user: user} do- old_owner = insert(:user)- site = insert(:site, members: [old_owner])+ old_owner = new_user()+ site = new_site(owner: old_owner)- insert(:growth_subscription, user: user)+ subscribe_to_growth_plan(user)+ new_team = team_of(user)- invitation =- insert(:invitation, site_id: site.id, inviter: old_owner, email: user.email, role: :owner)+ invitation = invite_transfer(site, user, inviter: old_owner)conn = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")@@ -122,26 +123,19 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doassert Phoenix.Flash.get(conn.assigns.flash, :success) =~"You now have access to"- refute Repo.exists?(from(i in Plausible.Auth.Invitation, where: i.email == ^user.email))-- old_owner_membership =- Repo.get_by(Plausible.Site.Membership, user_id: old_owner.id, site_id: site.id)-- assert old_owner_membership.role == :admin+ refute Repo.reload(invitation)- new_owner_membership =- Repo.get_by(Plausible.Site.Membership, user_id: user.id, site_id: site.id)+ assert_guest_membership(new_team, site, old_owner, :editor)- assert new_owner_membership.role == :owner+ assert_team_attached(site, new_team.id)end@tag :ee_onlytest "fails when new owner has no plan", %{conn: conn, user: user} do- old_owner = insert(:user)- site = insert(:site, members: [old_owner])+ old_owner = new_user()+ site = new_site(owner: old_owner)- invitation =- insert(:invitation, site_id: site.id, inviter: old_owner, email: user.email, role: :owner)+ invitation = invite_transfer(site, user, inviter: old_owner)conn = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")@@ -153,16 +147,15 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do@tag :ee_onlytest "fails when new owner's plan is unsuitable", %{conn: conn, user: user} do- old_owner = insert(:user)- site = insert(:site, members: [old_owner])+ old_owner = new_user()+ site = new_site(owner: old_owner)- insert(:growth_subscription, user: user)+ subscribe_to_growth_plan(user)# fill site limit quota- insert_list(10, :site, members: [user])+ for _ <- 1..10, do: new_site(owner: user)- invitation =- insert(:invitation, site_id: site.id, inviter: old_owner, email: user.email, role: :owner)+ invitation = invite_transfer(site, user, inviter: old_owner)conn = post(conn, "/sites/invitations/#{invitation.invitation_id}/accept")diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex f8d9b857e6..52a5ca4e8f 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -552,6 +552,19 @@ defmodule PlausibleWeb.SiteControllerTest doassert text_of_element(resp, "#invitation-#{i2.invitation_id}") =="[email protected] Viewer"end++ test "lists pending site transfer", %{conn: conn, user: user} do+ site = new_site(owner: user)+ new_owner = new_user()++ st = invite_transfer(site, new_owner, inviter: user)++ conn = get(conn, "/#{site.domain}/settings/people")+ resp = html_response(conn, 200)++ assert text_of_element(resp, "#invitation-#{st.invitation_id}") ==+ "#{new_owner.email} Owner"+ endenddescribe "GET /:domain/settings/goals" dodiff --git a/test/support/teams/test.ex b/test/support/teams/test.exindex 5e3ff51c65..698f458f6b 100644--- a/test/support/teams/test.ex+++ b/test/support/teams/test.ex@@ -52,7 +52,16 @@ defmodule Plausible.Teams.Test do{:ok, _team} = Teams.get_or_create(user)end- Repo.preload(user, :team_memberships)+ Repo.preload(user, team_memberships: :team)+ end++ def team_of(%{team_memberships: [%{role: :owner, team: %Teams.Team{} = team}]}) do+ team+ end++ def team_of(user) do+ {:ok, team} = Plausible.Teams.get_by_owner(user)+ teamenddef add_guest(site, args \\ []) do@@ -142,10 +151,11 @@ defmodule Plausible.Teams.Test douser |> Repo.preload([:site_memberships, :team_memberships])end- def subscribe_to_growth_plan(user) do+ def subscribe_to_growth_plan(user, attrs \\ []) do{:ok, team} = Teams.get_or_create(user)+ attrs = Keyword.merge([user: user, team: team], attrs)- insert(:growth_subscription, user: user, team: team)+ insert(:growth_subscription, attrs)userenddiff --git a/test/workers/check_usage_test.exs b/test/workers/check_usage_test.exsindex 4c8a5f489a..aa1f8663f1 100644--- a/test/workers/check_usage_test.exs+++ b/test/workers/check_usage_test.exs@@ -369,7 +369,8 @@ defmodule Plausible.Workers.CheckUsageTest doCheckUsage.perform(nil, usage_stub)assert user |> Repo.reload() |> Plausible.Auth.GracePeriod.active?()- team = assert_team_exists(user)+ team = user |> team_of() |> Repo.reload!()+assert Plausible.Auth.GracePeriod.active?(team)usage_stub =