<%= live_render(@conn, PlausibleWeb.Live.PropsSettings,
diff --git a/lib/plausible_web/templates/stats/site_locked.html.eex b/lib/plausible_web/templates/stats/site_locked.html.eex
index e902f0f40..32140805a 100644
--- a/lib/plausible_web/templates/stats/site_locked.html.eex
+++ b/lib/plausible_web/templates/stats/site_locked.html.eex
@@ -21,12 +21,12 @@
<% role when role in [:admin, :viewer] -> %>
- This dashboard is currently locked and cannot be accessed. The site owner <%= @owner.email %> must upgrade their subscription plan in order to
+ This dashboard is currently locked and cannot be accessed. The site owner <%= @site.owner.email %> must upgrade their subscription plan in order to
unlock the stats.
Want to pay for this site with the account you're logged in with?
-
Contact <%= @owner.email %> and ask them to <%= link("transfer the ownership", class: "text-indigo-500", to: "https://plausible.io/docs/transfer-ownership", rel: "noreferrer") %> of the site over to you
+
Contact <%= @site.owner.email %> and ask them to <%= link("transfer the ownership", class: "text-indigo-500", to: "https://plausible.io/docs/transfer-ownership", rel: "noreferrer") %> of the site over to you
diff --git a/lib/workers/send_site_setup_emails.ex b/lib/workers/send_site_setup_emails.ex
index 2bda21885..f1aa523c3 100644
--- a/lib/workers/send_site_setup_emails.ex
+++ b/lib/workers/send_site_setup_emails.ex
@@ -37,14 +37,12 @@ defmodule Plausible.Workers.SendSiteSetupEmails do
left_join: se in "setup_help_emails",
on: se.site_id == s.id,
where: is_nil(se.id),
- where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval")
+ where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"),
+ preload: [:owner]
)
for site <- Repo.all(q) do
- owner =
- Plausible.Sites.owner_for(site)
- |> Plausible.Users.with_subscription()
-
+ owner = Plausible.Users.with_subscription(site.owner)
setup_completed = Plausible.Sites.has_stats?(site)
hours_passed = Timex.diff(Timex.now(), site.inserted_at, :hours)
@@ -60,13 +58,12 @@ defmodule Plausible.Workers.SendSiteSetupEmails do
left_join: se in "setup_success_emails",
on: se.site_id == s.id,
where: is_nil(se.id),
- where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval")
+ where: s.inserted_at > fragment("(now() at time zone 'utc') - '72 hours'::interval"),
+ preload: :owner
)
for site <- Repo.all(q) do
- owner =
- Plausible.Sites.owner_for(site)
- |> Plausible.Users.with_subscription()
+ owner = Plausible.Users.with_subscription(site.owner)
if Plausible.Sites.has_stats?(site) do
send_setup_success_email(owner, site)
diff --git a/priv/plans_v1.json b/priv/plans_v1.json
index 47af17160..54835ef46 100644
--- a/priv/plans_v1.json
+++ b/priv/plans_v1.json
@@ -5,7 +5,8 @@
"monthly_product_id":"558018",
"yearly_product_id":"572810",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -13,7 +14,8 @@
"monthly_product_id":"558745",
"yearly_product_id":"590752",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -21,7 +23,8 @@
"monthly_product_id":"597485",
"yearly_product_id":"597486",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -29,7 +32,8 @@
"monthly_product_id":"597487",
"yearly_product_id":"597488",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -37,7 +41,8 @@
"monthly_product_id":"597642",
"yearly_product_id":"597643",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -45,7 +50,8 @@
"monthly_product_id":"597309",
"yearly_product_id":"597310",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -53,7 +59,8 @@
"monthly_product_id":"597311",
"yearly_product_id":"597312",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -61,7 +68,8 @@
"monthly_product_id":"642352",
"yearly_product_id":"642354",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -69,7 +77,8 @@
"monthly_product_id":"642355",
"yearly_product_id":"642356",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -77,6 +86,7 @@
"monthly_product_id":"650652",
"yearly_product_id":"650653",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
}
]
diff --git a/priv/plans_v2.json b/priv/plans_v2.json
index 428e1d14e..442d46737 100644
--- a/priv/plans_v2.json
+++ b/priv/plans_v2.json
@@ -5,7 +5,8 @@
"monthly_product_id":"654177",
"yearly_product_id":"653232",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -13,7 +14,8 @@
"monthly_product_id":"654178",
"yearly_product_id":"653234",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -21,7 +23,8 @@
"monthly_product_id":"653237",
"yearly_product_id":"653236",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -29,7 +32,8 @@
"monthly_product_id":"653238",
"yearly_product_id":"653239",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -37,7 +41,8 @@
"monthly_product_id":"653240",
"yearly_product_id":"653242",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -45,7 +50,8 @@
"monthly_product_id":"653253",
"yearly_product_id":"653254",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -53,7 +59,8 @@
"monthly_product_id":"653255",
"yearly_product_id":"653256",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -61,7 +68,8 @@
"monthly_product_id":"654181",
"yearly_product_id":"653257",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -69,7 +77,8 @@
"monthly_product_id":"654182",
"yearly_product_id":"653258",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -77,6 +86,7 @@
"monthly_product_id":"654183",
"yearly_product_id":"653259",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
}
]
diff --git a/priv/plans_v3.json b/priv/plans_v3.json
index fa4ed6476..336136b60 100644
--- a/priv/plans_v3.json
+++ b/priv/plans_v3.json
@@ -5,7 +5,8 @@
"monthly_product_id":"749342",
"yearly_product_id":"749343",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -13,7 +14,8 @@
"monthly_product_id":"749344",
"yearly_product_id":"749345",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -21,7 +23,8 @@
"monthly_product_id":"749346",
"yearly_product_id":"749347",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -29,7 +32,8 @@
"monthly_product_id":"749348",
"yearly_product_id":"749349",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -37,7 +41,8 @@
"monthly_product_id":"749350",
"yearly_product_id":"749352",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -45,7 +50,8 @@
"monthly_product_id":"749353",
"yearly_product_id":"749355",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -53,7 +59,8 @@
"monthly_product_id":"749356",
"yearly_product_id":"749357",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -61,6 +68,7 @@
"monthly_product_id":"749358",
"yearly_product_id":"749359",
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
}
]
diff --git a/priv/plans_v4.json b/priv/plans_v4.json
index d4d3b6c0c..02e37bd11 100644
--- a/priv/plans_v4.json
+++ b/priv/plans_v4.json
@@ -5,7 +5,8 @@
"monthly_product_id":"change-me-749342",
"yearly_product_id":"change-me-749343",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"growth",
@@ -13,7 +14,8 @@
"monthly_product_id":"change-me-749344",
"yearly_product_id":"change-me-749345",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"growth",
@@ -21,7 +23,8 @@
"monthly_product_id":"change-me-749346",
"yearly_product_id":"change-me-749347",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"growth",
@@ -29,7 +32,8 @@
"monthly_product_id":"change-me-749348",
"yearly_product_id":"change-me-749349",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"growth",
@@ -37,7 +41,8 @@
"monthly_product_id":"change-me-749350",
"yearly_product_id":"change-me-749352",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"growth",
@@ -45,7 +50,8 @@
"monthly_product_id":"change-me-749353",
"yearly_product_id":"change-me-749355",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"growth",
@@ -53,7 +59,8 @@
"monthly_product_id":"change-me-749356",
"yearly_product_id":"change-me-749357",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"growth",
@@ -61,7 +68,8 @@
"monthly_product_id":"change-me-749358",
"yearly_product_id":"change-me-749359",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":[]
},
{
"kind":"business",
@@ -69,7 +77,8 @@
"monthly_product_id":"change-me-b749342",
"yearly_product_id":"change-me-b749343",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
},
{
"kind":"business",
@@ -77,7 +86,8 @@
"monthly_product_id":"change-me-b749344",
"yearly_product_id":"change-me-b749345",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
},
{
"kind":"business",
@@ -85,7 +95,8 @@
"monthly_product_id":"change-me-b749346",
"yearly_product_id":"change-me-b749347",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
},
{
"kind":"business",
@@ -93,7 +104,8 @@
"monthly_product_id":"change-me-b749348",
"yearly_product_id":"change-me-b749349",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
},
{
"kind":"business",
@@ -101,7 +113,8 @@
"monthly_product_id":"change-me-b749350",
"yearly_product_id":"change-me-b749352",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
},
{
"kind":"business",
@@ -109,7 +122,8 @@
"monthly_product_id":"change-me-b749353",
"yearly_product_id":"change-me-b749355",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
},
{
"kind":"business",
@@ -117,7 +131,8 @@
"monthly_product_id":"change-me-b749356",
"yearly_product_id":"change-me-b749357",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
},
{
"kind":"business",
@@ -125,6 +140,7 @@
"monthly_product_id":"change-me-b749358",
"yearly_product_id":"change-me-b749359",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props","revenue_goals","funnels"]
}
]
diff --git a/priv/sandbox_plans.json b/priv/sandbox_plans.json
index 99de4d2ab..9273c1ab6 100644
--- a/priv/sandbox_plans.json
+++ b/priv/sandbox_plans.json
@@ -5,7 +5,8 @@
"monthly_product_id":"63842",
"yearly_product_id":"63859",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -13,7 +14,8 @@
"monthly_product_id":"63843",
"yearly_product_id":"63860",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -21,7 +23,8 @@
"monthly_product_id":"63844",
"yearly_product_id":"63861",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -29,7 +32,8 @@
"monthly_product_id":"63845",
"yearly_product_id":"63862",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -37,7 +41,8 @@
"monthly_product_id":"63846",
"yearly_product_id":"63863",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -45,7 +50,8 @@
"monthly_product_id":"63847",
"yearly_product_id":"63864",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -53,7 +59,8 @@
"monthly_product_id":"63848",
"yearly_product_id":"63865",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"growth",
@@ -61,7 +68,8 @@
"monthly_product_id":"63849",
"yearly_product_id":"63866",
"site_limit":10,
- "team_member_limit":5
+ "team_member_limit":5,
+ "extra_features":["props"]
},
{
"kind":"business",
@@ -69,7 +77,8 @@
"monthly_product_id":"63850",
"yearly_product_id":"63867",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
},
{
"kind":"business",
@@ -77,7 +86,8 @@
"monthly_product_id":"63851",
"yearly_product_id":"63868",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
},
{
"kind":"business",
@@ -85,7 +95,8 @@
"monthly_product_id":"63852",
"yearly_product_id":"63869",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
},
{
"kind":"business",
@@ -93,7 +104,8 @@
"monthly_product_id":"63853",
"yearly_product_id":"63870",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
},
{
"kind":"business",
@@ -101,7 +113,8 @@
"monthly_product_id":"63854",
"yearly_product_id":"63871",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
},
{
"kind":"business",
@@ -109,7 +122,8 @@
"monthly_product_id":"63855",
"yearly_product_id":"63872",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
},
{
"kind":"business",
@@ -117,7 +131,8 @@
"monthly_product_id":"63856",
"yearly_product_id":"63873",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
},
{
"kind":"business",
@@ -125,6 +140,7 @@
"monthly_product_id":"63857",
"yearly_product_id":"63874",
"site_limit":50,
- "team_member_limit":50
+ "team_member_limit":50,
+ "extra_features":["props", "revenue_goals", "funnels"]
}
]
diff --git a/priv/unlisted_plans_v1.json b/priv/unlisted_plans_v1.json
index 3c00305ca..a0c99b174 100644
--- a/priv/unlisted_plans_v1.json
+++ b/priv/unlisted_plans_v1.json
@@ -5,6 +5,7 @@
"yearly_product_id":"648089",
"monthly_product_id":null,
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
}
]
diff --git a/priv/unlisted_plans_v2.json b/priv/unlisted_plans_v2.json
index 0991f2f4e..f4d36312b 100644
--- a/priv/unlisted_plans_v2.json
+++ b/priv/unlisted_plans_v2.json
@@ -5,6 +5,7 @@
"monthly_product_id":"655350",
"yearly_product_id":null,
"site_limit":50,
- "team_member_limit":"unlimited"
+ "team_member_limit":"unlimited",
+ "extra_features":["props"]
}
]
diff --git a/test/plausible/billing/feature_test.exs b/test/plausible/billing/feature_test.exs
new file mode 100644
index 000000000..1df7b70e2
--- /dev/null
+++ b/test/plausible/billing/feature_test.exs
@@ -0,0 +1,125 @@
+defmodule Plausible.Billing.FeatureTest do
+ use Plausible.DataCase
+
+ @v1_plan_id "558018"
+ @v4_growth_plan_id "change-me-749342"
+ @v4_business_plan_id "change-me-b749342"
+
+ for mod <- [Plausible.Billing.Feature.Funnels, Plausible.Billing.Feature.RevenueGoals] do
+ test "#{mod}.check_availability/1 returns :ok when site owner is on a enterprise plan" do
+ user =
+ insert(:user,
+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: "123321"),
+ subscription: build(:subscription, paddle_plan_id: "123321")
+ )
+
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
+
+ assert :ok == unquote(mod).check_availability(user)
+ assert :ok == unquote(mod).check_availability(site)
+ end
+
+ test "#{mod}.check_availability/1 returns :ok when site owner is on a business plan" do
+ user =
+ insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_business_plan_id))
+
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
+
+ assert :ok == unquote(mod).check_availability(user)
+ assert :ok == unquote(mod).check_availability(site)
+ end
+
+ test "#{mod}.check_availability/1 returns error when site owner is on a growth plan" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
+
+ assert {:error, :upgrade_required} == unquote(mod).check_availability(user)
+ assert {:error, :upgrade_required} == unquote(mod).check_availability(site)
+ end
+
+ test "#{mod}.check_availability/1 returns error when site owner is on an old plan" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v1_plan_id))
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
+
+ assert {:error, :upgrade_required} == unquote(mod).check_availability(user)
+ assert {:error, :upgrade_required} == unquote(mod).check_availability(site)
+ end
+ end
+
+ test "Plausible.Billing.Feature.Props.check_availability/1 applies grandfathering to old plans" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v1_plan_id))
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
+
+ assert :ok == Plausible.Billing.Feature.Props.check_availability(user)
+ assert :ok == Plausible.Billing.Feature.Props.check_availability(site)
+ end
+
+ test "Plausible.Billing.Feature.Goals.check_availability/2 always returns :ok" do
+ u1 = insert(:user, subscription: build(:subscription, paddle_plan_id: @v1_plan_id))
+ u2 = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ u3 = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_business_plan_id))
+
+ u4 =
+ insert(:user,
+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: "123321"),
+ subscription: build(:subscription, paddle_plan_id: "123321")
+ )
+
+ assert :ok == Plausible.Billing.Feature.Goals.check_availability(u1)
+ assert :ok == Plausible.Billing.Feature.Goals.check_availability(u2)
+ assert :ok == Plausible.Billing.Feature.Goals.check_availability(u3)
+ assert :ok == Plausible.Billing.Feature.Goals.check_availability(u4)
+ end
+
+ for {mod, property} <- [
+ {Plausible.Billing.Feature.Funnels, :funnels_enabled},
+ {Plausible.Billing.Feature.Props, :props_enabled}
+ ] do
+ test "#{mod}.toggle/2 toggles #{property} on and off" do
+ site = insert(:site, [{:members, [build(:user)]}, {unquote(property), false}])
+
+ {:ok, site} = unquote(mod).toggle(site)
+ assert Map.get(site, unquote(property))
+ assert unquote(mod).enabled?(site)
+
+ {:ok, site} = unquote(mod).toggle(site)
+ refute Map.get(site, unquote(property))
+ refute unquote(mod).enabled?(site)
+ end
+
+ test "#{mod}.toggle/2 accepts an override option" do
+ site = insert(:site, [{:members, [build(:user)]}, {unquote(property), false}])
+
+ {:ok, site} = unquote(mod).toggle(site, override: false)
+ refute Map.get(site, unquote(property))
+ refute unquote(mod).enabled?(site)
+ end
+
+ test "#{mod}.toggle/2 errors when site owner does not have access to the feature" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ site = insert(:site, [{:members, [user]}, {unquote(property), false}])
+ {:error, :upgrade_required} = unquote(mod).toggle(site)
+ refute unquote(mod).enabled?(site)
+ end
+ end
+
+ test "Plausible.Billing.Feature.Goals.toggle/2 toggles conversions_enabled on and off" do
+ site = insert(:site, [{:members, [build(:user)]}, {:conversions_enabled, false}])
+
+ {:ok, site} = Plausible.Billing.Feature.Goals.toggle(site)
+ assert Map.get(site, :conversions_enabled)
+ assert Plausible.Billing.Feature.Goals.enabled?(site)
+
+ {:ok, site} = Plausible.Billing.Feature.Goals.toggle(site)
+ refute Map.get(site, :conversions_enabled)
+ refute Plausible.Billing.Feature.Goals.enabled?(site)
+ end
+
+ for mod <- [Plausible.Billing.Feature.Funnels, Plausible.Billing.Feature.Props] do
+ test "#{mod}.enabled?/1 returns false when user does not have access to the feature even when enabled" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ site = insert(:site, [{:members, [user]}, {unquote(mod).toggle_field(), true}])
+ refute unquote(mod).enabled?(site)
+ end
+ end
+end
diff --git a/test/plausible/billing/quota_test.exs b/test/plausible/billing/quota_test.exs
index 7784e81e1..00daa2f66 100644
--- a/test/plausible/billing/quota_test.exs
+++ b/test/plausible/billing/quota_test.exs
@@ -363,4 +363,149 @@ defmodule Plausible.Billing.QuotaTest do
assert 50 == Quota.team_member_limit(user_on_business)
end
end
+
+ describe "extra_features_usage/1" do
+ test "returns an empty list" do
+ user = insert(:user)
+ assert [] == Quota.extra_features_usage(user)
+ end
+
+ test "returns :props when user uses custom props" do
+ user = insert(:user)
+
+ insert(:site,
+ allowed_event_props: ["dummy"],
+ memberships: [build(:site_membership, user: user, role: :owner)]
+ )
+
+ assert [:props] == Quota.extra_features_usage(user)
+ end
+
+ test "returns :funnels when user uses funnels" do
+ user = insert(:user)
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
+
+ goals = insert_list(3, :goal, site: site, event_name: fn -> Ecto.UUID.generate() end)
+ steps = Enum.map(goals, &%{"goal_id" => &1.id})
+ Plausible.Funnels.create(site, "dummy", steps)
+
+ assert [:funnels] == Quota.extra_features_usage(user)
+ end
+
+ test "returns :revenue_goals when user uses revenue goals" do
+ user = insert(:user)
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
+ insert(:goal, currency: :USD, site: site, event_name: "Purchase")
+
+ assert [:revenue_goals] == Quota.extra_features_usage(user)
+ end
+
+ test "returns multiple extra features" do
+ user = insert(:user)
+
+ site =
+ insert(:site,
+ allowed_event_props: ["dummy"],
+ memberships: [build(:site_membership, user: user, role: :owner)]
+ )
+
+ insert(:goal, currency: :USD, site: site, event_name: "Purchase")
+
+ goals = insert_list(3, :goal, site: site, event_name: fn -> Ecto.UUID.generate() end)
+ steps = Enum.map(goals, &%{"goal_id" => &1.id})
+ Plausible.Funnels.create(site, "dummy", steps)
+
+ assert [:revenue_goals, :funnels, :props] == Quota.extra_features_usage(user)
+ end
+
+ test "accounts only for sites the user owns" do
+ user = insert(:user)
+
+ insert(:site,
+ allowed_event_props: ["dummy"],
+ memberships: [build(:site_membership, user: user, role: :admin)]
+ )
+
+ assert [] == Quota.extra_features_usage(user)
+ end
+ end
+
+ describe "extra_features_limit/1" do
+ test "returns props when user is on an old plan" do
+ user_on_v1 = insert(:user, subscription: build(:subscription, paddle_plan_id: @v1_plan_id))
+ user_on_v2 = insert(:user, subscription: build(:subscription, paddle_plan_id: @v2_plan_id))
+ user_on_v3 = insert(:user, subscription: build(:subscription, paddle_plan_id: @v3_plan_id))
+
+ assert [:props] == Quota.extra_features_limit(user_on_v1)
+ assert [:props] == Quota.extra_features_limit(user_on_v2)
+ assert [:props] == Quota.extra_features_limit(user_on_v3)
+ end
+
+ test "returns an empty list when user is on free_10k plan" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: "free_10k"))
+ assert [] == Quota.extra_features_limit(user)
+ end
+
+ test "returns all extra features when user is on an enterprise plan" do
+ user = insert(:user)
+
+ enterprise_plan =
+ insert(:enterprise_plan,
+ user_id: user.id,
+ monthly_pageview_limit: 100_000,
+ site_limit: 500
+ )
+
+ _subscription =
+ insert(:subscription, user_id: user.id, paddle_plan_id: enterprise_plan.paddle_plan_id)
+
+ assert [:props, :revenue_goals, :funnels] == Quota.extra_features_limit(user)
+ end
+
+ test "returns all extra features when user in on trial" do
+ user = insert(:user, trial_expiry_date: Timex.shift(Timex.now(), days: 7))
+ assert [:props, :revenue_goals, :funnels] == Quota.extra_features_limit(user)
+ end
+
+ test "returns previous plan limits for enterprise users who have not paid yet" do
+ user =
+ insert(:user,
+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: "123321"),
+ subscription: build(:subscription, paddle_plan_id: @v1_plan_id)
+ )
+
+ assert [:props] == Quota.extra_features_limit(user)
+ end
+
+ test "returns trial limits for enterprise users who have not upgraded yet and are on trial" do
+ user =
+ insert(:user,
+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: "123321"),
+ subscription: nil
+ )
+
+ assert [:props, :revenue_goals, :funnels] == Quota.extra_features_limit(user)
+ end
+
+ test "returns all extra features for enterprise customers" do
+ user =
+ insert(:user,
+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: "123321"),
+ subscription: build(:subscription, paddle_plan_id: "123321")
+ )
+
+ assert [:props, :revenue_goals, :funnels] == Quota.extra_features_limit(user)
+ end
+
+ test "returns all extra features for enterprise customers who are due to change a plan" do
+ user =
+ insert(:user,
+ enterprise_plan: build(:enterprise_plan, paddle_plan_id: "old-paddle-plan-id"),
+ subscription: build(:subscription, paddle_plan_id: "old-paddle-plan-id")
+ )
+
+ insert(:enterprise_plan, user_id: user.id, paddle_plan_id: "new-paddle-plan-id")
+ assert [:props, :revenue_goals, :funnels] == Quota.extra_features_limit(user)
+ end
+ end
end
diff --git a/test/plausible/goals_test.exs b/test/plausible/goals_test.exs
index 98c7ab4f0..864f3655f 100644
--- a/test/plausible/goals_test.exs
+++ b/test/plausible/goals_test.exs
@@ -1,8 +1,9 @@
defmodule Plausible.GoalsTest do
use Plausible.DataCase
-
alias Plausible.Goals
+ @v4_growth_plan_id "change-me-749342"
+
test "create/2 creates goals and trims input" do
site = insert(:site)
{:ok, goal} = Goals.create(site, %{"page_path" => "/foo bar "})
@@ -50,6 +51,7 @@ defmodule Plausible.GoalsTest do
test "create/2 sets site.updated_at for revenue goal" do
site_1 = insert(:site, updated_at: DateTime.add(DateTime.utc_now(), -3600))
+
{:ok, _goal_1} = Goals.create(site_1, %{"event_name" => "Checkout", "currency" => "BRL"})
assert NaiveDateTime.compare(site_1.updated_at, Plausible.Repo.reload!(site_1).updated_at) ==
@@ -70,6 +72,14 @@ defmodule Plausible.GoalsTest do
assert goal.currency == :EUR
end
+ test "create/2 returns error when site does not have access to revenue goals" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ site = insert(:site, members: [user])
+
+ {:error, :upgrade_required} =
+ Goals.create(site, %{"event_name" => "Purchase", "currency" => "EUR"})
+ end
+
test "create/2 fails for unknown currency code" do
site = insert(:site)
diff --git a/test/plausible/props_test.exs b/test/plausible/props_test.exs
index e488ecdba..c0d15c62f 100644
--- a/test/plausible/props_test.exs
+++ b/test/plausible/props_test.exs
@@ -1,6 +1,16 @@
defmodule Plausible.PropsTest do
use Plausible.DataCase
+ @v4_growth_plan_id "change-me-749342"
+
+ test "allow/2 returns error when user plan does not include props" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ site = insert(:site, members: [user])
+
+ assert {:error, :upgrade_required} = Plausible.Props.allow(site, "my-prop-1")
+ assert %Plausible.Site{allowed_event_props: nil} = Plausible.Repo.reload!(site)
+ end
+
test "allow/2 adds props to the array" do
site = insert(:site)
@@ -83,6 +93,32 @@ defmodule Plausible.PropsTest do
assert %Plausible.Site{allowed_event_props: ["my-prop-1"]} = Plausible.Repo.reload!(site)
end
+ test "allow_existing_props/2 returns error when user plan does not include props" do
+ user = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ site = insert(:site, members: [user])
+
+ populate_stats(site, [
+ build(:event,
+ name: "Payment",
+ "meta.key": ["amount"],
+ "meta.value": ["500"]
+ ),
+ build(:event,
+ name: "Payment",
+ "meta.key": ["amount", "logged_in"],
+ "meta.value": ["100", "false"]
+ ),
+ build(:event,
+ name: "Payment",
+ "meta.key": ["amount", "is_customer"],
+ "meta.value": ["100", "false"]
+ )
+ ])
+
+ assert {:error, :upgrade_required} = Plausible.Props.allow_existing_props(site)
+ assert %Plausible.Site{allowed_event_props: nil} = Plausible.Repo.reload!(site)
+ end
+
test "allow_existing_props/1 saves the most frequent prop keys" do
site = insert(:site)
diff --git a/test/plausible/site/cache_test.exs b/test/plausible/site/cache_test.exs
index 4e67f2f89..568bcf9c0 100644
--- a/test/plausible/site/cache_test.exs
+++ b/test/plausible/site/cache_test.exs
@@ -96,6 +96,7 @@ defmodule Plausible.Site.CacheTest do
# the site was added yesterday so full refresh will pick it up
%{id: site_id} = site = insert(:site, domain: "site1.example.com", updated_at: yesterday)
+
# the goal was added yesterday so full refresh will pick it up
Plausible.Goals.create(site, %{"event_name" => "Purchase", "currency" => :BRL},
now: yesterday
diff --git a/test/plausible/site/membership_test.exs b/test/plausible/site/membership_test.exs
index 4efc94b7c..ff2fcc807 100644
--- a/test/plausible/site/membership_test.exs
+++ b/test/plausible/site/membership_test.exs
@@ -4,9 +4,7 @@ defmodule Plausible.Site.MembershipTest do
test "raises on trying to insert two owner memberships for the same site" do
user1 = insert(:user)
user2 = insert(:user)
- site = insert(:site)
-
- insert(:site_membership, site: site, user: user1, role: "owner")
+ site = insert(:site, memberships: [build(:site_membership, user: user1, role: "owner")])
assert_raise Ecto.ConstraintError, ~r/site_memberships_site_id_index/, fn ->
insert(:site_membership, site: site, user: user2, role: "owner")
diff --git a/test/plausible/site/memberships/accept_invitation_test.exs b/test/plausible/site/memberships/accept_invitation_test.exs
index b5c38e2ef..ea76a31bb 100644
--- a/test/plausible/site/memberships/accept_invitation_test.exs
+++ b/test/plausible/site/memberships/accept_invitation_test.exs
@@ -34,9 +34,10 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
end
test "does not degrade role when trying to invite self as an owner" do
- site = insert(:site)
user = insert(:user)
- membership = insert(:site_membership, user: user, site: site, role: :owner)
+
+ %{memberships: [membership]} =
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
invitation =
insert(:invitation,
@@ -93,7 +94,7 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
describe "ownership transfers" do
for {label, opts} <- [{"cloud", []}, {"selfhosted", [selfhost?: true]}] do
test "converts an ownership transfer into a membership on #{label} instance" do
- site = insert(:site)
+ site = insert(:site, memberships: [])
existing_owner = insert(:user)
existing_membership =
@@ -136,37 +137,41 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
for role <- [:viewer, :admin] do
test "upgrades existing #{role} membership into an owner" do
- site = insert(:site)
- owner = insert(:user)
- owner_membership = insert(:site_membership, user: owner, site: site, role: :owner)
+ existing_owner = insert(:user)
new_owner = insert(:user)
- new_owner_membership =
- insert(:site_membership, user: new_owner, site: site, role: unquote(role))
+ site =
+ insert(:site,
+ memberships: [
+ build(:site_membership, user: existing_owner, role: :owner),
+ build(:site_membership, user: new_owner, role: unquote(role))
+ ]
+ )
invitation =
insert(:invitation,
site_id: site.id,
- inviter: owner,
+ inviter: existing_owner,
email: new_owner.email,
role: :owner
)
- assert {:ok, membership} =
+ assert {:ok, %{id: membership_id}} =
AcceptInvitation.accept_invitation(invitation.invitation_id, new_owner)
- assert membership.id == new_owner_membership.id
- assert membership.role == :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)
- assert Repo.reload!(owner_membership).role == :admin
refute Repo.reload(invitation)
end
end
test "does note degrade or alter trial when accepting ownership transfer by self" do
- site = insert(:site)
owner = insert(:user, trial_expiry_date: nil)
- owner_membership = insert(:site_membership, user: owner, site: site, role: :owner)
+ site = insert(:site, memberships: [build(:site_membership, user: owner, role: :owner)])
invitation =
insert(:invitation,
@@ -176,21 +181,24 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
role: :owner
)
- assert {:ok, membership} =
+ assert {:ok, %{id: membership_id}} =
AcceptInvitation.accept_invitation(invitation.invitation_id, owner)
- assert membership.id == owner_membership.id
- assert membership.role == :owner
- assert Repo.reload!(owner).trial_expiry_date == nil
+ 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
test "locks the site if the new owner has no active subscription or trial" do
- site = insert(:site, locked: false)
-
existing_owner = insert(:user)
- insert(:site_membership, user: existing_owner, site: site, role: :owner)
+
+ site =
+ insert(:site,
+ locked: false,
+ memberships: [build(:site_membership, user: existing_owner, role: :owner)]
+ )
new_owner = insert(:user, trial_expiry_date: Date.add(Date.utc_today(), -1))
@@ -209,10 +217,13 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
end
test "does not lock the site or set trial expiry date if the instance is selfhosted" do
- site = insert(:site, locked: false)
-
existing_owner = insert(:user)
- insert(:site_membership, user: existing_owner, site: site, role: :owner)
+
+ site =
+ insert(:site,
+ locked: false,
+ memberships: [build(:site_membership, user: existing_owner, role: :owner)]
+ )
new_owner = insert(:user, trial_expiry_date: nil)
@@ -234,10 +245,13 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
end
test "ends trial of the new owner immediately" do
- site = insert(:site, locked: false)
-
existing_owner = insert(:user)
- insert(:site_membership, user: existing_owner, site: site, role: :owner)
+
+ site =
+ insert(:site,
+ locked: false,
+ memberships: [build(:site_membership, user: existing_owner, role: :owner)]
+ )
new_owner = insert(:user, trial_expiry_date: Date.add(Date.utc_today(), 7))
@@ -257,10 +271,13 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
end
test "sets user's trial expiry date to yesterday if they don't have one" do
- site = insert(:site, locked: false)
-
existing_owner = insert(:user)
- insert(:site_membership, user: existing_owner, site: site, role: :owner)
+
+ site =
+ insert(:site,
+ locked: false,
+ memberships: [build(:site_membership, user: existing_owner, role: :owner)]
+ )
new_owner = insert(:user, trial_expiry_date: nil)
@@ -280,10 +297,14 @@ defmodule Plausible.Site.Memberships.AcceptInvitationTest do
end
test "ends grace period and sends an email about it if new owner is past grace period" do
- site = insert(:site, locked: false)
-
existing_owner = insert(:user)
- insert(:site_membership, user: existing_owner, site: site, role: :owner)
+
+ site =
+ insert(:site,
+ locked: false,
+ memberships: [build(:site_membership, user: existing_owner, role: :owner)]
+ )
+
new_owner = insert(:user, trial_expiry_date: Date.add(Date.utc_today(), -1))
insert(:subscription, user: new_owner, next_bill_date: Timex.today())
diff --git a/test/plausible/site/sites_test.exs b/test/plausible/site/sites_test.exs
index 34385bc99..bd5f00f25 100644
--- a/test/plausible/site/sites_test.exs
+++ b/test/plausible/site/sites_test.exs
@@ -1,7 +1,6 @@
defmodule Plausible.SitesTest do
use Plausible.DataCase
use Bamboo.Test
-
alias Plausible.Sites
describe "is_member?" do
diff --git a/test/plausible_web/components/billing_test.exs b/test/plausible_web/components/billing_test.exs
new file mode 100644
index 000000000..30d0009bd
--- /dev/null
+++ b/test/plausible_web/components/billing_test.exs
@@ -0,0 +1,77 @@
+defmodule PlausibleWeb.Components.BillingTest do
+ use Plausible.DataCase
+ import Phoenix.LiveViewTest
+ alias PlausibleWeb.Components.Billing
+
+ @v4_growth_plan_id "change-me-749342"
+ @v4_business_plan_id "change-me-b749342"
+
+ test "extra_feature_notice/1 renders a message when user is on trial" do
+ me = insert(:user)
+ site = :site |> insert(members: [me]) |> Plausible.Repo.preload(:owner)
+
+ assert render_component(&Billing.extra_feature_notice/1,
+ site: site,
+ current_user: me,
+ feature_mod: Plausible.Billing.Feature.Props
+ ) =~
+ "Custom Properties is part of the Plausible Business plan. You can access it during your trial"
+ end
+
+ test "extra_feature_notice/1 renders an upgrade link when user is the site owner and does not have access to the feature" do
+ me = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+ site = :site |> insert(members: [me]) |> Plausible.Repo.preload(:owner)
+
+ rendered =
+ render_component(&Billing.extra_feature_notice/1,
+ site: site,
+ current_user: me,
+ feature_mod: Plausible.Billing.Feature.Props
+ )
+
+ assert rendered =~ "Custom Properties is part of the Plausible Business plan."
+ assert rendered =~ "upgrade your subscription"
+ assert rendered =~ "/billing/upgrade"
+ end
+
+ test "extra_feature_notice/1 does not render an upgrade link when user is not the site owner" do
+ me = insert(:user)
+ owner = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_growth_plan_id))
+
+ site =
+ :site
+ |> insert(
+ memberships: [
+ build(:site_membership, user: owner, role: :owner),
+ build(:site_membership, user: me, role: :admin)
+ ]
+ )
+ |> Plausible.Repo.preload(:owner)
+
+ rendered =
+ render_component(&Billing.extra_feature_notice/1,
+ site: site,
+ current_user: me,
+ feature_mod: Plausible.Billing.Feature.Funnels
+ )
+
+ assert rendered =~
+ "Funnels is part of the Plausible Business plan. To get access to it, please reach out to the site owner to upgrade your subscription to the Business plan."
+
+ refute rendered =~ "/billing/upgrade"
+ end
+
+ test "extra_feature_notice/1 does not render a notice when the user has access to the feature" do
+ me = insert(:user, subscription: build(:subscription, paddle_plan_id: @v4_business_plan_id))
+ site = :site |> insert(members: [me]) |> Plausible.Repo.preload(:owner)
+
+ rendered =
+ render_component(&Billing.extra_feature_notice/1,
+ site: site,
+ current_user: me,
+ feature_mod: Plausible.Billing.Feature.Funnels
+ )
+
+ assert rendered == ""
+ end
+end
diff --git a/test/plausible_web/controllers/api/internal_controller_test.exs b/test/plausible_web/controllers/api/internal_controller_test.exs
index 76b28e4ee..e5349ca8f 100644
--- a/test/plausible_web/controllers/api/internal_controller_test.exs
+++ b/test/plausible_web/controllers/api/internal_controller_test.exs
@@ -91,9 +91,7 @@ defmodule PlausibleWeb.Api.InternalControllerTest do
end
test "when the logged-in user is an owner of the site", %{conn: conn, user: user} do
- site = insert(:site)
- insert(:site_membership, user: user, site: site, role: :owner)
-
+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :owner)])
conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"})
assert json_response(conn, 200) == "ok"
diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exs
index c58e4f1f2..96cab5e65 100644
--- a/test/plausible_web/controllers/auth_controller_test.exs
+++ b/test/plausible_web/controllers/auth_controller_test.exs
@@ -902,8 +902,7 @@ defmodule PlausibleWeb.AuthControllerTest do
import Ecto.Query
test "can create an API key", %{conn: conn, user: user} do
- site = insert(:site)
- insert(:site_membership, site: site, user: user, role: "owner")
+ insert(:site, memberships: [build(:site_membership, user: user, role: "owner")])
conn =
post(conn, "/settings/api-keys", %{
@@ -920,8 +919,7 @@ defmodule PlausibleWeb.AuthControllerTest do
end
test "cannot create a duplicate API key", %{conn: conn, user: user} do
- site = insert(:site)
- insert(:site_membership, site: site, user: user, role: "owner")
+ insert(:site, memberships: [build(:site_membership, user: user, role: "owner")])
conn =
post(conn, "/settings/api-keys", %{
@@ -945,12 +943,12 @@ defmodule PlausibleWeb.AuthControllerTest do
end
test "can't create api key into another site", %{conn: conn, user: me} do
- my_site = insert(:site)
- insert(:site_membership, site: my_site, user: me, role: "owner")
+ _my_site = insert(:site, memberships: [build(:site_membership, user: me, role: "owner")])
other_user = insert(:user)
- other_site = insert(:site)
- insert(:site_membership, site: other_site, user: other_user, role: "owner")
+
+ _other_site =
+ insert(:site, memberships: [build(:site_membership, user: other_user, role: "owner")])
conn =
post(conn, "/settings/api-keys", %{
@@ -973,7 +971,7 @@ defmodule PlausibleWeb.AuthControllerTest do
test "can't delete api key that doesn't belong to me", %{conn: conn} do
other_user = insert(:user)
- insert(:site_membership, site: insert(:site), user: other_user, role: "owner")
+ insert(:site, memberships: [build(:site_membership, user: other_user, role: "owner")])
assert {:ok, %ApiKey{} = api_key} =
%ApiKey{user_id: other_user.id}
diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exs
index d68ab6733..f57b38d3a 100644
--- a/test/plausible_web/controllers/invitation_controller_test.exs
+++ b/test/plausible_web/controllers/invitation_controller_test.exs
@@ -151,12 +151,12 @@ defmodule PlausibleWeb.Site.InvitationControllerTest do
end
test "fails to remove an invitation from the outside", %{conn: my_conn, user: me} do
- my_site = insert(:site)
- insert(:site_membership, site: my_site, user: me, role: "owner")
+ _my_site = insert(:site, memberships: [build(:site_membership, user: me, role: "owner")])
other_user = insert(:user)
- other_site = insert(:site)
- insert(:site_membership, site: other_site, user: other_user, role: "owner")
+
+ other_site =
+ insert(:site, memberships: [build(:site_membership, user: other_user, role: "owner")])
invitation =
insert(:invitation,
diff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exs
index 8afbefc6b..9c81cc5d5 100644
--- a/test/plausible_web/controllers/site/membership_controller_test.exs
+++ b/test/plausible_web/controllers/site/membership_controller_test.exs
@@ -62,12 +62,12 @@ defmodule PlausibleWeb.Site.MembershipControllerTest do
end
test "fails to create invitation for a foreign site", %{conn: my_conn, user: me} do
- my_site = insert(:site)
- insert(:site_membership, site: my_site, user: me, role: "owner")
+ _my_site = insert(:site, memberships: [build(:site_membership, user: me, role: "owner")])
other_user = insert(:user)
- other_site = insert(:site)
- insert(:site_membership, site: other_site, user: other_user, role: "owner")
+
+ other_site =
+ insert(:site, memberships: [build(:site_membership, user: other_user, role: "owner")])
my_conn =
post(my_conn, "/sites/#{other_site.domain}/memberships/invite", %{
diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs
index 5d52ead07..e968f90b6 100644
--- a/test/plausible_web/controllers/site_controller_test.exs
+++ b/test/plausible_web/controllers/site_controller_test.exs
@@ -397,8 +397,9 @@ defmodule PlausibleWeb.SiteControllerTest do
_my_site = insert(:site, memberships: [build(:site_membership, user: me, role: :owner)])
other_user = insert(:user)
- other_site = insert(:site)
- insert(:site_membership, site: other_site, user: other_user, role: "owner")
+
+ other_site =
+ insert(:site, memberships: [build(:site_membership, user: other_user, role: "owner")])
my_conn = post(my_conn, "/sites/#{other_site.domain}/make-public")
assert my_conn.status == 404
@@ -448,8 +449,10 @@ defmodule PlausibleWeb.SiteControllerTest do
_my_site = insert(:site, memberships: [build(:site_membership, user: me, role: :owner)])
other_user = insert(:user)
- other_site = insert(:site)
- insert(:site_membership, site: other_site, user: other_user, role: "owner")
+
+ other_site =
+ insert(:site, memberships: [build(:site_membership, user: other_user, role: "owner")])
+
insert(:google_auth, user: other_user, site: other_site)
insert(:custom_domain, site: other_site)
insert(:spike_notification, site: other_site)
@@ -634,14 +637,19 @@ defmodule PlausibleWeb.SiteControllerTest do
for {title, setting} <- %{
"Goals" => :conversions_enabled,
"Funnels" => :funnels_enabled,
- "Properties" => :props_enabled
+ "Custom Properties" => :props_enabled
} do
test "can toggle #{title} with admin access", %{
user: user,
conn: conn0
} do
- site = insert(:site)
- insert(:site_membership, user: user, site: site, role: :admin)
+ site =
+ insert(:site,
+ memberships: [
+ build(:site_membership, user: build(:user), role: :owner),
+ build(:site_membership, user: user, role: :admin)
+ ]
+ )
conn =
put(
diff --git a/test/support/factory.ex b/test/support/factory.ex
index 2a24f86ea..2b73b8173 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -23,14 +23,23 @@ defmodule Plausible.Factory do
}
end
- def site_factory do
+ def site_factory(attrs) do
domain = sequence(:domain, &"example-#{&1}.com")
- %Plausible.Site{
+ defined_memberships? =
+ Map.has_key?(attrs, :memberships) ||
+ Map.has_key?(attrs, :members) ||
+ Map.has_key?(attrs, :owner)
+
+ attrs = if defined_memberships?, do: attrs, else: Map.put_new(attrs, :members, [build(:user)])
+
+ site = %Plausible.Site{
native_stats_start_at: ~N[2000-01-01 00:00:00],
domain: domain,
timezone: "UTC"
}
+
+ merge_attributes(site, attrs)
end
def site_membership_factory do