From 8a16504ce13da0deaec357886362363fe6901997 Mon Sep 17 00:00:00 2001 From: Ilja Date: Mon, 18 Jul 2022 10:58:46 +0200 Subject: [PATCH] set upload to local for failing tests All of these turned out to also have their upload set to S3 with default values. That made the tests fail because the default S3 values don't work. --- .../web/mastodon_api/controllers/media_controller_test.exs | 5 +++-- .../web/pleroma_api/controllers/backup_controller_test.exs | 3 ++- .../web/twitter_api/remote_follow_controller_test.exs | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs b/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs index d9b01656f..1f8533edd 100644 --- a/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs +++ b/test/pleroma/web/mastodon_api/controllers/media_controller_test.exs @@ -11,10 +11,11 @@ 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"]) - setup do: clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local) - setup do: clear_config([Pleroma.Uploaders.Local, :uploads], "uploads") setup do image = %Plug.Upload{ diff --git a/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs b/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs index 650f3d80d..f24e4ae49 100644 --- a/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs +++ b/test/pleroma/web/pleroma_api/controllers/backup_controller_test.exs @@ -9,7 +9,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]) oauth_access(["read:accounts"]) end diff --git a/test/pleroma/web/twitter_api/remote_follow_controller_test.exs b/test/pleroma/web/twitter_api/remote_follow_controller_test.exs index 2b57a42a4..2cd9a2846 100644 --- a/test/pleroma/web/twitter_api/remote_follow_controller_test.exs +++ b/test/pleroma/web/twitter_api/remote_follow_controller_test.exs @@ -428,6 +428,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") user = insert(:user, %{