Merge pull request 'fix: Give error message to users when address has already been...

[akkoma] / test / pleroma / config / deprecation_warnings_test.exs

diff --git a/test/pleroma/config/deprecation_warnings_test.exs b/test/pleroma/config/deprecation_warnings_test.exs
index 84459de8f9e47fe53da778e4a66d0a8b8037bbb5..b18267a7f436be42d9fb01cfb946903f5d793bfb 100644 (file)
--- 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"}]}
       ]
 
         {: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
 
       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", ""}]
 
 
       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
 
       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", ""}]
 
 
       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
 
       assert Config.get([:mrf, :transparency_exclusions]) == expected_config
     end


@@ -280,57 +280,13 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
              "Your config is using the old setting for controlling the URL of media uploaded to your S3 bucket."
   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)
+  test "check_http_adapter/0" do
+    Application.put_env(:tesla, :adapter, Gun)

 
     assert capture_log(fn ->
 
     assert capture_log(fn ->

-             DeprecationWarnings.check_old_chat_shoutbox()
-           end) =~
-             "Your config is using the old namespace for the Shoutbox configuration."
+             DeprecationWarnings.check_http_adapter()
+           end) =~ "Your config is using a custom tesla adapter"
+
+    Application.put_env(:tesla, :adapter, Tesla.Mock)

   end
 end
   end
 end