summaryrefslogtreecommitdiff
path: root/test/plugs/instance_static_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-03-25 09:05:17 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-03-25 09:05:17 +0300
commit012d428e1ffdd83888f339e4dbaec344202eebe1 (patch)
tree41483fdfb5c75e6d338ad48b83f7d4e621365694 /test/plugs/instance_static_test.exs
parente743c2232970e321c833604b232520587ad8e402 (diff)
parent8eebc75c152ee339bac347350266e3bc6536016b (diff)
downloadpleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.tar.gz
pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.zip
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Diffstat (limited to 'test/plugs/instance_static_test.exs')
-rw-r--r--test/plugs/instance_static_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/plugs/instance_static_test.exs b/test/plugs/instance_static_test.exs
index 8cd9b5712..b8f070d6a 100644
--- a/test/plugs/instance_static_test.exs
+++ b/test/plugs/instance_static_test.exs
@@ -12,9 +12,7 @@ defmodule Pleroma.Web.RuntimeStaticPlugTest do
on_exit(fn -> File.rm_rf(@dir) end)
end
- clear_config([:instance, :static_dir]) do
- Pleroma.Config.put([:instance, :static_dir], @dir)
- end
+ setup do: clear_config([:instance, :static_dir], @dir)
test "overrides index" do
bundled_index = get(build_conn(), "/")