Switch from serving a 400 to a 302

2 files changed, 41 insertions, 7 deletions

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 3971330d4..019e389b7 100644
--- a/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
+++ b/test/pleroma/web/media_proxy/media_proxy_controller_test.exs
@@ -54,20 +54,37 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
              } = get(conn, "/proxy/hhgfh/eeee/fff")
     end
 
-    test "it returns a 400 for invalid host", %{conn: conn} do
-      clear_config([:media_proxy, :base_url], "http://mp.localhost/")
+    test "it returns a 302 for invalid host", %{conn: conn} do
+      new_proxy_base = "http://mp.localhost/"
 
-      url =
+      %{scheme: new_proxy_scheme, host: new_proxy_host, port: new_proxy_port} =
+        URI.parse(new_proxy_base)
+
+      clear_config([:media_proxy, :base_url], new_proxy_base)
+
+      proxy_url =
         MediaProxy.encode_url("https://pleroma.social/logo.jpeg")
         |> URI.parse()
         |> Map.put(:host, "wronghost")
         |> URI.to_string()
 
+      expected_url =
+        URI.parse(proxy_url)
+        |> Map.put(:host, new_proxy_host)
+        |> Map.put(:port, new_proxy_port)
+        |> Map.put(:scheme, new_proxy_scheme)
+        |> URI.to_string()
+
       with_mock Pleroma.ReverseProxy,
         call: fn _conn, _url, _opts -> %Conn{status: :success} end do
-        %{status: status} = get(conn, url)
+        %{resp_headers: resp_headers, status: status} = get(conn, proxy_url)
+
+        assert status == 302
 
-        assert status == 400
+        assert Enum.any?(
+                 resp_headers,
+                 &(&1 == {"location", 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
index 262c8c288..fcc523cf4 100644
--- a/test/pleroma/web/plugs/uploaded_media_plug_test.exs
+++ b/test/pleroma/web/plugs/uploaded_media_plug_test.exs
@@ -48,10 +48,27 @@ defmodule Pleroma.Web.Plugs.UploadedMediaPlugTest do
 
     assert conn.status == 200
 
-    clear_config([Pleroma.Upload, :base_url], "http://media.localhost/")
+    new_media_base = "http://media.localhost:8080"
+
+    %{scheme: new_media_scheme, host: new_media_host, port: new_media_port} =
+      URI.parse(new_media_base)
+
+    clear_config([Pleroma.Upload, :base_url], new_media_base)
 
     conn = get(build_conn(), attachment_url)
 
-    assert conn.status == 400
+    expected_url =
+      URI.parse(attachment_url)
+      |> Map.put(:host, new_media_host)
+      |> Map.put(:port, new_media_port)
+      |> Map.put(:scheme, new_media_scheme)
+      |> URI.to_string()
+
+    assert conn.status == 302
+
+    assert Enum.any?(
+             conn.resp_headers,
+             &(&1 == {"location", expected_url})
+           )
   end
 end