diff options
| author | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-08 17:08:06 +0700 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@gmail.com> | 2019-05-08 17:08:06 +0700 |
| commit | b6b5b16ba4d65ecd9812b02d79f844548266eb8b (patch) | |
| tree | 790623e31fed199f04168bcbddb4222a4bfb0a3a /test/media_proxy_test.exs | |
| parent | 0f0cc2703b7ffb99c58e72782925ea4dd61db41d (diff) | |
| parent | 14deed7f7d0b88d5c8ac19bb3de467429c289746 (diff) | |
| download | pleroma-b6b5b16ba4d65ecd9812b02d79f844548266eb8b.tar.gz pleroma-b6b5b16ba4d65ecd9812b02d79f844548266eb8b.zip | |
Merge develop
Diffstat (limited to 'test/media_proxy_test.exs')
| -rw-r--r-- | test/media_proxy_test.exs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/media_proxy_test.exs b/test/media_proxy_test.exs index a4331478e..0a02039a6 100644 --- a/test/media_proxy_test.exs +++ b/test/media_proxy_test.exs @@ -7,15 +7,15 @@ defmodule Pleroma.MediaProxyTest do import Pleroma.Web.MediaProxy alias Pleroma.Web.MediaProxy.MediaProxyController + setup do + enabled = Pleroma.Config.get([:media_proxy, :enabled]) + on_exit(fn -> Pleroma.Config.put([:media_proxy, :enabled], enabled) end) + :ok + end + describe "when enabled" do setup do - enabled = Pleroma.Config.get([:media_proxy, :enabled]) - - unless enabled do - Pleroma.Config.put([:media_proxy, :enabled], true) - on_exit(fn -> Pleroma.Config.put([:media_proxy, :enabled], enabled) end) - end - + Pleroma.Config.put([:media_proxy, :enabled], true) :ok end |