Merge branch 'fix_flaky_nil_provided_to_functions_who_expect_string' into 'develop'

Draft: Fix flaky test: default S3 uploader values make code fail

See merge request pleroma/pleroma!3700

test/pleroma/web/activity_pub/activity_pub_test.exs

@@ -25,6 +25,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
   import Tesla.Mock
 
   setup do
+    clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+    clear_config([Pleroma.Uploaders.Local, :uploads], "uploads")
     mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
 
     ConfigMock

test/pleroma/web/common_api_test.exs

@@ -36,6 +36,8 @@ defmodule Pleroma.Web.CommonAPITest do
   end
 
   setup_all do
+    clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+    clear_config([Pleroma.Uploaders.Local, :uploads], "uploads")
     Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)
     :ok
   end

test/pleroma/web/mastodon_api/controllers/media_controller_test.exs

@@ -13,6 +13,9 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
 
+  setup do: clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+  setup do: clear_config([Pleroma.Uploaders.Local, :uploads], "uploads")
+
   describe "Upload media" do
     setup do: oauth_access(["write:media"])
 

test/pleroma/web/mastodon_api/controllers/status_controller_test.exs

@@ -27,6 +27,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
   setup do: clear_config([:instance, :allow_relay])
   setup do: clear_config([:mrf, :policies])
   setup do: clear_config([:mrf_keyword, :reject])
+  setup do: clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+  setup do: clear_config([Pleroma.Uploaders.Local, :uploads], "uploads")
 
   setup do
     Pleroma.UnstubbedConfigMock

test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs

@@ -10,7 +10,8 @@ defmodule Pleroma.Web.PleromaAPI.BackupControllerTest do
   alias Pleroma.Web.PleromaAPI.BackupView
 
   setup do
-    clear_config([Pleroma.Upload, :uploader])
+    clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+    clear_config([Pleroma.Uploaders.Local, :uploads], "uploads")
     clear_config([Backup, :limit_days])
 
     ConfigMock

test/pleroma/web/pleroma_api/controllers/chat_controller_test.exs

@@ -109,6 +109,9 @@ defmodule Pleroma.Web.PleromaAPI.ChatControllerTest do
     end
 
     test "it works with an attachment", %{conn: conn, user: user} do
+      clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+      clear_config([Pleroma.Uploaders.Local, :uploads], "uploads")
+
       file = %Plug.Upload{
         content_type: "image/jpeg",
         path: Path.absname("test/fixtures/image.jpg"),

test/pleroma/web/twitter_api/remote_follow_controller_test.exs

@@ -430,6 +430,8 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
 
     test "with media proxy" do
       clear_config([:media_proxy, :enabled], true)
+      clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
+      clear_config([Pleroma.Uploaders.Local, :uploads], "uploads")
 
       ConfigMock
       |> stub_with(Pleroma.Test.StaticConfig)