projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
test
/
web
/
media_proxy
/
media_proxy_controller_test.exs
diff --git
a/test/web/media_proxy/media_proxy_controller_test.exs
b/test/web/media_proxy/media_proxy_controller_test.exs
index 7ac7e4af11618669e94f3e88cefad2c9a5377bdd..da79d38a54585a7141b9862452cffda3e7ec0276 100644
(file)
--- a/
test/web/media_proxy/media_proxy_controller_test.exs
+++ b/
test/web/media_proxy/media_proxy_controller_test.exs
@@
-7,8
+7,8
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
import Mock
alias Pleroma.Config
import Mock
alias Pleroma.Config
- clear_config(:media_proxy)
- clear_config([Pleroma.Web.Endpoint, :secret_key_base])
+
setup do:
clear_config(:media_proxy)
+
setup do:
clear_config([Pleroma.Web.Endpoint, :secret_key_base])
test "it returns 404 when MediaProxy disabled", %{conn: conn} do
Config.put([:media_proxy, :enabled], false)
test "it returns 404 when MediaProxy disabled", %{conn: conn} do
Config.put([:media_proxy, :enabled], false)