From 256b9bb2e71464ddf711d0cd7d537c2068d38a6c Mon Sep 17 00:00:00 2001 From: Robert Joonas Date: Fri, 21 Jul 2023 11:58:58 +0300 Subject: [PATCH] fix flaky test --- .../api/internal_controller_test.exs | 31 +++++++++++++------ 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/test/plausible_web/controllers/api/internal_controller_test.exs b/test/plausible_web/controllers/api/internal_controller_test.exs index 7b82657fd..420fb15c9 100644 --- a/test/plausible_web/controllers/api/internal_controller_test.exs +++ b/test/plausible_web/controllers/api/internal_controller_test.exs @@ -100,16 +100,6 @@ defmodule PlausibleWeb.Api.InternalControllerTest do assert %{conversions_enabled: false} = Plausible.Sites.get_by_domain(site.domain) end - test "when the logged-in user is an super-admin", %{conn: conn, user: user} do - site = insert(:site) - patch_env(:super_admin_user_ids, [user.id]) - - conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) - - assert json_response(conn, 200) == "ok" - assert %{conversions_enabled: false} = Plausible.Sites.get_by_domain(site.domain) - end - test "returns 401 when the logged-in user is a viewer of the site", %{conn: conn, user: user} do site = insert(:site) insert(:site_membership, user: user, site: site, role: :viewer) @@ -150,3 +140,24 @@ defmodule PlausibleWeb.Api.InternalControllerTest do end end end + +# We need to be separate tests calling `patch_env` in an `async: false` test +# module, because `Application.env` is a shared state. +defmodule PlausibleWeb.Api.InternalControllerSyncTest do + use PlausibleWeb.ConnCase, async: false + use Plausible.Repo + + describe "PUT /api/:domain/disable-feature" do + setup [:create_user, :log_in] + + test "when the logged-in user is an super-admin", %{conn: conn, user: user} do + site = insert(:site) + patch_env(:super_admin_user_ids, [user.id]) + + conn = put(conn, "/api/#{site.domain}/disable-feature", %{"feature" => "conversions"}) + + assert json_response(conn, 200) == "ok" + assert %{conversions_enabled: false} = Plausible.Sites.get_by_domain(site.domain) + end + end +end