X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fpleroma%2Fconfig%2Fdeprecation_warnings_test.exs;h=053e2820741f27401244a9a4dbc5d5ce51990f5e;hb=0f132b802dde7f217ecb07767e0d34e3edb517b7;hp=1037c4d35f3370cb903eb7791faaf800acd9a00e;hpb=3c5a497b19237c5e4f0f5d7aeb3fa1e43f13d932;p=akkoma

diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 1037c4d35..053e28207 100644
--- a/test/pleroma/config/deprecation_warnings_test.exs
+++ b/test/pleroma/config/deprecation_warnings_test.exs
@@ -73,7 +73,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
         {:media_removal, [{"some.removal", ""}, {"some.other.instance", "Some reason"}]}
       ]
 
-      capture_log(fn -> DeprecationWarnings.check_simple_policy_tuples() end)
+      capture_log(fn -> DeprecationWarnings.warn() end)
 
       assert Config.get([:mrf_simple]) == expected_config
     end
@@ -122,7 +122,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
 
       expected_config = [{"domain.com", "some reason"}, {"some.tld", ""}]
 
-      capture_log(fn -> DeprecationWarnings.check_quarantined_instances_tuples() end)
+      capture_log(fn -> DeprecationWarnings.warn() end)
 
       assert Config.get([:instance, :quarantined_instances]) == expected_config
     end
@@ -172,7 +172,7 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
 
       expected_config = [{"domain.com", "some reason"}, {"some.tld", ""}]
 
-      capture_log(fn -> DeprecationWarnings.check_transparency_exclusions_tuples() end)
+      capture_log(fn -> DeprecationWarnings.warn() end)
 
       assert Config.get([:mrf, :transparency_exclusions]) == expected_config
     end
@@ -183,7 +183,8 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
         {"some.tld", ""}
       ])
 
-      assert capture_log(fn -> DeprecationWarnings.check_transparency_exclusions_tuples() end) == ""
+      assert capture_log(fn -> DeprecationWarnings.check_transparency_exclusions_tuples() end) ==
+               ""
     end
   end
 
@@ -278,58 +279,4 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
            end) =~
              "Your config is using the old setting for controlling the URL of media uploaded to your S3 bucket."
   end
-
-  describe "check_gun_pool_options/0" do
-    test "await_up_timeout" do
-      config = Config.get(:connections_pool)
-      clear_config(:connections_pool, Keyword.put(config, :await_up_timeout, 5_000))
-
-      assert capture_log(fn ->
-               DeprecationWarnings.check_gun_pool_options()
-             end) =~
-               "Your config is using old setting `config :pleroma, :connections_pool, await_up_timeout`."
-    end
-
-    test "pool timeout" do
-      old_config = [
-        federation: [
-          size: 50,
-          max_waiting: 10,
-          timeout: 10_000
-        ],
-        media: [
-          size: 50,
-          max_waiting: 10,
-          timeout: 10_000
-        ],
-        upload: [
-          size: 25,
-          max_waiting: 5,
-          timeout: 15_000
-        ],
-        default: [
-          size: 10,
-          max_waiting: 2,
-          timeout: 5_000
-        ]
-      ]
-
-      clear_config(:pools, old_config)
-
-      assert capture_log(fn ->
-               DeprecationWarnings.check_gun_pool_options()
-             end) =~
-               "Your config is using old setting name `timeout` instead of `recv_timeout` in pool settings"
-    end
-  end
-
-  test "check_old_chat_shoutbox/0" do
-    clear_config([:instance, :chat_limit], 1_000)
-    clear_config([:chat, :enabled], true)
-
-    assert capture_log(fn ->
-             DeprecationWarnings.check_old_chat_shoutbox()
-           end) =~
-             "Your config is using the old namespace for the Shoutbox configuration."
-  end
 end