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 2a449e56d9553bcad2d10c89bd8c6d0180d3f163..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
@@
-81,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
@@
-160,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)
@@
-175,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)
@@
-195,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: "",
@@
-220,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)
@@
-238,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)
@@
-258,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: "",
@@
-280,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} ->
@@
-302,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} ->
@@
-322,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} ->