Merge branch 'master' into bt-bugs

bt-bugs
Vinicius Brasil 3 years ago committed by GitHub
commit 44d070bc79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -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(

@ -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)

Loading…
Cancel
Save