Improved in-test config management functions.

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
+  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
+  clear_config_all([:instance, :federating], true)
-    Pleroma.Config.put([:instance, :federating], true)
-  end
 
   test "it goes through old direct conversations" do
     user = insert(:user)

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
+  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/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
+    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
+    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/support/helpers.ex

@@ -26,6 +26,25 @@ defmacro clear_config(config_path, do: yield) do
     end
   end
 
+  defmacro clear_config(config_path, temp_setting) do
+    quote do
+      clear_config(unquote(config_path)) do
+        Config.put(unquote(config_path), unquote(temp_setting))
+      end
+    end
+  end
+
+  @doc """
+  From _within a test case_, sets config to provided value and restores initial value on exit.
+  For multi-case setup use `clear_config/2` instead.
+  """
+  def set_config(config_path, temp_setting) do
+    initial_setting = Config.get(config_path)
+    Config.put(config_path, temp_setting)
+
+    ExUnit.Callbacks.on_exit(fn -> Config.put(config_path, initial_setting) end)
+  end
+
   @doc "Stores initial config value and restores it after *all* test examples are executed."
   defmacro clear_config_all(config_path) do
     quote do
@@ -50,6 +69,14 @@ defmacro clear_config_all(config_path, do: yield) do
     end
   end
 
+  defmacro clear_config_all(config_path, temp_setting) do
+    quote do
+      clear_config_all(unquote(config_path)) do
+        Config.put(unquote(config_path), unquote(temp_setting))
+      end
+    end
+  end
+
   defmacro __using__(_opts) do
     quote do
       import Pleroma.Tests.Helpers,
@@ -57,7 +84,8 @@ defmacro __using__(_opts) do
           clear_config: 1,
           clear_config: 2,
           clear_config_all: 1,
-          clear_config_all: 2
+          clear_config_all: 2,
+          set_config: 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
+  clear_config_all(: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/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
+    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,10 @@ defmodule Pleroma.Uploaders.S3Test do
   import Mock
   import ExUnit.CaptureLog
 
-  clear_config([Pleroma.Uploaders.S3]) do
+  clear_config(Pleroma.Uploaders.S3,
-    Config.put([Pleroma.Uploaders.S3],
     bucket: "test_bucket",
     public_endpoint: "https://s3.amazonaws.com"
   )
-  end
 
   describe "get_file/1" do
     test "it returns path to local folder for files" do

test/user_test.exs

@@ -476,9 +476,7 @@ test "it sets the password_hash and ap_id" do
       email: "email@example.com"
     }
 
-    clear_config([:instance, :account_activation_required]) do
+    clear_config([:instance, :account_activation_required], true)
-      Pleroma.Config.put([:instance, :account_activation_required], true)
-    end
 
     test "it creates unconfirmed user" do
       changeset = User.register_changeset(%User{}, @full_user_data)

test/web/activity_pub/activity_pub_controller_test.exs

@@ -26,9 +26,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
     :ok
   end
 
-  clear_config([:instance, :federating]) do
+  clear_config([:instance, :federating], true)
-    Config.put([:instance, :federating], true)
-  end
 
   describe "/relay" do
     clear_config([:instance, :allow_relay])

test/web/activity_pub/mrf/object_age_policy_test.exs

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

test/web/activity_pub/mrf/simple_policy_test.exs

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

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
+  clear_config_all([: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/transmogrifier_test.exs

@@ -1351,9 +1351,7 @@ test "it accepts Move activities" do
   end
 
   describe "`handle_incoming/2`, Mastodon format `replies` handling" do
-    clear_config([:activitypub, :note_replies_output_limit]) do
+    clear_config([:activitypub, :note_replies_output_limit], 5)
-      Pleroma.Config.put([:activitypub, :note_replies_output_limit], 5)
-    end
 
     clear_config([:instance, :federation_incoming_replies_max_depth])
 
@@ -1394,9 +1392,7 @@ 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
+    clear_config([:activitypub, :note_replies_output_limit], 5)
-      Pleroma.Config.put([:activitypub, :note_replies_output_limit], 5)
-    end
 
     clear_config([:instance, :federation_incoming_replies_max_depth])
 
@@ -2145,9 +2141,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
+    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
+    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
+    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
+    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
+    clear_config([:instance, :registrations_open], false)
-      Config.put([:instance, :registrations_open], false)
+    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"
@@ -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
+    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
+    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
+    clear_config(:configurable_from_database, true)
-      Config.put(:configurable_from_database, true)
-    end
 
     test "pleroma restarts", %{conn: conn} do
       capture_log(fn ->

test/web/federator_test.exs

@@ -21,9 +21,7 @@ defmodule Pleroma.Web.FederatorTest do
     :ok
   end
 
-  clear_config_all([:instance, :federating]) do
+  clear_config_all([:instance, :federating], true)
-    Pleroma.Config.put([:instance, :federating], true)
-  end
 
   clear_config([:instance, :allow_relay])
   clear_config([:instance, :rewrite_policy])

test/web/feed/user_controller_test.exs

@@ -12,9 +12,7 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
   alias Pleroma.Object
   alias Pleroma.User
 
-  clear_config([:instance, :federating]) do
+  clear_config([:instance, :federating], true)
-    Config.put([:instance, :federating], true)
-  end
 
   describe "feed" do
     clear_config([:feed])

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
+  clear_config_all([: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
+  clear_config_all([: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/mastodon_api/controllers/account_controller_test.exs

@@ -756,9 +756,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
+    clear_config([:rate_limit, :app_account_creation], {10_000, 2})
-      Pleroma.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/status_controller_test.exs

@@ -739,9 +739,7 @@ test "returns 404 error for a wrong id", %{conn: conn} do
       %{activity: activity}
     end
 
-    clear_config([:instance, :max_pinned_statuses]) 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/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
+  clear_config_all([:ldap, :enabled], true)
-    Pleroma.Config.put([:ldap, :enabled], true)
-  end
 
-  clear_config_all(Pleroma.Web.Auth.Authenticator) do
+  clear_config_all(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

@@ -31,12 +31,7 @@ defmodule Pleroma.Web.OAuth.OAuthControllerTest do
       ]
     end
 
-    clear_config([:auth, :oauth_consumer_strategies]) 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,

test/web/ostatus/ostatus_controller_test.exs

@@ -17,9 +17,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
     :ok
   end
 
-  clear_config([:instance, :federating]) 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
+    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

@@ -13,9 +13,7 @@ defmodule Pleroma.Web.PleromaAPI.EmojiAPIControllerTest do
                     "emoji"
                   )
 
-  clear_config([:auth, :enforce_oauth_admin_scope_usage]) do
+  clear_config([:auth, :enforce_oauth_admin_scope_usage], false)
-    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/static_fe/static_fe_controller_test.exs

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

test/web/twitter_api/remote_follow_controller_test.exs

@@ -17,9 +17,7 @@ defmodule Pleroma.Web.TwitterAPI.RemoteFollowControllerTest do
     :ok
   end
 
-  clear_config_all([:instance, :federating]) do
+  clear_config_all([:instance, :federating], true)
-    Config.put([:instance, :federating], true)
-  end
 
   clear_config([:instance])
   clear_config([:frontend_configurations, :pleroma_fe])

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
+    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
+    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
+    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
+    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

@@ -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
+    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
+  clear_config_all([:instance, :federating], true)
-    Pleroma.Config.put([:instance, :federating], true)
-  end
 
   test "GET host-meta" do
     response =