From af87a63cab8693f5b9f78a5c71db93b77d47dd4f Mon Sep 17 00:00:00 2001 From: hq1 Date: Fri, 10 Nov 2023 09:07:30 +0100 Subject: [PATCH] Fix disabled invitation form on business tier (#3508) ref https://github.com/plausible/analytics/pull/3493 --- .../controllers/site/membership_controller.ex | 2 +- .../site/membership_controller_test.exs | 27 ++++++++++++++++--- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.ex index bdf34dba0..fa08578be 100644 --- a/lib/plausible_web/controllers/site/membership_controller.ex +++ b/lib/plausible_web/controllers/site/membership_controller.ex @@ -30,7 +30,7 @@ defmodule PlausibleWeb.Site.MembershipController do |> Plausible.Repo.preload(:owner) limit = Plausible.Billing.Quota.team_member_limit(site.owner) - usage = Plausible.Billing.Quota.team_member_limit(site.owner) + usage = Plausible.Billing.Quota.team_member_usage(site.owner) below_limit? = Plausible.Billing.Quota.below_limit?(usage, limit) render( diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exs index a7af00bc2..7e7a23138 100644 --- a/test/plausible_web/controllers/site/membership_controller_test.exs +++ b/test/plausible_web/controllers/site/membership_controller_test.exs @@ -3,15 +3,36 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do use Plausible.Repo use Bamboo.Test + import Plausible.Test.Support.HTML + setup [:create_user, :log_in] describe "GET /sites/:website/memberships/invite" do test "shows invite form", %{conn: conn, user: user} do site = insert(:site, members: [user]) - conn = get(conn, "/sites/#{site.domain}/memberships/invite") + html = + conn + |> get("/sites/#{site.domain}/memberships/invite") + |> html_response(200) + + assert html =~ "Invite member to" + assert element_exists?(html, ~s/button[type=submit]/) + refute element_exists?(html, ~s/button[type=submit][disabled]/) + end + + test "disables invite form when is over limit", %{conn: conn, user: user} do + memberships = + [build(:site_membership, user: user, role: :owner) | build_list(5, :site_membership)] + + site = insert(:site, memberships: memberships) + + html = + conn + |> get("/sites/#{site.domain}/memberships/invite") + |> html_response(200) - assert html_response(conn, 200) =~ "Invite member to" + assert element_exists?(html, ~s/button[type=submit][disabled]/) end end @@ -33,7 +54,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do test "fails to create invitation when is over limit", %{conn: conn, user: user} do memberships = - [build(:site_membership, user: user, role: :owner)] ++ build_list(5, :site_membership) + [build(:site_membership, user: user, role: :owner) | build_list(5, :site_membership)] site = insert(:site, memberships: memberships)