Merge branch 'clear-config-test-improvements' into 'develop'

Improved in-test config management

See merge request pleroma/pleroma!2312

test/activity_expiration_test.exs

@@ -7,7 +7,7 @@ defmodule Pleroma.ActivityExpirationTest do
   alias Pleroma.ActivityExpiration
   import Pleroma.Factory
 
-  clear_config([ActivityExpiration, :enabled])
+  setup do: clear_config([ActivityExpiration, :enabled])
 
   test "finds activities due to be deleted only" do
     activity = insert(:note_activity)

test/activity_test.exs

@@ -138,7 +138,7 @@ test "when association is not loaded" do
       }
     end
 
-    clear_config([:instance, :limit_to_local_content])
+    setup do: clear_config([:instance, :limit_to_local_content])
 
     test "finds utf8 text in statuses", %{
       japanese_activity: japanese_activity,

test/captcha_test.exs

@@ -12,8 +12,7 @@ defmodule Pleroma.CaptchaTest do
   alias Pleroma.Captcha.Native
 
   @ets_options [:ordered_set, :private, :named_table, {:read_concurrency, true}]
-
+  setup do: clear_config([Pleroma.Captcha, :enabled])
-  clear_config([Pleroma.Captcha, :enabled])
 
   describe "Kocaptcha" do
     setup do

test/config/transfer_task_test.exs

@@ -10,9 +10,7 @@ defmodule Pleroma.Config.TransferTaskTest do
   alias Pleroma.Config.TransferTask
   alias Pleroma.ConfigDB
 
-  clear_config(:configurable_from_database) do
+  setup do: clear_config(:configurable_from_database, true)
-    Pleroma.Config.put(:configurable_from_database, true)
-  end
 
   test "transfer config values from db to env" do
     refute Application.get_env(:pleroma, :test_key)

test/conversation_test.exs

@@ -11,9 +11,7 @@ defmodule Pleroma.ConversationTest do
 
   import Pleroma.Factory
 
-  clear_config_all([:instance, :federating]) do
+  setup_all do: clear_config([:instance, :federating], true)
-    Pleroma.Config.put([:instance, :federating], true)
-  end
 
   test "it goes through old direct conversations" do
     user = insert(:user)

test/emails/mailer_test.exs

@@ -14,8 +14,7 @@ defmodule Pleroma.Emails.MailerTest do
     subject: "Pleroma test email",
     to: [{"Test User", "user1@example.com"}]
   }
-
+  setup do: clear_config([Pleroma.Emails.Mailer, :enabled])
-  clear_config([Pleroma.Emails.Mailer, :enabled])
 
   test "not send email when mailer is disabled" do
     Pleroma.Config.put([Pleroma.Emails.Mailer, :enabled], false)

test/http/request_builder_test.exs

@@ -8,8 +8,8 @@ defmodule Pleroma.HTTP.RequestBuilderTest do
   alias Pleroma.HTTP.RequestBuilder
 
   describe "headers/2" do
-    clear_config([:http, :send_user_agent])
+    setup do: clear_config([:http, :send_user_agent])
-    clear_config([:http, :user_agent])
+    setup do: clear_config([:http, :user_agent])
 
     test "don't send pleroma user agent" do
       assert RequestBuilder.headers(%{}, []) == %{headers: []}

test/object/fetcher_test.exs

@@ -28,8 +28,7 @@ defmodule Pleroma.Object.FetcherTest do
 
   describe "max thread distance restriction" do
     @ap_id "http://mastodon.example.org/@admin/99541947525187367"
-
+    setup do: clear_config([:instance, :federation_incoming_replies_max_depth])
-    clear_config([:instance, :federation_incoming_replies_max_depth])
 
     test "it returns thread depth exceeded error if thread depth is exceeded" do
       Pleroma.Config.put([:instance, :federation_incoming_replies_max_depth], 0)
@@ -160,7 +159,7 @@ test "it can refetch pruned objects" do
   end
 
   describe "signed fetches" do
-    clear_config([:activitypub, :sign_object_fetches])
+    setup do: clear_config([:activitypub, :sign_object_fetches])
 
     test_with_mock "it signs fetches when configured to do so",
                    Pleroma.Signature,

test/object_test.exs

@@ -74,8 +74,8 @@ test "ensures cache is cleared for the object" do
   end
 
   describe "delete attachments" do
-    clear_config([Pleroma.Upload])
+    setup do: clear_config([Pleroma.Upload])
-    clear_config([:instance, :cleanup_attachments])
+    setup do: clear_config([:instance, :cleanup_attachments])
 
     test "Disabled via config" do
       Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)

test/plugs/admin_secret_authentication_plug_test.exs

@@ -23,7 +23,7 @@ test "does nothing if a user is assigned", %{conn: conn} do
   end
 
   describe "when secret set it assigns an admin user" do
-    clear_config([:admin_token])
+    setup do: clear_config([:admin_token])
 
     test "with `admin_token` query parameter", %{conn: conn} do
       Pleroma.Config.put(:admin_token, "password123")

test/plugs/ensure_public_or_authenticated_plug_test.exs

@@ -9,7 +9,7 @@ defmodule Pleroma.Plugs.EnsurePublicOrAuthenticatedPlugTest do
   alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
   alias Pleroma.User
 
-  clear_config([:instance, :public])
+  setup do: clear_config([:instance, :public])
 
   test "it halts if not public and no user is assigned", %{conn: conn} do
     Config.put([:instance, :public], false)

test/plugs/http_security_plug_test.exs

@@ -7,9 +7,9 @@ defmodule Pleroma.Web.Plugs.HTTPSecurityPlugTest do
   alias Pleroma.Config
   alias Plug.Conn
 
-  clear_config([:http_securiy, :enabled])
+  setup do: clear_config([:http_securiy, :enabled])
-  clear_config([:http_security, :sts])
+  setup do: clear_config([:http_security, :sts])
-  clear_config([:http_security, :referrer_policy])
+  setup do: clear_config([:http_security, :referrer_policy])
 
   describe "http security enabled" do
     setup do

test/plugs/instance_static_test.exs

@@ -12,9 +12,7 @@ defmodule Pleroma.Web.RuntimeStaticPlugTest do
     on_exit(fn -> File.rm_rf(@dir) end)
   end
 
-  clear_config([:instance, :static_dir]) do
+  setup do: clear_config([:instance, :static_dir], @dir)
-    Pleroma.Config.put([:instance, :static_dir], @dir)
-  end
 
   test "overrides index" do
     bundled_index = get(build_conn(), "/")

test/plugs/oauth_scopes_plug_test.exs

@@ -193,7 +193,7 @@ test "filters scopes which directly match or are ancestors of supported scopes"
   end
 
   describe "transform_scopes/2" do
-    clear_config([:auth, :enforce_oauth_admin_scope_usage])
+    setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage])
 
     setup do
       {:ok, %{f: &OAuthScopesPlug.transform_scopes/2}}

test/plugs/rate_limiter_test.exs

@@ -12,14 +12,12 @@ defmodule Pleroma.Plugs.RateLimiterTest do
   import Pleroma.Tests.Helpers, only: [clear_config: 1, clear_config: 2]
 
   # Note: each example must work with separate buckets in order to prevent concurrency issues
-
+  setup do: clear_config([Pleroma.Web.Endpoint, :http, :ip])
-  clear_config([Pleroma.Web.Endpoint, :http, :ip])
+  setup do: clear_config(:rate_limit)
-  clear_config(:rate_limit)
 
   describe "config" do
     @limiter_name :test_init
-
+    setup do: clear_config([Pleroma.Plugs.RemoteIp, :enabled])
-    clear_config([Pleroma.Plugs.RemoteIp, :enabled])
 
     test "config is required for plug to work" do
       Config.put([:rate_limit, @limiter_name], {1, 1})

test/plugs/remote_ip_test.exs

