projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'manifest' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
media_proxy
/
media_proxy_controller_test.exs
diff --git
a/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
b/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
index e9b58482289684453536488c45cfdaf438dfe8dd..1f2e5419446fba81c870b5e9af7b8f9fd4aaeca7 100644
(file)
--- a/
test/pleroma/web/media_proxy/media_proxy_controller_test.exs
+++ b/
test/pleroma/web/media_proxy/media_proxy_controller_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
@@
-10,10
+10,6
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
alias Pleroma.Web.MediaProxy
alias Plug.Conn
alias Pleroma.Web.MediaProxy
alias Plug.Conn
- setup do
- on_exit(fn -> Cachex.clear(:banned_urls_cache) end)
- end
-
describe "Media Proxy" do
setup do
clear_config([:media_proxy, :enabled], true)
describe "Media Proxy" do
setup do
clear_config([:media_proxy, :enabled], true)
@@
-37,7
+33,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
end
test "it returns 403 for invalid signature", %{conn: conn, url: url} do
end
test "it returns 403 for invalid signature", %{conn: conn, url: url} do
-
Pleroma.Config.put
([Pleroma.Web.Endpoint, :secret_key_base], "000")
+
clear_config
([Pleroma.Web.Endpoint, :secret_key_base], "000")
%{path: path} = URI.parse(url)
assert %Conn{
%{path: path} = URI.parse(url)
assert %Conn{
@@
-85,9
+81,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
missing_dependencies = Pleroma.Helpers.MediaHelper.missing_dependencies()
assert missing_dependencies == [],
missing_dependencies = Pleroma.Helpers.MediaHelper.missing_dependencies()
assert missing_dependencies == [],
- "Error: missing dependencies (please refer to `docs/installation`): #{
- inspect(missing_dependencies)
- }"
+ "Error: missing dependencies (please refer to `docs/installation`): #{inspect(missing_dependencies)}"
end
setup do
end
setup do
@@
-132,7
+126,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
end
test "it returns 403 for invalid signature", %{conn: conn, url: url} do
end
test "it returns 403 for invalid signature", %{conn: conn, url: url} do
-
Pleroma.Config.put
([Pleroma.Web.Endpoint, :secret_key_base], "000")
+
clear_config
([Pleroma.Web.Endpoint, :secret_key_base], "000")
%{path: path} = URI.parse(url)
assert %Conn{
%{path: path} = URI.parse(url)
assert %Conn{