diff --git a/lib/plausible_web/plugs/first_launch_plug.ex b/lib/plausible_web/plugs/first_launch_plug.ex index 6588e338b..adacde4fc 100644 --- a/lib/plausible_web/plugs/first_launch_plug.ex +++ b/lib/plausible_web/plugs/first_launch_plug.ex @@ -3,6 +3,17 @@ defmodule PlausibleWeb.FirstLaunchPlug do Redirects first-launch users to registration page. """ + defmodule Test do + @moduledoc """ + Test helper for setup blocks allowing to skip the plug processing + """ + @spec skip(map()) :: map() + def skip(context) do + conn = Plug.Conn.put_private(context.conn, PlausibleWeb.FirstLaunchPlug, :skip) + {:ok, Map.put(context, :conn, conn)} + end + end + @behaviour Plug alias Plausible.Release @@ -12,6 +23,7 @@ defmodule PlausibleWeb.FirstLaunchPlug do end @impl true + def call(%Plug.Conn{private: %{__MODULE__ => :skip}} = conn, _), do: conn def call(%Plug.Conn{request_path: path} = conn, path), do: conn def call(conn, redirect_to) do diff --git a/test/plausible_web/controllers/admin_auth_controller_test.exs b/test/plausible_web/controllers/admin_auth_controller_test.exs index cf8414eee..dc216e126 100644 --- a/test/plausible_web/controllers/admin_auth_controller_test.exs +++ b/test/plausible_web/controllers/admin_auth_controller_test.exs @@ -5,7 +5,7 @@ defmodule PlausibleWeb.AdminAuthControllerTest do describe "GET /" do @describetag :small_build_only test "disable registration", %{conn: conn} do - prevent_first_launch() + insert(:user) patch_config(disable_registration: true) conn = get(conn, "/register") assert redirected_to(conn) == "/login" @@ -25,8 +25,4 @@ defmodule PlausibleWeb.AdminAuthControllerTest do updated_config = Keyword.merge([disable_registration: false], config) patch_env(:selfhost, updated_config) end - - defp prevent_first_launch do - insert(:user) - end end diff --git a/test/plausible_web/controllers/auth_controller/logs_test.exs b/test/plausible_web/controllers/auth_controller/logs_test.exs index 3e406a6b6..2babcfb32 100644 --- a/test/plausible_web/controllers/auth_controller/logs_test.exs +++ b/test/plausible_web/controllers/auth_controller/logs_test.exs @@ -2,13 +2,7 @@ defmodule PlausibleWeb.AuthController.LogsTest do use PlausibleWeb.ConnCase import ExUnit.CaptureLog - if small_build?() do - setup do - # insert some user to prevent first launch redirect - insert(:user) - :ok - end - end + setup {PlausibleWeb.FirstLaunchPlug.Test, :skip} describe "POST /login" do setup do diff --git a/test/plausible_web/controllers/auth_controller_test.exs b/test/plausible_web/controllers/auth_controller_test.exs index 7ec6fb1fb..7c2e0edcc 100644 --- a/test/plausible_web/controllers/auth_controller_test.exs +++ b/test/plausible_web/controllers/auth_controller_test.exs @@ -13,15 +13,8 @@ defmodule PlausibleWeb.AuthControllerTest do alias Plausible.Auth.User alias Plausible.Billing.Subscription - setup :verify_on_exit! - - if small_build?() do - setup do - # insert some user to prevent first launch redirect - insert(:user) - :ok - end - end + setup {PlausibleWeb.FirstLaunchPlug.Test, :skip} + setup [:verify_on_exit!] @v3_plan_id "749355" @v4_plan_id "857097" @@ -450,7 +443,8 @@ defmodule PlausibleWeb.AuthControllerTest do assert location = "/login" = redirected_to(conn, 302) - conn = get(recycle(conn), location) + {:ok, %{conn: conn}} = PlausibleWeb.FirstLaunchPlug.Test.skip(%{conn: recycle(conn)}) + conn = get(conn, location) assert html_response(conn, 200) =~ "Password updated successfully" end end diff --git a/test/plausible_web/controllers/avatar_controller_test.exs b/test/plausible_web/controllers/avatar_controller_test.exs index 6c1960f76..7639f7ca1 100644 --- a/test/plausible_web/controllers/avatar_controller_test.exs +++ b/test/plausible_web/controllers/avatar_controller_test.exs @@ -4,13 +4,7 @@ defmodule PlausibleWeb.AvatarControllerTest do import Mox setup :verify_on_exit! - if small_build?() do - setup do - # insert some user to prevent first launch redirect - insert(:user) - :ok - end - end + setup {PlausibleWeb.FirstLaunchPlug.Test, :skip} describe "GET /avatar/:hash" do test "proxies the request to gravatar", %{conn: conn} do diff --git a/test/plausible_web/controllers/page_controller_test.exs b/test/plausible_web/controllers/page_controller_test.exs index 738aaf769..b4c390a0f 100644 --- a/test/plausible_web/controllers/page_controller_test.exs +++ b/test/plausible_web/controllers/page_controller_test.exs @@ -1,13 +1,7 @@ defmodule PlausibleWeb.PageControllerTest do use PlausibleWeb.ConnCase, async: true - if small_build?() do - setup do - # insert some user to prevent first launch redirect - insert(:user) - :ok - end - end + setup {PlausibleWeb.FirstLaunchPlug.Test, :skip} describe "GET /" do test "shows landing page when user not authenticated", %{conn: conn} do diff --git a/test/plausible_web/controllers/unsubscribe_controller_test.exs b/test/plausible_web/controllers/unsubscribe_controller_test.exs index 2186cfaa9..4d398e7b2 100644 --- a/test/plausible_web/controllers/unsubscribe_controller_test.exs +++ b/test/plausible_web/controllers/unsubscribe_controller_test.exs @@ -2,13 +2,7 @@ defmodule PlausibleWeb.UnsubscribeControllerTest do use PlausibleWeb.ConnCase, async: true use Plausible.Repo - if small_build?() do - setup do - # insert some user to prevent first launch redirect - insert(:user) - :ok - end - end + setup {PlausibleWeb.FirstLaunchPlug.Test, :skip} describe "GET /sites/:website/weekly-report/unsubscribe" do test "removes a recipient from the weekly report without them having to log in", %{conn: conn} do