Merge branch 'develop' into global-status-expiration

[akkoma] / test / plugs / instance_static_test.exs

diff --git a/test/plugs/instance_static_test.exs b/test/plugs/instance_static_test.exs
index 526679aae2addda2b6fc4624652e51a4bd0379c9..b8f070d6ad6f7b7742b15ab27b2df56db54abc51 100644 (file)
--- a/test/plugs/instance_static_test.exs
+++ b/test/plugs/instance_static_test.exs
@@ -1,19 +1,19 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.RuntimeStaticPlugTest do
   use Pleroma.Web.ConnCase
 
   @dir "test/tmp/instance_static"
 
   setup do
-    static_dir = Pleroma.Config.get([:instance, :static_dir])
-    Pleroma.Config.put([:instance, :static_dir], @dir)
     File.mkdir_p!(@dir)
-
-    on_exit(fn ->
-      Pleroma.Config.put([:instance, :static_dir], static_dir)
-      File.rm_rf(@dir)
-    end)
+    on_exit(fn -> File.rm_rf(@dir) end)
   end
 
+  setup do: clear_config([:instance, :static_dir], @dir)
+
   test "overrides index" do
     bundled_index = get(build_conn(), "/")
     assert html_response(bundled_index, 200) == File.read!("priv/static/index.html")