From c0dea3f3540c5e2049eb758813620e52d79f3d25 Mon Sep 17 00:00:00 2001 From: Adam Rutkowski Date: Thu, 25 May 2023 08:31:42 +0200 Subject: [PATCH] Extract funnel settings test module --- lib/plausible_web/live/funnel_settings.ex | 6 +-- .../live/funnel_settings/form.ex | 2 +- .../funnel_settings/funnel_settings_test.exs | 48 +++++++++++++++++++ .../controllers/site_controller_test.exs | 33 ------------- 4 files changed, 52 insertions(+), 37 deletions(-) create mode 100644 test/plausible_web/controllers/funnel_settings/funnel_settings_test.exs diff --git a/lib/plausible_web/live/funnel_settings.ex b/lib/plausible_web/live/funnel_settings.ex index e9586bf36..392bc2a42 100644 --- a/lib/plausible_web/live/funnel_settings.ex +++ b/lib/plausible_web/live/funnel_settings.ex @@ -38,7 +38,7 @@ defmodule PlausibleWeb.Live.FunnelSettings do funnels={@funnels} site={@site} /> - +
@@ -55,11 +55,11 @@ defmodule PlausibleWeb.Live.FunnelSettings do """ end - def handle_event("add_funnel", _value, socket) do + def handle_event("add-funnel", _value, socket) do {:noreply, assign(socket, add_funnel?: true)} end - def handle_event("cancel_add_funnel", _value, socket) do + def handle_event("cancel-add-funnel", _value, socket) do {:noreply, assign(socket, add_funnel?: false)} end diff --git a/lib/plausible_web/live/funnel_settings/form.ex b/lib/plausible_web/live/funnel_settings/form.ex index c7863e0b5..bb2729462 100644 --- a/lib/plausible_web/live/funnel_settings/form.ex +++ b/lib/plausible_web/live/funnel_settings/form.ex @@ -168,7 +168,7 @@ defmodule PlausibleWeb.Live.FunnelSettings.Form do diff --git a/test/plausible_web/controllers/funnel_settings/funnel_settings_test.exs b/test/plausible_web/controllers/funnel_settings/funnel_settings_test.exs new file mode 100644 index 000000000..396cc2981 --- /dev/null +++ b/test/plausible_web/controllers/funnel_settings/funnel_settings_test.exs @@ -0,0 +1,48 @@ +defmodule PlausibleWeb.FunnelSettingsTest do + use PlausibleWeb.ConnCase, async: false + + describe "GET /:website/settings/funnels" do + setup [:create_user, :log_in, :create_site] + + test "lists funnels for the site and renders help link", %{conn: conn, site: site} do + :ok = setup_funnels(site) + conn = get(conn, "/#{site.domain}/settings/funnels") + + resp = html_response(conn, 200) + assert resp =~ "Compose goals into funnels" + assert resp =~ "From blog to signup" + assert resp =~ "From signup to blog" + doc = Floki.parse_document!(resp) + + assert [{"a", _, _}] = Floki.find(doc, "a[href=\"https://plausible.io/docs/funnels\"]") + end + + test "if goals are present, Add Funnel button is rendered", %{conn: conn, site: site} do + :ok = setup_funnels(site) + conn = get(conn, "/#{site.domain}/settings/funnels") + doc = conn |> html_response(200) |> Floki.parse_document!() + assert [_] = Floki.find(doc, ~S/button[phx-click="add-funnel"]/) + end + end + + defp setup_funnels(site) do + {:ok, g1} = Plausible.Goals.create(site, %{"page_path" => "/go/to/blog/**"}) + {:ok, g2} = Plausible.Goals.create(site, %{"event_name" => "Signup"}) + + {:ok, _} = + Plausible.Funnels.create( + site, + "From blog to signup", + [%{"goal_id" => g1.id}, %{"goal_id" => g2.id}] + ) + + {:ok, _} = + Plausible.Funnels.create( + site, + "From signup to blog", + [%{"goal_id" => g2.id}, %{"goal_id" => g1.id}] + ) + + :ok + end +end diff --git a/test/plausible_web/controllers/site_controller_test.exs b/test/plausible_web/controllers/site_controller_test.exs index 54c980410..6c1e1338f 100644 --- a/test/plausible_web/controllers/site_controller_test.exs +++ b/test/plausible_web/controllers/site_controller_test.exs @@ -1329,37 +1329,4 @@ defmodule PlausibleWeb.SiteControllerTest do "Your domain has been changed. You must update the JavaScript snippet on your site within 72 hours" end end - - describe "GET /:website/settings/funnels" do - setup [:create_user, :log_in, :create_site] - - test "lists funnels for the site and renders help link", %{conn: conn, site: site} do - {:ok, g1} = Plausible.Goals.create(site, %{"page_path" => "/go/to/blog/**"}) - {:ok, g2} = Plausible.Goals.create(site, %{"event_name" => "Signup"}) - - {:ok, _} = - Plausible.Funnels.create( - site, - "From blog to signup", - [%{"goal_id" => g1.id}, %{"goal_id" => g2.id}] - ) - - {:ok, _} = - Plausible.Funnels.create( - site, - "From signup to blog", - [%{"goal_id" => g2.id}, %{"goal_id" => g1.id}] - ) - - conn = get(conn, "/#{site.domain}/settings/funnels") - - resp = html_response(conn, 200) - assert resp =~ "Compose goals into funnels" - assert resp =~ "From blog to signup" - assert resp =~ "From signup to blog" - doc = Floki.parse_document!(resp) - - assert [{"a", _, _}] = Floki.find(doc, "a[href=\"https://plausible.io/docs/funnels\"]") - end - end end