@@ -9,8 +9,7 @@ defmodule Pleroma.Plugs.RemoteIpTest do
   alias Pleroma.Plugs.RemoteIp
 
   import Pleroma.Tests.Helpers, only: [clear_config: 1, clear_config: 2]
-
+  setup do: clear_config(RemoteIp)
-  clear_config(RemoteIp)
 
   test "disabled" do
     Pleroma.Config.put(RemoteIp, enabled: false)

test/plugs/user_enabled_plug_test.exs

@@ -8,7 +8,7 @@ defmodule Pleroma.Plugs.UserEnabledPlugTest do
   alias Pleroma.Plugs.UserEnabledPlug
   import Pleroma.Factory
 
-  clear_config([:instance, :account_activation_required])
+  setup do: clear_config([:instance, :account_activation_required])
 
   test "doesn't do anything if the user isn't set", %{conn: conn} do
     ret_conn =

test/plugs/user_is_admin_plug_test.exs

@@ -9,9 +9,7 @@ defmodule Pleroma.Plugs.UserIsAdminPlugTest do
   import Pleroma.Factory
 
   describe "unless [:auth, :enforce_oauth_admin_scope_usage]," do
-    clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
+    setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], false)
-      Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], false)
-    end
 
     test "accepts a user that is an admin" do
       user = insert(:user, is_admin: true)
@@ -42,9 +40,7 @@ test "denies when a user isn't set" do
   end
 
   describe "with [:auth, :enforce_oauth_admin_scope_usage]," do
-    clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
+    setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], true)
-      Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], true)
-    end
 
     setup do
       admin_user = insert(:user, is_admin: true)

test/repo_test.exs

@@ -67,7 +67,7 @@ test "return error if has not assoc " do
       :ok
     end
 
-    clear_config([:i_am_aware_this_may_cause_data_loss, :disable_migration_check])
+    setup do: clear_config([:i_am_aware_this_may_cause_data_loss, :disable_migration_check])
 
     test "raises if it detects unapplied migrations" do
       assert_raise Pleroma.Repo.UnappliedMigrationsError, fn ->

test/scheduled_activity_test.exs

@@ -8,7 +8,7 @@ defmodule Pleroma.ScheduledActivityTest do
   alias Pleroma.ScheduledActivity
   import Pleroma.Factory
 
-  clear_config([ScheduledActivity, :enabled])
+  setup do: clear_config([ScheduledActivity, :enabled])
 
   setup context do
     DataCase.ensure_local_uploader(context)

test/support/helpers.ex

@@ -17,35 +17,17 @@ defmacro clear_config(config_path) do
 
   defmacro clear_config(config_path, do: yield) do
     quote do
-      setup do
+      initial_setting = Config.get(unquote(config_path))
-        initial_setting = Config.get(unquote(config_path))
+      unquote(yield)
-        unquote(yield)
+      on_exit(fn -> Config.put(unquote(config_path), initial_setting) end)
-        on_exit(fn -> Config.put(unquote(config_path), initial_setting) end)
+      :ok
-        :ok
-      end
     end
   end
 
-  @doc "Stores initial config value and restores it after *all* test examples are executed."
+  defmacro clear_config(config_path, temp_setting) do
-  defmacro clear_config_all(config_path) do
     quote do
-      clear_config_all(unquote(config_path)) do
+      clear_config(unquote(config_path)) do
-      end
+        Config.put(unquote(config_path), unquote(temp_setting))
-    end
-  end
-
-  @doc """
-  Stores initial config value and restores it after *all* test examples are executed.
-  Only use if *all* test examples should work with the same stubbed value
-  (*no* examples set a different value).
-  """
-  defmacro clear_config_all(config_path, do: yield) do
-    quote do
-      setup_all do
-        initial_setting = Config.get(unquote(config_path))
-        unquote(yield)
-        on_exit(fn -> Config.put(unquote(config_path), initial_setting) end)
-        :ok
       end
     end
   end
@@ -55,9 +37,7 @@ defmacro __using__(_opts) do
       import Pleroma.Tests.Helpers,
         only: [
           clear_config: 1,
-          clear_config: 2,
+          clear_config: 2
-          clear_config_all: 1,
-          clear_config_all: 2
         ]
 
       def to_datetime(naive_datetime) do

test/tasks/config_test.exs

@@ -20,9 +20,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do
     :ok
   end
 
-  clear_config_all(:configurable_from_database) do
+  setup_all do: clear_config(:configurable_from_database, true)
-    Pleroma.Config.put(:configurable_from_database, true)
-  end
 
   test "error if file with custom settings doesn't exist" do
     Mix.Tasks.Pleroma.Config.migrate_to_db("config/not_existance_config_file.exs")

test/tasks/robots_txt_test.exs

@@ -7,7 +7,7 @@ defmodule Mix.Tasks.Pleroma.RobotsTxtTest do
   use Pleroma.Tests.Helpers
   alias Mix.Tasks.Pleroma.RobotsTxt
 
-  clear_config([:instance, :static_dir])
+  setup do: clear_config([:instance, :static_dir])
 
   test "creates new dir" do
     path = "test/fixtures/new_dir/"

test/upload/filter/anonymize_filename_test.exs

@@ -18,7 +18,7 @@ defmodule Pleroma.Upload.Filter.AnonymizeFilenameTest do
     %{upload_file: upload_file}
   end
 
-  clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
+  setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
 
   test "it replaces filename on pre-defined text", %{upload_file: upload_file} do
     Config.put([Upload.Filter.AnonymizeFilename, :text], "custom-file.png")

test/upload/filter/mogrify_test.exs

@@ -10,7 +10,7 @@ defmodule Pleroma.Upload.Filter.MogrifyTest do
   alias Pleroma.Upload
   alias Pleroma.Upload.Filter
 
-  clear_config([Filter.Mogrify, :args])
+  setup do: clear_config([Filter.Mogrify, :args])
 
   test "apply mogrify filter" do
     Config.put([Filter.Mogrify, :args], [{"tint", "40"}])

test/upload/filter_test.exs

@@ -8,7 +8,7 @@ defmodule Pleroma.Upload.FilterTest do
   alias Pleroma.Config
   alias Pleroma.Upload.Filter
 
-  clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
+  setup do: clear_config([Pleroma.Upload.Filter.AnonymizeFilename, :text])
 
   test "applies filters" do
     Config.put([Pleroma.Upload.Filter.AnonymizeFilename, :text], "custom-file.png")

test/upload_test.exs

@@ -250,9 +250,7 @@ test "escapes reserved uri characters" do
   end
 
   describe "Setting a custom base_url for uploaded media" do
-    clear_config([Pleroma.Upload, :base_url]) do
+    setup do: clear_config([Pleroma.Upload, :base_url], "https://cache.pleroma.social")
-      Pleroma.Config.put([Pleroma.Upload, :base_url], "https://cache.pleroma.social")
-    end
 
     test "returns a media url with configured base_url" do
       base_url = Pleroma.Config.get([Pleroma.Upload, :base_url])

test/uploaders/s3_test.exs

@@ -11,12 +11,11 @@ defmodule Pleroma.Uploaders.S3Test do
   import Mock
   import ExUnit.CaptureLog
 
-  clear_config([Pleroma.Uploaders.S3]) do
+  setup do:
-    Config.put([Pleroma.Uploaders.S3],
+          clear_config(Pleroma.Uploaders.S3,
-      bucket: "test_bucket",
+            bucket: "test_bucket",
-      public_endpoint: "https://s3.amazonaws.com"
+            public_endpoint: "https://s3.amazonaws.com"
-    )
+          )
-  end
 
   describe "get_file/1" do
     test "it returns path to local folder for files" do

test/user_search_test.exs

@@ -15,7 +15,7 @@ defmodule Pleroma.UserSearchTest do
   end
 
   describe "User.search" do
