projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'features/emoji_stealer' 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 8f5fcf2ebfebf2634bb000cb272e7a78279e78e2..69c2d5dae89fe8dc3a34da08ed7ad8e87ec9f806 100644
(file)
--- a/
test/web/media_proxy/media_proxy_test.exs
+++ b/
test/web/media_proxy/media_proxy_test.exs
@@
-8,8
+8,8
@@
defmodule Pleroma.Web.MediaProxyTest do
import Pleroma.Web.MediaProxy
alias Pleroma.Web.MediaProxy.MediaProxyController
import Pleroma.Web.MediaProxy
alias Pleroma.Web.MediaProxy.MediaProxyController
- clear_config([:media_proxy, :enabled])
- clear_config(Pleroma.Upload)
+
setup do:
clear_config([:media_proxy, :enabled])
+
setup do:
clear_config(Pleroma.Upload)
describe "when enabled" do
setup do
describe "when enabled" do
setup do