diff options
| author | lain <lain@soykaf.club> | 2019-08-24 15:48:33 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-24 15:48:33 +0200 |
| commit | cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a (patch) | |
| tree | e80078875de15734e045f39e0bd9f82310961201 /test/plugs/instance_static_test.exs | |
| parent | 0e2b5a3e6aed7947909c2a1ff1618403546f1572 (diff) | |
| parent | bc78a875c86db42d67122cfb767f239a55dacbea (diff) | |
| download | pleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.tar.gz pleroma-cc6c0b4ba6762e6a9b0a90c3dcda3f95283eb22a.zip | |
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
Diffstat (limited to 'test/plugs/instance_static_test.exs')
| -rw-r--r-- | test/plugs/instance_static_test.exs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/plugs/instance_static_test.exs b/test/plugs/instance_static_test.exs index e2dcfa3d8..6aabc45a4 100644 --- a/test/plugs/instance_static_test.exs +++ b/test/plugs/instance_static_test.exs @@ -8,14 +8,12 @@ defmodule Pleroma.Web.RuntimeStaticPlugTest do @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 -> File.rm_rf(@dir) end) + end - on_exit(fn -> - Pleroma.Config.put([:instance, :static_dir], static_dir) - File.rm_rf(@dir) - end) + clear_config([:instance, :static_dir]) do + Pleroma.Config.put([:instance, :static_dir], @dir) end test "overrides index" do |