Improve design so existing tests do not break

lib/pleroma/http.ex

@@ -115,10 +115,19 @@ defmodule Pleroma.HTTP do
   end
 
   defp adapter_middlewares(_, extra_middleware) do
-    if Pleroma.Config.get(:env) == :test do
+    # A lot of tests are written expecting unencoded URLs
-      # Emulate redirects in test env, which are handled by adapters in other environments
+    # and the burden of fixing that is high. Also it makes
+    # them hard to read. Tests will opt-in when we want to validate
+    # the encoding is being done correctly.
+    cond do
+      Pleroma.Config.get(:env) == :test and Pleroma.Config.get(:test_url_encoding) ->
         default_middleware()
-    else
+
+      Pleroma.Config.get(:env) == :test ->
+        # Emulate redirects in test env, which are handled by adapters in other environments
+        [Tesla.Middleware.FollowRedirects]
+
+      true ->
         extra_middleware
     end
   end

lib/pleroma/tesla/middleware/encode_url.ex

@@ -17,7 +17,17 @@ defmodule Pleroma.Tesla.Middleware.EncodeUrl do
 
   @impl Tesla.Middleware
   def call(%Tesla.Env{url: url} = env, next, _) do
-    url =
+    url = encode_url(url)
+
+    env = %{env | url: url}
+
+    case Tesla.run(env, next) do
+      {:ok, env} -> {:ok, env}
+      err -> err
+    end
+  end
+
+  defp encode_url(url) when is_binary(url) do
     URI.parse(url)
     |> then(fn parsed ->
       path = encode_path(parsed.path)
@@ -26,13 +36,6 @@ defmodule Pleroma.Tesla.Middleware.EncodeUrl do
       %{parsed | path: path, query: query}
     end)
     |> URI.to_string()
-
-    env = %{env | url: url}
-
-    case Tesla.run(env, next) do
-      {:ok, env} -> {:ok, env}
-      err -> err
-    end
   end
 
   defp encode_path(nil), do: nil

test/pleroma/http_test.exs

@@ -72,6 +72,8 @@ defmodule Pleroma.HTTPTest do
   end
 
   test "URL encoding properly encodes URLs with spaces" do
+    clear_config(:test_url_encoding, true)
+
     url_with_space = "https://tsundere.love/emoji/Pack 1/koronebless.png"
 
     result = HTTP.get(url_with_space)