projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'uguu-uwu-notices-bulge' into 'develop'
[akkoma]
/
test
/
web
/
media_proxy
/
media_proxy_test.exs
diff --git
a/test/web/media_proxy/media_proxy_test.exs
b/test/web/media_proxy/media_proxy_test.exs
index 0c94755df348a1c352f02f81fcc6b35cca2f820c..96bdde21962bf2c15ca06ede45177ba829a300b1 100644
(file)
--- a/
test/web/media_proxy/media_proxy_test.exs
+++ b/
test/web/media_proxy/media_proxy_test.exs
@@
-1,17
+1,14
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-201
8
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-201
9
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MediaProxyTest do
use ExUnit.Case
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MediaProxyTest do
use ExUnit.Case
+ use Pleroma.Tests.Helpers
import Pleroma.Web.MediaProxy
alias Pleroma.Web.MediaProxy.MediaProxyController
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
describe "when enabled" do
setup do