projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request 'Delete 'installation/download-mastofe-build.sh'' (#317) from...
[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..e4b66c109637167ebfa46cf7332b4c4eef37f9e3 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{
@@
-164,7
+158,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{status: 500, body: ""}
end)
%Tesla.Env{status: 500, body: ""}
end)
@@
-179,7
+173,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "application/pdf"}]}
end)
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "application/pdf"}]}
end)
@@
-199,7
+193,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
clear_config([:media_preview_proxy, :min_content_length], 1_000_000_000)
Tesla.Mock.mock(fn
clear_config([:media_preview_proxy, :min_content_length], 1_000_000_000)
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{
status: 200,
body: "",
%Tesla.Env{
status: 200,
body: "",
@@
-224,7
+218,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/gif"}]}
end)
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/gif"}]}
end)
@@
-242,7
+236,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/jpeg"}]}
end)
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/jpeg"}]}
end)
@@
-262,7
+256,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
clear_config([:media_preview_proxy, :min_content_length], 100_000)
Tesla.Mock.mock(fn
clear_config([:media_preview_proxy, :min_content_length], 100_000)
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{
status: 200,
body: "",
%Tesla.Env{
status: 200,
body: "",
@@
-284,7
+278,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
assert_dependencies_installed()
Tesla.Mock.mock(fn
assert_dependencies_installed()
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/png"}]}
%{method: :get, url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/png"}]}
%{method: :get, url: ^media_proxy_url} ->
@@
-306,7
+300,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
assert_dependencies_installed()
Tesla.Mock.mock(fn
assert_dependencies_installed()
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/jpeg"}]}
%{method: :get, url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/jpeg"}]}
%{method: :get, url: ^media_proxy_url} ->
@@
-326,7
+320,7
@@
defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
media_proxy_url: media_proxy_url
} do
Tesla.Mock.mock(fn
- %{method: "
head
", url: ^media_proxy_url} ->
+ %{method: "
HEAD
", url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/jpeg"}]}
%{method: :get, url: ^media_proxy_url} ->
%Tesla.Env{status: 200, body: "", headers: [{"content-type", "image/jpeg"}]}
%{method: :get, url: ^media_proxy_url} ->