-    clear_config([:instance, :limit_to_local_content])
+    setup do: clear_config([:instance, :limit_to_local_content])
 
     test "excluded invisible users from results" do
       user = insert(:user, %{nickname: "john t1000"})

test/user_test.exs

@@ -24,7 +24,7 @@ defmodule Pleroma.UserTest do
     :ok
   end
 
-  clear_config([:instance, :account_activation_required])
+  setup do: clear_config([:instance, :account_activation_required])
 
   describe "service actors" do
     test "returns updated invisible actor" do
@@ -297,7 +297,7 @@ test "local users do not automatically follow local locked accounts" do
   end
 
   describe "unfollow/2" do
-    clear_config([:instance, :external_user_synchronization])
+    setup do: clear_config([:instance, :external_user_synchronization])
 
     test "unfollow with syncronizes external user" do
       Pleroma.Config.put([:instance, :external_user_synchronization], true)
@@ -375,10 +375,9 @@ test "fetches correct profile for nickname beginning with number" do
       password_confirmation: "test",
       email: "email@example.com"
     }
-
+    setup do: clear_config([:instance, :autofollowed_nicknames])
-    clear_config([:instance, :autofollowed_nicknames])
+    setup do: clear_config([:instance, :welcome_message])
-    clear_config([:instance, :welcome_message])
+    setup do: clear_config([:instance, :welcome_user_nickname])
-    clear_config([:instance, :welcome_user_nickname])
 
     test "it autofollows accounts that are set for it" do
       user = insert(:user)
@@ -412,7 +411,7 @@ test "it sends a welcome message if it is set" do
       assert activity.actor == welcome_user.ap_id
     end
 
-    clear_config([:instance, :account_activation_required])
+    setup do: clear_config([:instance, :account_activation_required])
 
     test "it requires an email, name, nickname and password, bio is optional when account_activation_required is enabled" do
       Pleroma.Config.put([:instance, :account_activation_required], true)
@@ -475,10 +474,7 @@ test "it sets the password_hash and ap_id" do
       password_confirmation: "test",
       email: "email@example.com"
     }
-
+    setup do: clear_config([:instance, :account_activation_required], true)
-    clear_config([:instance, :account_activation_required]) do
-      Pleroma.Config.put([:instance, :account_activation_required], true)
-    end
 
     test "it creates unconfirmed user" do
       changeset = User.register_changeset(%User{}, @full_user_data)
@@ -621,9 +617,8 @@ test "returns an ap_followers link for a user" do
       ap_id: "http...",
       avatar: %{some: "avatar"}
     }
-
+    setup do: clear_config([:instance, :user_bio_length])
-    clear_config([:instance, :user_bio_length])
+    setup do: clear_config([:instance, :user_name_length])
-    clear_config([:instance, :user_name_length])
 
     test "it confirms validity" do
       cs = User.remote_user_creation(@valid_remote)
@@ -1116,7 +1111,7 @@ test "hide a user's statuses from timelines and notifications" do
       [user: user]
     end
 
-    clear_config([:instance, :federating])
+    setup do: clear_config([:instance, :federating])
 
     test ".delete_user_activities deletes all create activities", %{user: user} do
       {:ok, activity} = CommonAPI.post(user, %{"status" => "2hu"})
@@ -1297,7 +1292,7 @@ test "User.delete() plugs any possible zombie objects" do
   end
 
   describe "account_status/1" do
-    clear_config([:instance, :account_activation_required])
+    setup do: clear_config([:instance, :account_activation_required])
 
     test "return confirmation_pending for unconfirm user" do
       Pleroma.Config.put([:instance, :account_activation_required], true)
@@ -1665,7 +1660,7 @@ test "performs update cache if user updated" do
   end
 
   describe "following/followers synchronization" do
-    clear_config([:instance, :external_user_synchronization])
+    setup do: clear_config([:instance, :external_user_synchronization])
 
     test "updates the counters normally on following/getting a follow when disabled" do
       Pleroma.Config.put([:instance, :external_user_synchronization], false)
@@ -1770,7 +1765,7 @@ test "changes email", %{user: user} do
       [local_user: local_user, remote_user: remote_user]
     end
 
