AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 91
Code Issues 175 Pull requests 22 Projects 2 Releases 14 Packages Wiki Activity

Merge branch 'test_improvement' into 'develop'

Browse source 
Use Phoenix.ConnTest.redirected_to/2

See merge request pleroma/pleroma!3899
This commit is contained in:
Haelwenn 2023-06-01 09:40:25 +00:00
commit e2a63dadd1
3 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
changelog.d/3899.skip Normal file
View file

9
test/pleroma/web/media_proxy/media_proxy_controller_test.exs
View file

@ -77,14 +77,9 @@ test "it returns a 302 for invalid host", %{conn: conn} 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

7
test/pleroma/web/plugs/uploaded_media_plug_test.exs
View file

@ -64,11 +64,6 @@ test "denies access to media if wrong Host", %{
|> 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