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
Fix disabled invitation form on business tier (#3508)
hq1af87a63cab86
diff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.exindex bdf34dba05..fa08578be1 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.exsindex a7af00bc26..7e7a231386 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 douse Plausible.Repouse Bamboo.Test+ import Plausible.Test.Support.HTML+setup [:create_user, :log_in]describe "GET /sites/:website/memberships/invite" dotest "shows invite form", %{conn: conn, user: user} dosite = 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]/)endend@@ -33,7 +54,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest dotest "fails to create invitation when is over limit", %{conn: conn, user: user} domemberships =- [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)