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
Improve test coverage (#2392)
Adam Rutkowskia44b8ff7f547
diff --git a/lib/plausible/goals.ex b/lib/plausible/goals.exindex 3d284c13b0..a0760e51d4 100644--- a/lib/plausible/goals.ex+++ b/lib/plausible/goals.ex@@ -40,8 +40,15 @@ defmodule Plausible.Goals do|> Enum.map(&maybe_trim/1)end- def delete(id) do- Repo.one(from g in Goal, where: g.id == ^id) |> Repo.delete!()+ def delete(id, domain) do+ case Repo.delete_all(+ from g in Goal,+ where: g.id == ^id,+ where: g.domain == ^domain+ ) do+ {1, _} -> :ok+ {0, _} -> {:error, :not_found}+ endenddefp maybe_trim(%Goal{} = goal) dodiff --git a/lib/plausible_web/controllers/api/external_sites_controller.ex b/lib/plausible_web/controllers/api/external_sites_controller.exindex 161ddc4cb3..3144074aad 100644--- a/lib/plausible_web/controllers/api/external_sites_controller.ex+++ b/lib/plausible_web/controllers/api/external_sites_controller.ex@@ -115,13 +115,12 @@ defmodule PlausibleWeb.Api.ExternalSitesController do{:ok, goal_id} <- expect_param_key(params, "goal_id"),site when not is_nil(site) <-Sites.get_for_user(conn.assigns[:current_user].id, site_id, [:owner, :admin]) do- goal = Repo.get_by(Plausible.Goal, id: goal_id)+ case Goals.delete(goal_id, site.domain) do+ :ok ->+ json(conn, %{"deleted" => true})- if goal do- Goals.delete(goal_id)- json(conn, %{"deleted" => true})- else- H.not_found(conn, "Goal could not be found")+ {:error, :not_found} ->+ H.not_found(conn, "Goal could not be found")endelsenil ->diff --git a/lib/plausible_web/controllers/invitation_controller.ex b/lib/plausible_web/controllers/invitation_controller.exindex 2b6d97bbea..8fc4204418 100644--- a/lib/plausible_web/controllers/invitation_controller.ex+++ b/lib/plausible_web/controllers/invitation_controller.ex@@ -7,6 +7,11 @@ defmodule PlausibleWeb.InvitationController doplug PlausibleWeb.RequireAccountPlug+ @require_owner [:remove_invitation]++ plug PlausibleWeb.AuthorizeSiteAccess,+ [:owner, :admin] when action in @require_owner+def accept_invitation(conn, %{"invitation_id" => invitation_id}) doinvitation =Repo.get_by!(Invitation, invitation_id: invitation_id)@@ -111,7 +116,7 @@ defmodule PlausibleWeb.InvitationController dodef remove_invitation(conn, %{"invitation_id" => invitation_id}) doinvitation =- Repo.get_by!(Invitation, invitation_id: invitation_id)+ Repo.get_by!(Invitation, invitation_id: invitation_id, site_id: conn.assigns[:site].id)|> Repo.preload(:site)Repo.delete!(invitation)diff --git a/lib/plausible_web/controllers/site/membership_controller.ex b/lib/plausible_web/controllers/site/membership_controller.exindex 8b4b50a5e4..fcf96ea884 100644--- a/lib/plausible_web/controllers/site/membership_controller.ex+++ b/lib/plausible_web/controllers/site/membership_controller.ex@@ -24,8 +24,8 @@ defmodule PlausibleWeb.Site.MembershipController doplug PlausibleWeb.AuthorizeSiteAccess,[:owner, :admin] when action not in @only_owner_is_allowed_to- def invite_member_form(conn, %{"website" => site_domain}) do- site = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)+ def invite_member_form(conn, _params) do+ site = Sites.get_for_user!(conn.assigns[:current_user].id, conn.assigns[:site].domain)render(conn,@@ -36,7 +36,8 @@ defmodule PlausibleWeb.Site.MembershipController do)end- def invite_member(conn, %{"website" => site_domain, "email" => email, "role" => role}) do+ def invite_member(conn, %{"email" => email, "role" => role}) do+ site_domain = conn.assigns[:site].domainsite = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)user = Plausible.Auth.find_user_by(email: email)@@ -97,7 +98,8 @@ defmodule PlausibleWeb.Site.MembershipController doendend- def transfer_ownership_form(conn, %{"website" => site_domain}) do+ def transfer_ownership_form(conn, _params) do+ site_domain = conn.assigns[:site].domainsite = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)render(@@ -109,7 +111,8 @@ defmodule PlausibleWeb.Site.MembershipController do)end- def transfer_ownership(conn, %{"website" => site_domain, "email" => email}) do+ def transfer_ownership(conn, %{"email" => email}) do+ site_domain = conn.assigns[:site].domainsite = Sites.get_for_user!(conn.assigns[:current_user].id, site_domain)user = Plausible.Auth.find_user_by(email: email)@@ -192,27 +195,46 @@ defmodule PlausibleWeb.Site.MembershipController dodefp can_grant_role_to_other?(_, _), do: falsedef remove_member(conn, %{"id" => id}) do- membership =- Repo.get!(Membership, id)- |> Repo.preload([:user, :site])+ site = conn.assigns[:site]+ site_id = site.id- Repo.delete!(membership)+ membership_q =+ from m in Membership,+ where: m.id == ^id,+ where: m.site_id == ^site_id,+ inner_join: user in assoc(m, :user),+ inner_join: site in assoc(m, :site),+ preload: [user: user, site: site]- PlausibleWeb.Email.site_member_removed(membership)- |> Plausible.Mailer.send()+ membership = Repo.one(membership_q)- redirect_target =- if membership.user.id == conn.assigns[:current_user].id do- "/#{URI.encode_www_form(membership.site.domain)}"- else- Routes.site_path(conn, :settings_people, membership.site.domain)- end+ if membership do+ Repo.delete!(membership)- conn- |> put_flash(- :success,- "#{membership.user.name} has been removed from #{membership.site.domain}"- )- |> redirect(to: redirect_target)+ membership+ |> PlausibleWeb.Email.site_member_removed()+ |> Plausible.Mailer.send()++ redirect_target =+ if membership.user.id == conn.assigns[:current_user].id do+ "/#{URI.encode_www_form(membership.site.domain)}"+ else+ Routes.site_path(conn, :settings_people, site.domain)+ end++ conn+ |> put_flash(+ :success,+ "#{membership.user.name} has been removed from #{site.domain}"+ )+ |> redirect(to: redirect_target)+ else+ conn+ |> put_flash(+ :error,+ "Failed to find membership to remove"+ )+ |> redirect(to: Routes.site_path(conn, :settings_people, site.domain))+ endendenddiff --git a/lib/plausible_web/controllers/site_controller.ex b/lib/plausible_web/controllers/site_controller.exindex 62f3f1e23c..2a7eb1e44e 100644--- a/lib/plausible_web/controllers/site_controller.ex+++ b/lib/plausible_web/controllers/site_controller.ex@@ -151,12 +151,18 @@ defmodule PlausibleWeb.SiteController doendend- def delete_goal(conn, %{"website" => website, "id" => goal_id}) do- Plausible.Goals.delete(goal_id)+ def delete_goal(conn, %{"id" => goal_id}) do+ case Plausible.Goals.delete(goal_id, conn.assigns[:site].domain) do+ :ok ->+ conn+ |> put_flash(:success, "Goal deleted successfully")+ |> redirect(to: Routes.site_path(conn, :settings_goals, conn.assigns[:site].domain))- conn- |> put_flash(:success, "Goal deleted successfully")- |> redirect(to: Routes.site_path(conn, :settings_goals, website))+ {:error, :not_found} ->+ conn+ |> put_flash(:error, "Could not find goal")+ |> redirect(to: Routes.site_path(conn, :settings_goals, conn.assigns[:site].domain))+ endenddef settings(conn, %{"website" => website}) do@@ -615,23 +621,44 @@ defmodule PlausibleWeb.SiteController dodef delete_shared_link(conn, %{"slug" => slug}) dosite = conn.assigns[:site]+ site_id = site.id++ case Repo.delete_all(+ from l in Plausible.Site.SharedLink,+ where: l.slug == ^slug,+ where: l.site_id == ^site_id+ ) do+ {1, _} ->+ conn+ |> put_flash(:success, "Shared Link deleted")+ |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")- Repo.get_by(Plausible.Site.SharedLink, slug: slug)- |> Repo.delete!()-- redirect(conn, to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")+ {0, _} ->+ conn+ |> put_flash(:error, "Could not find Shared Link")+ |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/visibility")+ endend- def delete_custom_domain(conn, _params) do- site =- conn.assigns[:site]- |> Repo.preload(:custom_domain)-- Repo.delete!(site.custom_domain)+ def delete_custom_domain(conn, %{"id" => domain_id}) do+ site = conn.assigns[:site]+ site_id = site.id++ case Repo.delete_all(+ from d in Plausible.Site.CustomDomain,+ where: d.site_id == ^site_id,+ where: d.id == ^domain_id+ ) do+ {1, _} ->+ conn+ |> put_flash(:success, "Custom domain deleted successfully")+ |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general")- conn- |> put_flash(:success, "Custom domain deleted successfully")- |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general")+ {0, _} ->+ conn+ |> put_flash(:error, "Failed to delete custom domain")+ |> redirect(to: "/#{URI.encode_www_form(site.domain)}/settings/general")+ endenddef import_from_google_user_metric_notice(conn, %{diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.exindex d86049d508..2667b49f30 100644--- a/lib/plausible_web/router.ex+++ b/lib/plausible_web/router.ex@@ -221,9 +221,11 @@ defmodule PlausibleWeb.Router doget "/sites/:website/memberships/invite", Site.MembershipController, :invite_member_formpost "/sites/:website/memberships/invite", Site.MembershipController, :invite_member- post "/sites//invitations/:invitation_id/accept", InvitationController, :accept_invitation- post "/sites//invitations/:invitation_id/reject", InvitationController, :reject_invitation- delete "/sites//invitations/:invitation_id", InvitationController, :remove_invitation+ post "/sites/invitations/:invitation_id/accept", InvitationController, :accept_invitation++ post "/sites/invitations/:invitation_id/reject", InvitationController, :reject_invitation++ delete "/sites/:website/invitations/:invitation_id", InvitationController, :remove_invitationget "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownership_formpost "/sites/:website/transfer-ownership", Site.MembershipController, :transfer_ownershipdiff --git a/lib/plausible_web/templates/site/settings_people.html.eex b/lib/plausible_web/templates/site/settings_people.html.eexindex 8840129585..ca43e3a63c 100644--- a/lib/plausible_web/templates/site/settings_people.html.eex+++ b/lib/plausible_web/templates/site/settings_people.html.eex@@ -126,7 +126,7 @@<%= invitation.role |> Atom.to_string |> String.capitalize %></td><td class="px-6 py-4 whitespace-nowrap text-right text-sm font-medium">- <%= link("Remove", to: "/sites/invitations/#{invitation.invitation_id}", method: :delete, class: "text-red-600 hover:text-red-900") %>+ <%= link("Remove", to: Routes.invitation_path(@conn, :remove_invitation, @site.domain, invitation.invitation_id), method: :delete, class: "text-red-600 hover:text-red-900") %></td></tr><% end %>diff --git a/test/plausible_web/controllers/invitation_controller_test.exs b/test/plausible_web/controllers/invitation_controller_test.exsindex 41640f377c..872497d74f 100644--- a/test/plausible_web/controllers/invitation_controller_test.exs+++ b/test/plausible_web/controllers/invitation_controller_test.exs@@ -196,9 +196,9 @@ defmodule PlausibleWeb.Site.InvitationControllerTest doendend- describe "DELETE /sites/invitations/:invitation_id" do- test "removes the invitation", %{conn: conn} do- site = insert(:site)+ describe "DELETE /sites/:website/invitations/:invitation_id" do+ test "removes the invitation", %{conn: conn, user: user} do+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :admin)])invitation =insert(:invitation,@@ -208,11 +208,66 @@ defmodule PlausibleWeb.Site.InvitationControllerTest dorole: :admin)- delete(conn, "/sites/invitations/#{invitation.invitation_id}")+ delete(+ conn,+ Routes.invitation_path(conn, :remove_invitation, site.domain, invitation.invitation_id)+ )refute Repo.exists?(from i in Plausible.Auth.Invitation, where: i.email == "[email protected]")end++ test "fails to remove an invitation with insufficient permission", %{conn: conn, user: user} do+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :viewer)])++ invitation =+ insert(:invitation,+ site_id: site.id,+ inviter: build(:user),+ email: "[email protected]",+ role: :admin+ )++ delete(+ conn,+ Routes.invitation_path(conn, :remove_invitation, site.domain, invitation.invitation_id)+ )++ assert Repo.exists?(+ from i in Plausible.Auth.Invitation, where: i.email == "[email protected]"+ )+ 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")++ other_user = insert(:user)+ other_site = insert(:site)+ insert(:site_membership, site: other_site, user: other_user, role: "owner")++ invitation =+ insert(:invitation,+ site_id: other_site.id,+ inviter: other_user,+ email: "[email protected]",+ role: :admin+ )++ remove_invitation_path =+ Routes.invitation_path(+ my_conn,+ :remove_invitation,+ other_site.domain,+ invitation.invitation_id+ )++ delete(my_conn, remove_invitation_path)++ assert Repo.exists?(+ from i in Plausible.Auth.Invitation, where: i.email == "[email protected]"+ )+ endendenddiff --git a/test/plausible_web/controllers/site/membership_controller_test.exs b/test/plausible_web/controllers/site/membership_controller_test.exsindex b97f5e789b..88d306f001 100644--- a/test/plausible_web/controllers/site/membership_controller_test.exs+++ b/test/plausible_web/controllers/site/membership_controller_test.exs@@ -31,6 +31,39 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doassert redirected_to(conn) == "/#{site.domain}/settings/people"end+ test "fails to create invitation with insufficient permissions", %{conn: conn, user: user} do+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :viewer)])++ conn =+ post(conn, "/sites/#{site.domain}/memberships/invite", %{+ email: "[email protected]",+ role: "admin"+ })++ assert conn.status == 404++ refute Repo.get_by(Plausible.Auth.Invitation, email: "[email protected]")+ 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")++ other_user = insert(:user)+ other_site = insert(:site)+ insert(:site_membership, site: other_site, user: other_user, role: "owner")++ my_conn =+ post(my_conn, "/sites/#{other_site.domain}/memberships/invite", %{+ email: "[email protected]",+ role: "admin"+ })++ assert my_conn.status == 404++ refute Repo.get_by(Plausible.Auth.Invitation, email: "[email protected]")+ end+test "sends invitation email for new user", %{conn: conn, user: user} dosite = insert(:site, members: [user])@@ -160,6 +193,20 @@ defmodule PlausibleWeb.Site.MembershipControllerTest dosubject: "[Plausible Analytics] Request to transfer ownership of #{site.domain}")end++ test "fails to transfer ownership to a foreign domain", %{conn: conn, user: user} do+ insert(:site, members: [user])+ foreign_site = insert(:site)++ conn =+ post(conn, "/sites/#{foreign_site.domain}/transfer-ownership", %{+ email: "[email protected]"+ })++ assert conn.status == 404++ refute Repo.get_by(Plausible.Auth.Invitation, email: "[email protected]")+ endenddescribe "PUT /sites/memberships/:id/role/:new_role" do@@ -285,7 +332,7 @@ defmodule PlausibleWeb.Site.MembershipControllerTest doendend- describe "DELETE /sites/memberships/:id" do+ describe "DELETE /sites/:website/memberships/:id" dotest "removes a member from a site", %{conn: conn, user: user} doadmin = insert(:user)@@ -299,11 +346,38 @@ defmodule PlausibleWeb.Site.MembershipControllerTest domembership = Enum.find(site.memberships, &(&1.role == :admin))- delete(conn, "/sites/#{site.domain}/memberships/#{membership.id}")+ conn = delete(conn, "/sites/#{site.domain}/memberships/#{membership.id}")+ assert get_flash(conn, :success) =~ "has been removed"refute Repo.exists?(from sm in Plausible.Site.Membership, where: sm.user_id == ^admin.id)end+ test "fails to remove a member from a foreign site", %{conn: conn, user: user} do+ foreign_site =+ insert(:site,+ memberships: [+ build(:site_membership, user: build(:user), role: :admin)+ ]+ )++ [foreign_membership] = foreign_site.memberships++ site =+ insert(:site,+ memberships: [+ build(:site_membership, user: user, role: :owner)+ ]+ )++ conn = delete(conn, "/sites/#{site.domain}/memberships/#{foreign_membership.id}")+ assert get_flash(conn, :error) == "Failed to find membership to remove"++ assert Repo.exists?(+ from sm in Plausible.Site.Membership,+ where: sm.user_id == ^foreign_membership.user.id+ )+ end+test "notifies the user who has been removed via email", %{conn: conn, user: user} doadmin = insert(:user)diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exsindex abcc94fd05..b7721e8c3e 100644--- a/test/plausible_web/controllers/site_controller_test.exs+++ b/test/plausible_web/controllers/site_controller_test.exs@@ -336,6 +336,25 @@ defmodule PlausibleWeb.SiteControllerTest doassert updated.publicassert redirected_to(conn, 302) == "/#{site.domain}/settings/visibility"end++ test "fails to make site public with insufficient permissions", %{conn: conn, user: user} do+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :viewer)])+ conn = post(conn, "/sites/#{site.domain}/make-public")+ assert conn.status == 404+ refute Repo.get(Plausible.Site, site.id).public+ end++ test "fails to make foreign site public", %{conn: my_conn, user: me} 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")++ my_conn = post(my_conn, "/sites/#{other_site.domain}/make-public")+ assert my_conn.status == 404+ refute Repo.get(Plausible.Site, other_site.id).public+ endenddescribe "POST /sites/:website/make-private" do@@ -363,6 +382,33 @@ defmodule PlausibleWeb.SiteControllerTest dorefute Repo.exists?(from s in Plausible.Site, where: s.id == ^site.id)end++ test "fails to delete a site with insufficient permissions", %{conn: conn, user: user} do+ site = insert(:site, memberships: [build(:site_membership, user: user, role: :viewer)])+ insert(:google_auth, user: user, site: site)+ insert(:custom_domain, site: site)+ insert(:spike_notification, site: site)++ conn = delete(conn, "/#{site.domain}")++ assert conn.status == 404+ assert Repo.exists?(from s in Plausible.Site, where: s.id == ^site.id)+ end++ test "fails to delete a foreign site", %{conn: my_conn, user: me} 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")+ insert(:google_auth, user: other_user, site: other_site)+ insert(:custom_domain, site: other_site)+ insert(:spike_notification, site: other_site)++ my_conn = delete(my_conn, "/#{other_site.domain}")+ assert my_conn.status == 404+ assert Repo.exists?(from s in Plausible.Site, where: s.id == ^other_site.id)+ endenddescribe "PUT /:website/settings/google" do@@ -392,6 +438,18 @@ defmodule PlausibleWeb.SiteControllerTest dorefute Repo.exists?(Plausible.Site.GoogleAuth)assert redirected_to(conn, 302) == "/#{site.domain}/settings/search-console"end++ test "fails to delete associated google auth from the outside", %{+ conn: conn,+ user: user+ } do+ other_site = insert(:site)+ insert(:google_auth, user: user, site: other_site)+ conn = delete(conn, "/#{other_site.domain}/settings/google-search")++ assert conn.status == 404+ assert Repo.exists?(Plausible.Site.GoogleAuth)+ endenddescribe "GET /:website/settings/search-console for self-hosting" do@@ -566,7 +624,7 @@ defmodule PlausibleWeb.SiteControllerTest dodescribe "DELETE /:website/goals/:id" dosetup [:create_user, :log_in, :create_site]- test "lists goals for the site", %{conn: conn, site: site} do+ test "deletes goal", %{conn: conn, site: site} dogoal = insert(:goal, domain: site.domain, event_name: "Custom event")conn = delete(conn, "/#{site.domain}/goals/#{goal.id}")@@ -574,6 +632,16 @@ defmodule PlausibleWeb.SiteControllerTest doassert Repo.aggregate(Plausible.Goal, :count, :id) == 0assert redirected_to(conn, 302) == "/#{site.domain}/settings/goals"end++ test "fails to deletes goal for a foreign site", %{conn: conn, site: site} do+ another_site = insert(:site)+ goal = insert(:goal, domain: another_site.domain, event_name: "Custom event")++ conn = delete(conn, "/#{site.domain}/goals/#{goal.id}")++ assert Repo.aggregate(Plausible.Goal, :count, :id) == 1+ assert get_flash(conn, :error) == "Could not find goal"+ endenddescribe "POST /sites/:website/weekly-report/enable" do@@ -601,6 +669,15 @@ defmodule PlausibleWeb.SiteControllerTest dorefute Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)end++ test "fails to delete the weekly report record for a foreign site", %{conn: conn} do+ site = insert(:site)+ insert(:weekly_report, site: site)++ post(conn, "/sites/#{site.domain}/weekly-report/disable")++ assert Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)+ endenddescribe "POST /sites/:website/weekly-report/recipients" do@@ -627,6 +704,20 @@ defmodule PlausibleWeb.SiteControllerTest doreport = Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)assert report.recipients == []end++ test "fails to removes a recipient from the weekly report in a foreign website", %{conn: conn} do+ site = insert(:site)+ insert(:weekly_report, site: site, recipients: ["[email protected]"])++ conn = delete(conn, "/sites/#{site.domain}/weekly-report/recipients/[email protected]")+ assert conn.status == 404++ conn = delete(conn, "/sites/#{site.domain}/weekly-report/recipients/recipient%40email.com")+ assert conn.status == 404++ report = Repo.get_by(Plausible.Site.WeeklyReport, site_id: site.id)+ assert [_] = report.recipients+ endenddescribe "POST /sites/:website/monthly-report/enable" do@@ -680,6 +771,22 @@ defmodule PlausibleWeb.SiteControllerTest doreport = Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)assert report.recipients == []end++ test "fails to remove a recipient from the monthly report in a foreign website", %{+ conn: conn+ } do+ site = insert(:site)+ insert(:monthly_report, site: site, recipients: ["[email protected]"])++ conn = delete(conn, "/sites/#{site.domain}/monthly-report/recipients/[email protected]")+ assert conn.status == 404++ conn = delete(conn, "/sites/#{site.domain}/monthly-report/recipients/recipient%40email.com")+ assert conn.status == 404++ report = Repo.get_by(Plausible.Site.MonthlyReport, site_id: site.id)+ assert [_] = report.recipients+ endenddescribe "POST /sites/:website/spike-notification/enable" do@@ -763,6 +870,26 @@ defmodule PlausibleWeb.SiteControllerTest doreport = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)assert report.recipients == []end++ test "fails to remove a recipient from the spike notification in a foreign website", %{+ conn: conn+ } do+ site = insert(:site)+ insert(:spike_notification, site: site, recipients: ["[email protected]"])++ conn =+ delete(conn, "/sites/#{site.domain}/spike-notification/recipients/[email protected]")++ assert conn.status == 404++ conn =+ delete(conn, "/sites/#{site.domain}/spike-notification/recipients/recipient%40email.com")++ assert conn.status == 404++ report = Repo.get_by(Plausible.Site.SpikeNotification, site_id: site.id)+ assert [_] = report.recipients+ endenddescribe "GET /sites/:website/shared-links/new" do@@ -833,26 +960,53 @@ defmodule PlausibleWeb.SiteControllerTest dodescribe "DELETE /sites/:website/shared-links/:slug" dosetup [:create_user, :log_in, :create_site]- test "shows form for new shared link", %{conn: conn, site: site} do+ test "deletes shared link", %{conn: conn, site: site} dolink = insert(:shared_link, site: site)conn = delete(conn, "/sites/#{site.domain}/shared-links/#{link.slug}")refute Repo.one(Plausible.Site.SharedLink)assert redirected_to(conn, 302) =~ "/#{site.domain}/settings"+ assert get_flash(conn, :success) == "Shared Link deleted"+ end++ test "fails to delete shared link from the outside", %{conn: conn, site: site} do+ other_site = insert(:site)+ link = insert(:shared_link, site: other_site)++ conn = delete(conn, "/sites/#{site.domain}/shared-links/#{link.slug}")++ assert Repo.one(Plausible.Site.SharedLink)+ assert redirected_to(conn, 302) =~ "/#{site.domain}/settings"+ assert get_flash(conn, :error) == "Could not find Shared Link"endenddescribe "DELETE sites/:website/custom-domains/:id" dosetup [:create_user, :log_in, :create_site]- test "lists goals for the site", %{conn: conn, site: site} do+ test "deletes custom domain", %{conn: conn, site: site} dodomain = insert(:custom_domain, site: site)- delete(conn, "/sites/#{site.domain}/custom-domains/#{domain.id}")+ conn = delete(conn, "/sites/#{site.domain}/custom-domains/#{domain.id}")+ assert get_flash(conn, :success) == "Custom domain deleted successfully"assert Repo.aggregate(Plausible.Site.CustomDomain, :count, :id) == 0end++ test "fails to deletes custom domain not owning it", %{conn: conn, site: site} do+ _og_domain = insert(:custom_domain, site: site)++ foreign_site = insert(:site)+ foreign_domain = insert(:custom_domain, site: foreign_site)++ assert Repo.aggregate(Plausible.Site.CustomDomain, :count, :id) == 2++ conn = delete(conn, "/sites/#{site.domain}/custom-domains/#{foreign_domain.id}")+ assert get_flash(conn, :error) == "Failed to delete custom domain"++ assert Repo.aggregate(Plausible.Site.CustomDomain, :count, :id) == 2+ endenddescribe "GET /:website/import/google-analytics/view-id" do