-    clear_config([:instance, :limit_to_local_content])
+    setup do: clear_config([:instance, :limit_to_local_content])
 
     test "allows getting remote users by id no matter what :limit_to_local_content is set to", %{
       remote_user: remote_user

test/web/activity_pub/activity_pub_controller_test.exs

@@ -26,12 +26,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
     :ok
   end
 
-  clear_config([:instance, :federating]) do
+  setup do: clear_config([:instance, :federating], true)
-    Config.put([:instance, :federating], true)
-  end
 
   describe "/relay" do
-    clear_config([:instance, :allow_relay])
+    setup do: clear_config([:instance, :allow_relay])
 
     test "with the relay active, it returns the relay user", %{conn: conn} do
       res =
@@ -1227,8 +1225,8 @@ test "GET /api/ap/whoami", %{conn: conn} do
       |> json_response(403)
     end
 
-    clear_config([:media_proxy])
+    setup do: clear_config([:media_proxy])
-    clear_config([Pleroma.Upload])
+    setup do: clear_config([Pleroma.Upload])
 
     test "POST /api/ap/upload_media", %{conn: conn} do
       user = insert(:user)

test/web/activity_pub/activity_pub_test.exs

@@ -27,7 +27,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubTest do
     :ok
   end
 
-  clear_config([:instance, :federating])
+  setup do: clear_config([:instance, :federating])
 
   describe "streaming out participations" do
     test "it streams them out" do
@@ -1396,7 +1396,7 @@ test "creates an undo activity for the last block" do
   end
 
   describe "deletion" do
-    clear_config([:instance, :rewrite_policy])
+    setup do: clear_config([:instance, :rewrite_policy])
 
     test "it reverts deletion on error" do
       note = insert(:note_activity)
@@ -1580,7 +1580,7 @@ test "it filters broken threads" do
   end
 
   describe "update" do
-    clear_config([:instance, :max_pinned_statuses])
+    setup do: clear_config([:instance, :max_pinned_statuses])
 
     test "it creates an update activity with the new user data" do
       user = insert(:user)

test/web/activity_pub/mrf/hellthread_policy_test.exs

@@ -26,7 +26,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.HellthreadPolicyTest do
     [user: user, message: message]
   end
 
-  clear_config(:mrf_hellthread)
+  setup do: clear_config(:mrf_hellthread)
 
   describe "reject" do
     test "rejects the message if the recipient count is above reject_threshold", %{

test/web/activity_pub/mrf/keyword_policy_test.exs

@@ -7,7 +7,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do
 
   alias Pleroma.Web.ActivityPub.MRF.KeywordPolicy
 
-  clear_config(:mrf_keyword)
+  setup do: clear_config(:mrf_keyword)
 
   setup do
     Pleroma.Config.put([:mrf_keyword], %{reject: [], federated_timeline_removal: [], replace: []})

test/web/activity_pub/mrf/mention_policy_test.exs

@@ -7,7 +7,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MentionPolicyTest do
 
   alias Pleroma.Web.ActivityPub.MRF.MentionPolicy
 
-  clear_config(:mrf_mention)
+  setup do: clear_config(:mrf_mention)
 
   test "pass filter if allow list is empty" do
     Pleroma.Config.delete([:mrf_mention])

test/web/activity_pub/mrf/mrf_test.exs

@@ -60,7 +60,7 @@ test "matches are case-insensitive" do
   end
 
   describe "describe/0" do
-    clear_config([:instance, :rewrite_policy])
+    setup do: clear_config([:instance, :rewrite_policy])
 
     test "it works as expected with noop policy" do
       expected = %{

test/web/activity_pub/mrf/object_age_policy_test.exs

@@ -9,12 +9,11 @@ defmodule Pleroma.Web.ActivityPub.MRF.ObjectAgePolicyTest do
   alias Pleroma.Web.ActivityPub.MRF.ObjectAgePolicy
   alias Pleroma.Web.ActivityPub.Visibility
 
-  clear_config([:mrf_object_age]) do
+  setup do:
-    Config.put(:mrf_object_age,
+          clear_config(:mrf_object_age,
-      threshold: 172_800,
+            threshold: 172_800,
-      actions: [:delist, :strip_followers]
+            actions: [:delist, :strip_followers]
-    )
+          )
-  end
 
   setup_all do
     Tesla.Mock.mock_global(fn env -> apply(HttpRequestMock, :request, [env]) end)

test/web/activity_pub/mrf/reject_non_public_test.exs

@@ -8,7 +8,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.RejectNonPublicTest do
 
   alias Pleroma.Web.ActivityPub.MRF.RejectNonPublic
 
-  clear_config([:mrf_rejectnonpublic])
+  setup do: clear_config([:mrf_rejectnonpublic])
 
   describe "public message" do
     test "it's allowed when address is public" do

test/web/activity_pub/mrf/simple_policy_test.exs

@@ -8,18 +8,17 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicyTest do
   alias Pleroma.Config
   alias Pleroma.Web.ActivityPub.MRF.SimplePolicy
 
-  clear_config([:mrf_simple]) do
+  setup do:
-    Config.put(:mrf_simple,
+          clear_config(:mrf_simple,
-      media_removal: [],
+            media_removal: [],
-      media_nsfw: [],
+            media_nsfw: [],
-      federated_timeline_removal: [],
+            federated_timeline_removal: [],
-      report_removal: [],
+            report_removal: [],
-      reject: [],
+            reject: [],
-      accept: [],
+            accept: [],
-      avatar_removal: [],
+            avatar_removal: [],
-      banner_removal: []
+            banner_removal: []
-    )
+          )
-  end
 
   describe "when :media_removal" do
     test "is empty" do

test/web/activity_pub/mrf/subchain_policy_test.exs

@@ -13,8 +13,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SubchainPolicyTest do
     "type" => "Create",
     "object" => %{"content" => "hi"}
   }
-
+  setup do: clear_config([:mrf_subchain, :match_actor])
-  clear_config([:mrf_subchain, :match_actor])
 
   test "it matches and processes subchains when the actor matches a configured target" do
     Pleroma.Config.put([:mrf_subchain, :match_actor], %{

test/web/activity_pub/mrf/user_allowlist_policy_test.exs

@@ -7,7 +7,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.UserAllowListPolicyTest do
 
   alias Pleroma.Web.ActivityPub.MRF.UserAllowListPolicy
 
-  clear_config([:mrf_user_allowlist, :localhost])
+  setup do: clear_config([:mrf_user_allowlist, :localhost])
 
   test "pass filter if allow list is empty" do
     actor = insert(:user)

test/web/activity_pub/mrf/vocabulary_policy_test.exs

@@ -8,7 +8,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.VocabularyPolicyTest do
   alias Pleroma.Web.ActivityPub.MRF.VocabularyPolicy
 
   describe "accept" do
-    clear_config([:mrf_vocabulary, :accept])
+    setup do: clear_config([:mrf_vocabulary, :accept])
 
     test "it accepts based on parent activity type" do
       Pleroma.Config.put([:mrf_vocabulary, :accept], ["Like"])
@@ -65,7 +65,7 @@ test "it does not accept disallowed parent types" do
   end
 
   describe "reject" do
-    clear_config([:mrf_vocabulary, :reject])
+    setup do: clear_config([:mrf_vocabulary, :reject])
 
     test "it rejects based on parent activity type" do
       Pleroma.Config.put([:mrf_vocabulary, :reject], ["Like"])

test/web/activity_pub/publisher_test.exs

@@ -23,9 +23,7 @@ defmodule Pleroma.Web.ActivityPub.PublisherTest do
     :ok
   end
 
-  clear_config_all([:instance, :federating]) do
+  setup_all do: clear_config([:instance, :federating], true)
-    Pleroma.Config.put([:instance, :federating], true)
-  end
 
   describe "gather_webfinger_links/1" do
     test "it returns links" do

test/web/activity_pub/relay_test.exs

@@ -68,7 +68,7 @@ test "returns activity" do
   end
 
   describe "publish/1" do
-    clear_config([:instance, :federating])
+    setup do: clear_config([:instance, :federating])
 
     test "returns error when activity not `Create` type" do
       activity = insert(:like_activity)

test/web/activity_pub/transmogrifier/follow_handling_test.exs

@@ -19,7 +19,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier.FollowHandlingTest do
   end
 
   describe "handle_incoming" do
-    clear_config([:user, :deny_follow_blocked])
+    setup do: clear_config([:user, :deny_follow_blocked])
 
     test "it works for osada follow request" do
       user = insert(:user)

test/web/activity_pub/transmogrifier_test.exs

@@ -25,7 +25,7 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do
     :ok
   end
 
-  clear_config([:instance, :max_remote_account_fields])
+  setup do: clear_config([:instance, :max_remote_account_fields])
 
   describe "handle_incoming" do
     test "it ignores an incoming notice if we already have it" do
@@ -1351,11 +1351,8 @@ test "it accepts Move activities" do
   end
 
   describe "`handle_incoming/2`, Mastodon format `replies` handling" do
-    clear_config([:activitypub, :note_replies_output_limit]) do
+    setup do: clear_config([:activitypub, :note_replies_output_limit], 5)
-      Pleroma.Config.put([:activitypub, :note_replies_output_limit], 5)
+    setup do: clear_config([:instance, :federation_incoming_replies_max_depth])
-    end
-
-    clear_config([:instance, :federation_incoming_replies_max_depth])
 
     setup do
       data =
@@ -1394,11 +1391,8 @@ test "does NOT schedule background fetching of `replies` beyond max thread depth
   end
 
   describe "`handle_incoming/2`, Pleroma format `replies` handling" do
-    clear_config([:activitypub, :note_replies_output_limit]) do
+    setup do: clear_config([:activitypub, :note_replies_output_limit], 5)
-      Pleroma.Config.put([:activitypub, :note_replies_output_limit], 5)
+    setup do: clear_config([:instance, :federation_incoming_replies_max_depth])
-    end
-
-    clear_config([:instance, :federation_incoming_replies_max_depth])
 
     setup do
       user = insert(:user)
@@ -1882,7 +1876,7 @@ test "returns fixed object" do
   end
 
   describe "fix_in_reply_to/2" do
-    clear_config([:instance, :federation_incoming_replies_max_depth])
+    setup do: clear_config([:instance, :federation_incoming_replies_max_depth])
 
     setup do
       data = Poison.decode!(File.read!("test/fixtures/mastodon-post-activity.json"))
@@ -2145,9 +2139,7 @@ test "returns object with emoji when object contains map tag" do
   end
 
   describe "set_replies/1" do
-    clear_config([:activitypub, :note_replies_output_limit]) do
+    setup do: clear_config([:activitypub, :note_replies_output_limit], 2)
-      Pleroma.Config.put([:activitypub, :note_replies_output_limit], 2)
-    end
 
     test "returns unmodified object if activity doesn't have self-replies" do
       data = Poison.decode!(File.read!("test/fixtures/mastodon-post-activity.json"))

test/web/activity_pub/views/object_view_test.exs

@@ -37,9 +37,7 @@ test "renders a note activity" do
   end
 
   describe "note activity's `replies` collection rendering" do
-    clear_config([:activitypub, :note_replies_output_limit]) do
+    setup do: clear_config([:activitypub, :note_replies_output_limit], 5)
-      Pleroma.Config.put([:activitypub, :note_replies_output_limit], 5)
-    end
 
     test "renders `replies` collection for a note activity" do
       user = insert(:user)

test/web/admin_api/admin_api_controller_test.exs

@@ -43,9 +43,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
   end
 
   describe "with [:auth, :enforce_oauth_admin_scope_usage]," do
-    clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
+    setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], true)
-      Config.put([:auth, :enforce_oauth_admin_scope_usage], true)
-    end
 
     test "GET /api/pleroma/admin/users/:nickname requires admin:read:accounts or broader scope",
          %{admin: admin} do
@@ -93,9 +91,7 @@ test "GET /api/pleroma/admin/users/:nickname requires admin:read:accounts or bro
   end
 
   describe "unless [:auth, :enforce_oauth_admin_scope_usage]," do
-    clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
+    setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], false)
-      Config.put([:auth, :enforce_oauth_admin_scope_usage], false)
-    end
 
     test "GET /api/pleroma/admin/users/:nickname requires " <>
            "read:accounts or admin:read:accounts or broader scope",
