aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/frontend_test.exs4
-rw-r--r--test/web/controllers/frontend/static_controller_test.exs (renamed from test/web/static_fe/static_fe_controller_test.exs)4
2 files changed, 5 insertions, 3 deletions
diff --git a/test/frontend_test.exs b/test/frontend_test.exs
index b5f04d10a..ddd4b5ee0 100644
--- a/test/frontend_test.exs
+++ b/test/frontend_test.exs
@@ -10,11 +10,12 @@ defmodule Pleroma.FrontendTest do
test "Primary config" do
config = %{"name" => "monsta", "ref" => "pika"}
- clear_config([:frontends, :primary], config)
+ clear_config(:frontends, %{primary: config, static: true})
fe_config = Pleroma.Frontend.get_config()
assert fe_config["config"] == config
assert fe_config["controller"] == Pleroma.Web.Frontend.MonstaController
+ assert fe_config["static"] == true
end
test "Headless" do
@@ -25,6 +26,7 @@ defmodule Pleroma.FrontendTest do
fe_config = Pleroma.Frontend.get_config()
assert fe_config["config"] == %{}
assert fe_config["controller"] == Pleroma.Web.Frontend.HeadlessController
+ assert fe_config["static"] == false
end
end
diff --git a/test/web/static_fe/static_fe_controller_test.exs b/test/web/controllers/frontend/static_controller_test.exs
index 1598bf675..b36ae2b28 100644
--- a/test/web/static_fe/static_fe_controller_test.exs
+++ b/test/web/controllers/frontend/static_controller_test.exs
@@ -1,4 +1,4 @@
-defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
+defmodule Pleroma.Web.Frontend.StaticControllerTest do
use Pleroma.Web.ConnCase
alias Pleroma.Activity
@@ -8,7 +8,7 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
import Pleroma.Factory
- setup_all do: clear_config([:static_fe, :enabled], true)
+ setup_all do: clear_config([:frontends, :static], true)
setup do: clear_config([:instance, :federating], true)
setup %{conn: conn} do