diff options
| author | lain <lain@soykaf.club> | 2019-08-19 15:34:29 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-08-19 15:34:29 +0000 |
| commit | 222ac3bcbebe496ba8f0363adea40ef4fcf26886 (patch) | |
| tree | d46f6d2447183492d75983986ae2d57b75fdcb0b /test/web/media_proxy | |
| parent | 49ae3191df2a7acfa741e93d6f5142f9cf27dc06 (diff) | |
| parent | a320358703db249ab20df5afd81c92fb42b8cadb (diff) | |
| download | pleroma-222ac3bcbebe496ba8f0363adea40ef4fcf26886.tar.gz pleroma-222ac3bcbebe496ba8f0363adea40ef4fcf26886.zip | |
Merge branch 'support/test_helpers' into 'develop'
added test helpers to clear config after tests
See merge request pleroma/pleroma!1547
Diffstat (limited to 'test/web/media_proxy')
| -rw-r--r-- | test/web/media_proxy/media_proxy_test.exs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/test/web/media_proxy/media_proxy_test.exs b/test/web/media_proxy/media_proxy_test.exs index 0c94755df..79699cac5 100644 --- a/test/web/media_proxy/media_proxy_test.exs +++ b/test/web/media_proxy/media_proxy_test.exs @@ -4,14 +4,11 @@ defmodule Pleroma.Web.MediaProxyTest do use ExUnit.Case + use Pleroma.Tests.Helpers 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 + clear_config([:media_proxy, :enabled]) describe "when enabled" do setup do |