Merge branch 'test_improvement' into 'develop'
Use Phoenix.ConnTest.redirected_to/2 See merge request pleroma/pleroma!3899
This commit is contained in:
commit
e2a63dadd1
0
changelog.d/3899.skip
Normal file
0
changelog.d/3899.skip
Normal file
@ -77,14 +77,9 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
|
|||||||
|
|
||||||
with_mock Pleroma.ReverseProxy,
|
with_mock Pleroma.ReverseProxy,
|
||||||
call: fn _conn, _url, _opts -> %Conn{status: :success} end do
|
call: fn _conn, _url, _opts -> %Conn{status: :success} end do
|
||||||
%{resp_headers: resp_headers, status: status} = get(conn, proxy_url)
|
conn = get(conn, proxy_url)
|
||||||
|
|
||||||
assert status == 302
|
assert redirected_to(conn, 302) == expected_url
|
||||||
|
|
||||||
assert Enum.any?(
|
|
||||||
resp_headers,
|
|
||||||
&(&1 == {"location", expected_url})
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -64,11 +64,6 @@ defmodule Pleroma.Web.Plugs.UploadedMediaPlugTest do
|
|||||||
|> Map.put(:scheme, new_media_scheme)
|
|> Map.put(:scheme, new_media_scheme)
|
||||||
|> URI.to_string()
|
|> URI.to_string()
|
||||||
|
|
||||||
assert conn.status == 302
|
assert redirected_to(conn, 302) == expected_url
|
||||||
|
|
||||||
assert Enum.any?(
|
|
||||||
conn.resp_headers,
|
|
||||||
&(&1 == {"location", expected_url})
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user