@@ -581,13 +577,8 @@ test "/:right DELETE, can remove from a permission group (multiple)", %{
   end
 
   describe "POST /api/pleroma/admin/email_invite, with valid config" do
-    clear_config([:instance, :registrations_open]) do
+    setup do: clear_config([:instance, :registrations_open], false)
-      Config.put([:instance, :registrations_open], false)
+    setup do: clear_config([:instance, :invites_enabled], true)
-    end
-
-    clear_config([:instance, :invites_enabled]) do
-      Config.put([:instance, :invites_enabled], true)
-    end
 
     test "sends invitation and returns 204", %{admin: admin, conn: conn} do
       recipient_email = "foo@bar.com"
@@ -638,8 +629,8 @@ test "it returns 403 if requested by a non-admin" do
   end
 
   describe "POST /api/pleroma/admin/users/email_invite, with invalid config" do
-    clear_config([:instance, :registrations_open])
+    setup do: clear_config([:instance, :registrations_open])
-    clear_config([:instance, :invites_enabled])
+    setup do: clear_config([:instance, :invites_enabled])
 
     test "it returns 500 if `invites_enabled` is not enabled", %{conn: conn} do
       Config.put([:instance, :registrations_open], false)
@@ -1888,9 +1879,7 @@ test "returns 404 when the status does not exist", %{conn: conn} do
   end
 
   describe "GET /api/pleroma/admin/config" do
-    clear_config(:configurable_from_database) do
+    setup do: clear_config(:configurable_from_database, true)
-      Config.put(:configurable_from_database, true)
-    end
 
     test "when configuration from database is off", %{conn: conn} do
       Config.put(:configurable_from_database, false)
@@ -2041,9 +2030,7 @@ test "POST /api/pleroma/admin/config error", %{conn: conn} do
       end)
     end
 
-    clear_config(:configurable_from_database) do
+    setup do: clear_config(:configurable_from_database, true)
-      Config.put(:configurable_from_database, true)
-    end
 
     @tag capture_log: true
     test "create new config setting in db", %{conn: conn} do
@@ -3052,9 +3039,7 @@ test "proxy tuple ip", %{conn: conn} do
   end
 
   describe "GET /api/pleroma/admin/restart" do
