pleroma

commit: e2a63dadd19cb17c59245e35d5dbcc95b99e0ae0
parent d998a114e26033e98e87778e5ca659aff91831bf
Author: Haelwenn <contact+git.pleroma.social@hacktivis.me>
Date:   Thu,  1 Jun 2023 09:40:25 +0000

Merge branch 'test_improvement' into 'develop'

Use Phoenix.ConnTest.redirected_to/2

See merge request pleroma/pleroma!3899
Diffstat:
A
changelog.d/3899.skip
0

M
test/pleroma/web/media_proxy/media_proxy_controller_test.exs
9
++-------
M
test/pleroma/web/plugs/uploaded_media_plug_test.exs
7
+------

3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/changelog.d/3899.skip b/changelog.d/3899.skip
diff --git a/test/pleroma/web/media_proxy/media_proxy_controller_test.exs b/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
@@ -77,14 +77,9 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
 
       with_mock Pleroma.ReverseProxy,
         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 Enum.any?(
-                 resp_headers,
-                 &(&1 == {"location", expected_url})
-               )
+        assert redirected_to(conn, 302) == expected_url
       end
     end
 
diff --git a/test/pleroma/web/plugs/uploaded_media_plug_test.exs b/test/pleroma/web/plugs/uploaded_media_plug_test.exs
@@ -64,11 +64,6 @@ defmodule Pleroma.Web.Plugs.UploadedMediaPlugTest do
       |> Map.put(:scheme, new_media_scheme)
       |> URI.to_string()
 
-    assert conn.status == 302
-
-    assert Enum.any?(
-             conn.resp_headers,
-             &(&1 == {"location", expected_url})
-           )
+    assert redirected_to(conn, 302) == expected_url
   end
 end