-    clear_config(:configurable_from_database) do
+    setup do: clear_config(:configurable_from_database, true)
-      Config.put(:configurable_from_database, true)
-    end
 
     test "pleroma restarts", %{conn: conn} do
       capture_log(fn ->

test/web/chat_channel_test.exs

@@ -21,7 +21,7 @@ test "it broadcasts a message", %{socket: socket} do
   end
 
   describe "message lengths" do
-    clear_config([:instance, :chat_limit])
+    setup do: clear_config([:instance, :chat_limit])
 
     test "it ignores messages of length zero", %{socket: socket} do
       push(socket, "new_msg", %{"text" => ""})

test/web/common_api/common_api_test.exs

@@ -17,9 +17,9 @@ defmodule Pleroma.Web.CommonAPITest do
 
   require Pleroma.Constants
 
-  clear_config([:instance, :safe_dm_mentions])
+  setup do: clear_config([:instance, :safe_dm_mentions])
-  clear_config([:instance, :limit])
+  setup do: clear_config([:instance, :limit])
-  clear_config([:instance, :max_pinned_statuses])
+  setup do: clear_config([:instance, :max_pinned_statuses])
 
   test "when replying to a conversation / participation, it will set the correct context id even if no explicit reply_to is given" do
     user = insert(:user)

test/web/federator_test.exs

@@ -21,13 +21,10 @@ defmodule Pleroma.Web.FederatorTest do
     :ok
   end
 
-  clear_config_all([:instance, :federating]) do
+  setup_all do: clear_config([:instance, :federating], true)
-    Pleroma.Config.put([:instance, :federating], true)
+  setup do: clear_config([:instance, :allow_relay])
-  end
+  setup do: clear_config([:instance, :rewrite_policy])
-
+  setup do: clear_config([:mrf_keyword])
-  clear_config([:instance, :allow_relay])
-  clear_config([:instance, :rewrite_policy])
-  clear_config([:mrf_keyword])
 
   describe "Publish an activity" do
     setup do

test/web/feed/tag_controller_test.exs

@@ -10,7 +10,7 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
 
   alias Pleroma.Web.Feed.FeedView
 
-  clear_config([:feed])
+  setup do: clear_config([:feed])
 
   test "gets a feed (ATOM)", %{conn: conn} do
     Pleroma.Config.put(

test/web/feed/user_controller_test.exs

@@ -12,12 +12,10 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
   alias Pleroma.Object
   alias Pleroma.User
 
-  clear_config([:instance, :federating]) do
+  setup do: clear_config([:instance, :federating], true)
-    Config.put([:instance, :federating], true)
-  end
 
   describe "feed" do
-    clear_config([:feed])
+    setup do: clear_config([:feed])
 
     test "gets a feed", %{conn: conn} do
       Config.put(

test/web/instances/instance_test.exs

@@ -10,9 +10,7 @@ defmodule Pleroma.Instances.InstanceTest do
 
   import Pleroma.Factory
 
-  clear_config_all([:instance, :federation_reachability_timeout_days]) do
+  setup_all do: clear_config([:instance, :federation_reachability_timeout_days], 1)
-    Pleroma.Config.put([:instance, :federation_reachability_timeout_days], 1)
-  end
 
   describe "set_reachable/1" do
     test "clears `unreachable_since` of existing matching Instance record having non-nil `unreachable_since`" do

test/web/instances/instances_test.exs

@@ -7,9 +7,7 @@ defmodule Pleroma.InstancesTest do
 
   use Pleroma.DataCase
 
-  clear_config_all([:instance, :federation_reachability_timeout_days]) do
+  setup_all do: clear_config([:instance, :federation_reachability_timeout_days], 1)
-    Pleroma.Config.put([:instance, :federation_reachability_timeout_days], 1)
-  end
 
   describe "reachable?/1" do
     test "returns `true` for host / url with unknown reachability status" do

test/web/masto_fe_controller_test.exs

@@ -10,7 +10,7 @@ defmodule Pleroma.Web.MastodonAPI.MastoFEController do
 
   import Pleroma.Factory
 
-  clear_config([:instance, :public])
+  setup do: clear_config([:instance, :public])
 
   test "put settings", %{conn: conn} do
     user = insert(:user)

test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs

@@ -9,7 +9,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController.UpdateCredentialsTest do
   use Pleroma.Web.ConnCase
 
   import Pleroma.Factory
-  clear_config([:instance, :max_account_fields])
+
+  setup do: clear_config([:instance, :max_account_fields])
 
   describe "updating credentials" do
     setup do: oauth_access(["write:accounts"])

test/web/mastodon_api/controllers/account_controller_test.exs

@@ -16,7 +16,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
   import Pleroma.Factory
 
   describe "account fetching" do
-    clear_config([:instance, :limit_to_local_content])
+    setup do: clear_config([:instance, :limit_to_local_content])
 
     test "works by id" do
       user = insert(:user)
@@ -150,13 +150,9 @@ defp local_and_remote_users do
   describe "user fetching with restrict unauthenticated profiles for local and remote" do
     setup do: local_and_remote_users()
 
-    clear_config([:restrict_unauthenticated, :profiles, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :local], true)
-      Config.put([:restrict_unauthenticated, :profiles, :local], true)
-    end
 
-    clear_config([:restrict_unauthenticated, :profiles, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :remote], true)
-      Config.put([:restrict_unauthenticated, :profiles, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/accounts/#{local.id}")
@@ -186,9 +182,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
   describe "user fetching with restrict unauthenticated profiles for local" do
     setup do: local_and_remote_users()
 
-    clear_config([:restrict_unauthenticated, :profiles, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :local], true)
-      Config.put([:restrict_unauthenticated, :profiles, :local], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/accounts/#{local.id}")
@@ -215,9 +209,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
   describe "user fetching with restrict unauthenticated profiles for remote" do
     setup do: local_and_remote_users()
 
-    clear_config([:restrict_unauthenticated, :profiles, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :remote], true)
-      Config.put([:restrict_unauthenticated, :profiles, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/accounts/#{local.id}")
@@ -405,13 +397,9 @@ defp local_and_remote_activities(%{local: local, remote: remote}) do
     setup do: local_and_remote_users()
     setup :local_and_remote_activities
 
-    clear_config([:restrict_unauthenticated, :profiles, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :local], true)
-      Config.put([:restrict_unauthenticated, :profiles, :local], true)
-    end
 
-    clear_config([:restrict_unauthenticated, :profiles, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :remote], true)
-      Config.put([:restrict_unauthenticated, :profiles, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/accounts/#{local.id}/statuses")
@@ -442,9 +430,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
     setup do: local_and_remote_users()
     setup :local_and_remote_activities
 
-    clear_config([:restrict_unauthenticated, :profiles, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :local], true)
-      Config.put([:restrict_unauthenticated, :profiles, :local], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/accounts/#{local.id}/statuses")
@@ -472,9 +458,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
     setup do: local_and_remote_users()
     setup :local_and_remote_activities
 
-    clear_config([:restrict_unauthenticated, :profiles, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :profiles, :remote], true)
-      Config.put([:restrict_unauthenticated, :profiles, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/accounts/#{local.id}/statuses")
@@ -806,7 +790,7 @@ test "blocking / unblocking a user" do
       [valid_params: valid_params]
     end
 
-    clear_config([:instance, :account_activation_required])
+    setup do: clear_config([:instance, :account_activation_required])
 
     test "Account registration via Application", %{conn: conn} do
       conn =
@@ -904,7 +888,7 @@ test "returns bad_request if missing required params", %{
       end)
     end
 
-    clear_config([:instance, :account_activation_required])
+    setup do: clear_config([:instance, :account_activation_required])
 
     test "returns bad_request if missing email params when :account_activation_required is enabled",
          %{conn: conn, valid_params: valid_params} do
@@ -961,9 +945,7 @@ test "returns forbidden if token is invalid", %{conn: conn, valid_params: valid_
   end
 
   describe "create account by app / rate limit" do
-    clear_config([:rate_limit, :app_account_creation]) do
+    setup do: clear_config([:rate_limit, :app_account_creation], {10_000, 2})
-      Config.put([:rate_limit, :app_account_creation], {10_000, 2})
-    end
 
     test "respects rate limit setting", %{conn: conn} do
       app_token = insert(:oauth_token, user: nil)

test/web/mastodon_api/controllers/media_controller_test.exs

@@ -22,8 +22,8 @@ defmodule Pleroma.Web.MastodonAPI.MediaControllerTest do
       [image: image]
     end
 
-    clear_config([:media_proxy])
+    setup do: clear_config([:media_proxy])
-    clear_config([Pleroma.Upload])
+    setup do: clear_config([Pleroma.Upload])
 
     test "returns uploaded image", %{conn: conn, image: image} do
       desc = "Description of the image"

test/web/mastodon_api/controllers/scheduled_activity_controller_test.exs

@@ -11,7 +11,7 @@ defmodule Pleroma.Web.MastodonAPI.ScheduledActivityControllerTest do
   import Pleroma.Factory
   import Ecto.Query
 
-  clear_config([ScheduledActivity, :enabled])
+  setup do: clear_config([ScheduledActivity, :enabled])
 
   test "shows scheduled activities" do
     %{user: user, conn: conn} = oauth_access(["read:statuses"])

test/web/mastodon_api/controllers/status_controller_test.exs

@@ -19,9 +19,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusControllerTest do
 
   import Pleroma.Factory
 
-  clear_config([:instance, :federating])
+  setup do: clear_config([:instance, :federating])
-  clear_config([:instance, :allow_relay])
+  setup do: clear_config([:instance, :allow_relay])
-  clear_config([:rich_media, :enabled])
+  setup do: clear_config([:rich_media, :enabled])
 
   describe "posting statuses" do
     setup do: oauth_access(["write:statuses"])
@@ -485,13 +485,9 @@ defp local_and_remote_activities do
   describe "status with restrict unauthenticated activities for local and remote" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :activities, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :local], true)
-      Config.put([:restrict_unauthenticated, :activities, :local], true)
-    end
 
-    clear_config([:restrict_unauthenticated, :activities, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :remote], true)
-      Config.put([:restrict_unauthenticated, :activities, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/statuses/#{local.id}")
@@ -520,9 +516,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
   describe "status with restrict unauthenticated activities for local" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :activities, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :local], true)
-      Config.put([:restrict_unauthenticated, :activities, :local], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/statuses/#{local.id}")
@@ -548,9 +542,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
   describe "status with restrict unauthenticated activities for remote" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :activities, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :remote], true)
-      Config.put([:restrict_unauthenticated, :activities, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/statuses/#{local.id}")
@@ -614,13 +606,9 @@ test "get statuses by IDs" do
   describe "getting statuses by ids with restricted unauthenticated for local and remote" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :activities, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :local], true)
-      Config.put([:restrict_unauthenticated, :activities, :local], true)
-    end
 
-    clear_config([:restrict_unauthenticated, :activities, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :remote], true)
-      Config.put([:restrict_unauthenticated, :activities, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/statuses", %{ids: [local.id, remote.id]})
@@ -640,9 +628,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
   describe "getting statuses by ids with restricted unauthenticated for local" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :activities, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :local], true)
-      Config.put([:restrict_unauthenticated, :activities, :local], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/statuses", %{ids: [local.id, remote.id]})
@@ -663,9 +649,7 @@ test "if user is authenticated", %{local: local, remote: remote} do
   describe "getting statuses by ids with restricted unauthenticated for remote" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :activities, :remote]) do
+    setup do: clear_config([:restrict_unauthenticated, :activities, :remote], true)
-      Config.put([:restrict_unauthenticated, :activities, :remote], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn, local: local, remote: remote} do
       res_conn = get(conn, "/api/v1/statuses", %{ids: [local.id, remote.id]})
@@ -908,9 +892,7 @@ test "returns 404 error for a wrong id", %{conn: conn} do
       %{activity: activity}
     end
 
-    clear_config([:instance, :max_pinned_statuses]) do
+    setup do: clear_config([:instance, :max_pinned_statuses], 1)
-      Config.put([:instance, :max_pinned_statuses], 1)
-    end
 
     test "pin status", %{conn: conn, user: user, activity: activity} do
       id_str = to_string(activity.id)

test/web/mastodon_api/controllers/timeline_controller_test.exs

@@ -100,13 +100,9 @@ defp local_and_remote_activities do
   describe "public with restrict unauthenticated timeline for local and federated timelines" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :timelines, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :timelines, :local], true)
-      Config.put([:restrict_unauthenticated, :timelines, :local], true)
-    end
 
-    clear_config([:restrict_unauthenticated, :timelines, :federated]) do
+    setup do: clear_config([:restrict_unauthenticated, :timelines, :federated], true)
-      Config.put([:restrict_unauthenticated, :timelines, :federated], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn} do
       res_conn = get(conn, "/api/v1/timelines/public", %{"local" => "true"})
@@ -136,9 +132,7 @@ test "if user is authenticated" do
   describe "public with restrict unauthenticated timeline for local" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :timelines, :local]) do
+    setup do: clear_config([:restrict_unauthenticated, :timelines, :local], true)
-      Config.put([:restrict_unauthenticated, :timelines, :local], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn} do
       res_conn = get(conn, "/api/v1/timelines/public", %{"local" => "true"})
@@ -165,9 +159,7 @@ test "if user is authenticated", %{conn: _conn} do
   describe "public with restrict unauthenticated timeline for remote" do
     setup do: local_and_remote_activities()
 
-    clear_config([:restrict_unauthenticated, :timelines, :federated]) do
+    setup do: clear_config([:restrict_unauthenticated, :timelines, :federated], true)
-      Config.put([:restrict_unauthenticated, :timelines, :federated], true)
-    end
 
     test "if user is unauthenticated", %{conn: conn} do
       res_conn = get(conn, "/api/v1/timelines/public", %{"local" => "true"})

test/web/media_proxy/media_proxy_controller_test.exs

@@ -7,8 +7,8 @@ defmodule Pleroma.Web.MediaProxy.MediaProxyControllerTest do
   import Mock
   alias Pleroma.Config
 
-  clear_config(:media_proxy)
+  setup do: clear_config(:media_proxy)
-  clear_config([Pleroma.Web.Endpoint, :secret_key_base])
+  setup do: clear_config([Pleroma.Web.Endpoint, :secret_key_base])
 
   test "it returns 404 when MediaProxy disabled", %{conn: conn} do
     Config.put([:media_proxy, :enabled], false)

test/web/media_proxy/media_proxy_test.exs

@@ -8,8 +8,8 @@ defmodule Pleroma.Web.MediaProxyTest do
   import Pleroma.Web.MediaProxy
   alias Pleroma.Web.MediaProxy.MediaProxyController
 
-  clear_config([:media_proxy, :enabled])
+  setup do: clear_config([:media_proxy, :enabled])
-  clear_config(Pleroma.Upload)
+  setup do: clear_config(Pleroma.Upload)
 
   describe "when enabled" do
     setup do

test/web/metadata/opengraph_test.exs

@@ -7,7 +7,7 @@ defmodule Pleroma.Web.Metadata.Providers.OpenGraphTest do
   import Pleroma.Factory
   alias Pleroma.Web.Metadata.Providers.OpenGraph
 
-  clear_config([Pleroma.Web.Metadata, :unfurl_nsfw])
+  setup do: clear_config([Pleroma.Web.Metadata, :unfurl_nsfw])
 
   test "it renders all supported types of attachments and skips unknown types" do
     user = insert(:user)

test/web/metadata/twitter_card_test.exs

@@ -13,7 +13,7 @@ defmodule Pleroma.Web.Metadata.Providers.TwitterCardTest do
   alias Pleroma.Web.Metadata.Utils
   alias Pleroma.Web.Router
 
-  clear_config([Pleroma.Web.Metadata, :unfurl_nsfw])
+  setup do: clear_config([Pleroma.Web.Metadata, :unfurl_nsfw])
 
   test "it renders twitter card for user info" do
     user = insert(:user, name: "Jimmy Hendriks", bio: "born 19 March 1994")

test/web/node_info_test.exs

@@ -7,8 +7,8 @@ defmodule Pleroma.Web.NodeInfoTest do
 
   import Pleroma.Factory
 
-  clear_config([:mrf_simple])
+  setup do: clear_config([:mrf_simple])
-  clear_config(:instance)
+  setup do: clear_config(:instance)
 
   test "GET /.well-known/nodeinfo", %{conn: conn} do
     links =
@@ -105,7 +105,7 @@ test "it returns the safe_dm_mentions feature if enabled", %{conn: conn} do
   end
 
   describe "`metadata/federation/enabled`" do
-    clear_config([:instance, :federating])
+    setup do: clear_config([:instance, :federating])
 
     test "it shows if federation is enabled/disabled", %{conn: conn} do
       Pleroma.Config.put([:instance, :federating], true)

test/web/oauth/ldap_authorization_test.exs

@@ -12,13 +12,9 @@ defmodule Pleroma.Web.OAuth.LDAPAuthorizationTest do
 
   @skip if !Code.ensure_loaded?(:eldap), do: :skip
 
-  clear_config_all([:ldap, :enabled]) do
+  setup_all do: clear_config([:ldap, :enabled], true)
-    Pleroma.Config.put([:ldap, :enabled], true)
-  end
 
-  clear_config_all(Pleroma.Web.Auth.Authenticator) do
+  setup_all do: clear_config(Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.LDAPAuthenticator)
-    Pleroma.Config.put(Pleroma.Web.Auth.Authenticator, Pleroma.Web.Auth.LDAPAuthenticator)
-  end
 
   @tag @skip
   test "authorizes the existing user using LDAP credentials" do

test/web/oauth/oauth_controller_test.exs

@@ -17,8 +17,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
     key: "_test",
     signing_salt: "cooldude"
   ]
-
+  setup do: clear_config([:instance, :account_activation_required])
-  clear_config([:instance, :account_activation_required])
 
   describe "in OAuth consumer mode, " do
     setup do
@@ -31,12 +30,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
       ]
     end
 
-    clear_config([:auth, :oauth_consumer_strategies]) do
+    setup do: clear_config([:auth, :oauth_consumer_strategies], ~w(twitter facebook))
-      Pleroma.Config.put(
-        [:auth, :oauth_consumer_strategies],
-        ~w(twitter facebook)
-      )
-    end
 
     test "GET /oauth/authorize renders auth forms, including OAuth consumer form", %{
       app: app,
@@ -944,7 +938,7 @@ test "rejects an invalid authorization code" do
   end
 
   describe "POST /oauth/token - refresh token" do
-    clear_config([:oauth2, :issue_new_refresh_token])
+    setup do: clear_config([:oauth2, :issue_new_refresh_token])
 
     test "issues a new access token with keep fresh token" do
       Pleroma.Config.put([:oauth2, :issue_new_refresh_token], true)

test/web/ostatus/ostatus_controller_test.exs

@@ -17,9 +17,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
     :ok
   end
 
-  clear_config([:instance, :federating]) do
+  setup do: clear_config([:instance, :federating], true)
-    Config.put([:instance, :federating], true)
-  end
 
   # Note: see ActivityPubControllerTest for JSON format tests
   describe "GET /objects/:uuid (text/html)" do

test/web/pleroma_api/controllers/account_controller_test.exs

@@ -27,9 +27,7 @@ defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
       [user: user]
     end
 
-    clear_config([:instance, :account_activation_required]) do
+    setup do: clear_config([:instance, :account_activation_required], true)
-      Config.put([:instance, :account_activation_required], true)
-    end
 
     test "resend account confirmation email", %{conn: conn, user: user} do
       conn

test/web/pleroma_api/controllers/emoji_api_controller_test.exs

@@ -12,10 +12,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
                     Pleroma.Config.get!([:instance, :static_dir]),
                     "emoji"
                   )
-
+  setup do: clear_config([:auth, :enforce_oauth_admin_scope_usage], false)
-  clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
-    Pleroma.Config.put([:auth, :enforce_oauth_admin_scope_usage], false)
-  end
 
   test "shared & non-shared pack information in list_packs is ok" do
     conn = build_conn()

test/web/plugs/federating_plug_test.exs

@@ -5,7 +5,7 @@
 defmodule Pleroma.Web.FederatingPlugTest do
   use Pleroma.Web.ConnCase
 
-  clear_config([:instance, :federating])
+  setup do: clear_config([:instance, :federating])
 
   test "returns and halt the conn when federating is disabled" do
     Pleroma.Config.put([:instance, :federating], false)

test/web/rich_media/helpers_test.exs

@@ -19,7 +19,7 @@ defmodule Pleroma.Web.RichMedia.HelpersTest do
     :ok
   end
 
-  clear_config([:rich_media, :enabled])
+  setup do: clear_config([:rich_media, :enabled])
 
   test "refuses to crawl incomplete URLs" do
     user = insert(:user)

test/web/static_fe/static_fe_controller_test.exs

@@ -8,13 +8,8 @@ defmodule Pleroma.Web.StaticFE.StaticFEControllerTest do
 
   import Pleroma.Factory
 
-  clear_config_all([:static_fe, :enabled]) do
+  setup_all do: clear_config([:static_fe, :enabled], true)
-    Config.put([:static_fe, :enabled], true)
+  setup do: clear_config([:instance, :federating], true)
-  end
-
-  clear_config([:instance, :federating]) do
-    Config.put([:instance, :federating], true)
-  end
 
   setup %{conn: conn} do
     conn = put_req_header(conn, "accept", "text/html")

test/web/streamer/streamer_test.exs

@@ -19,8 +19,7 @@ defmodule Pleroma.Web.StreamerTest do
 
   @streamer_timeout 150
   @streamer_start_wait 10
-
+  setup do: clear_config([:instance, :skip_thread_containment])
-  clear_config([:instance, :skip_thread_containment])
 
   describe "user streams" do
     setup do

test/web/twitter_api/remote_follow_controller_test.exs

@@ -17,13 +17,10 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
     :ok
   end
 
-  clear_config_all([:instance, :federating]) do
+  setup_all do: clear_config([:instance, :federating], true)
-    Config.put([:instance, :federating], true)
+  setup do: clear_config([:instance])
-  end
+  setup do: clear_config([:frontend_configurations, :pleroma_fe])
-
+  setup do: clear_config([:user, :deny_follow_blocked])
-  clear_config([:instance])
-  clear_config([:frontend_configurations, :pleroma_fe])
-  clear_config([:user, :deny_follow_blocked])
 
   describe "GET /ostatus_subscribe - remote_follow/2" do
     test "adds status to pleroma instance if the `acct` is a status", %{conn: conn} do

test/web/twitter_api/twitter_api_test.exs

@@ -117,9 +117,7 @@ test "it registers a new user and parses mentions in the bio" do
   end
 
   describe "register with one time token" do
-    clear_config([:instance, :registrations_open]) do
+    setup do: clear_config([:instance, :registrations_open], false)
-      Pleroma.Config.put([:instance, :registrations_open], false)
-    end
 
     test "returns user on success" do
       {:ok, invite} = UserInviteToken.create_invite()
@@ -184,9 +182,7 @@ test "returns error on expired token" do
   end
 
   describe "registers with date limited token" do
-    clear_config([:instance, :registrations_open]) do
+    setup do: clear_config([:instance, :registrations_open], false)
-      Pleroma.Config.put([:instance, :registrations_open], false)
-    end
 
     setup do
       data = %{
@@ -246,9 +242,7 @@ test "returns an error on overdue date", %{data: data} do
   end
 
   describe "registers with reusable token" do
-    clear_config([:instance, :registrations_open]) do
+    setup do: clear_config([:instance, :registrations_open], false)
-      Pleroma.Config.put([:instance, :registrations_open], false)
-    end
 
     test "returns user on success, after him registration fails" do
       {:ok, invite} = UserInviteToken.create_invite(%{max_use: 100})
@@ -292,9 +286,7 @@ test "returns user on success, after him registration fails" do
   end
 
   describe "registers with reusable date limited token" do
-    clear_config([:instance, :registrations_open]) do
+    setup do: clear_config([:instance, :registrations_open], false)
-      Pleroma.Config.put([:instance, :registrations_open], false)
-    end
 
     test "returns user on success" do
       {:ok, invite} = UserInviteToken.create_invite(%{expires_at: Date.utc_today(), max_use: 100})

test/web/twitter_api/util_controller_test.exs

@@ -18,8 +18,8 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
     :ok
   end
 
-  clear_config([:instance])
+  setup do: clear_config([:instance])
-  clear_config([:frontend_configurations, :pleroma_fe])
+  setup do: clear_config([:frontend_configurations, :pleroma_fe])
 
   describe "POST /api/pleroma/follow_import" do
     setup do: oauth_access(["follow"])
@@ -318,7 +318,7 @@ test "returns json with custom emoji with tags", %{conn: conn} do
   end
 
   describe "GET /api/pleroma/healthcheck" do
-    clear_config([:instance, :healthcheck])
+    setup do: clear_config([:instance, :healthcheck])
 
     test "returns 503 when healthcheck disabled", %{conn: conn} do
       Config.put([:instance, :healthcheck], false)
@@ -427,9 +427,7 @@ test "it returns version in json format", %{conn: conn} do
   end
 
   describe "POST /main/ostatus - remote_subscribe/2" do
-    clear_config([:instance, :federating]) do
+    setup do: clear_config([:instance, :federating], true)
-      Config.put([:instance, :federating], true)
-    end
 
     test "renders subscribe form", %{conn: conn} do
       user = insert(:user)

test/web/web_finger/web_finger_controller_test.exs

@@ -14,9 +14,7 @@ defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do
     :ok
   end
 
-  clear_config_all([:instance, :federating]) do
+  setup_all do: clear_config([:instance, :federating], true)
-    Pleroma.Config.put([:instance, :federating], true)
-  end
 
   test "GET host-meta" do
     response =

test/workers/cron/clear_oauth_token_worker_test.exs

@@ -8,7 +8,7 @@ defmodule Pleroma.Workers.Cron.ClearOauthTokenWorkerTest do
   import Pleroma.Factory
   alias Pleroma.Workers.Cron.ClearOauthTokenWorker
 
-  clear_config([:oauth2, :clean_expired_tokens])
+  setup do: clear_config([:oauth2, :clean_expired_tokens])
 
   test "deletes expired tokens" do
     insert(:oauth_token,

test/workers/cron/digest_emails_worker_test.exs

@@ -11,7 +11,7 @@ defmodule Pleroma.Workers.Cron.DigestEmailsWorkerTest do
   alias Pleroma.User
   alias Pleroma.Web.CommonAPI
 
-  clear_config([:email_notifications, :digest])
+  setup do: clear_config([:email_notifications, :digest])
 
   setup do
     Pleroma.Config.put([:email_notifications, :digest], %{

test/workers/cron/purge_expired_activities_worker_test.exs

@@ -11,7 +11,7 @@ defmodule Pleroma.Workers.Cron.PurgeExpiredActivitiesWorkerTest do
   import Pleroma.Factory
   import ExUnit.CaptureLog
 
-  clear_config([ActivityExpiration, :enabled])
+  setup do: clear_config([ActivityExpiration, :enabled])
 
   test "deletes an expiration activity" do
     Pleroma.Config.put([ActivityExpiration, :enabled], true)

test/workers/scheduled_activity_worker_test.exs

@@ -11,7 +11,7 @@ defmodule Pleroma.Workers.ScheduledActivityWorkerTest do
   import Pleroma.Factory
   import ExUnit.CaptureLog
 
-  clear_config([ScheduledActivity, :enabled])
+  setup do: clear_config([ScheduledActivity, :enabled])
 
   test "creates a status from the scheduled activity" do
     Pleroma.Config.put([ScheduledActivity, :enabled], true)