don't save tesla settings into db

diff --git a/lib/pleroma/config/loader.ex b/lib/pleroma/config/loader.ex
index 0f3ecf1ede46fc07d0cbc589411439d942763187..64e7de6df1a77189323bd1bfac321ffe2bd912bc 100644 (file)
--- a/lib/pleroma/config/loader.ex
+++ b/lib/pleroma/config/loader.ex
@@ -12,6 +12,11 @@ defmodule Pleroma.Config.Loader do
     :swarm
   ]
 
+  @reject_groups [
+    :postgrex,
+    :tesla
+  ]
+
   if Code.ensure_loaded?(Config.Reader) do
     @reader Config.Reader
 
@@ -47,7 +52,8 @@ defmodule Pleroma.Config.Loader do
   @spec filter_group(atom(), keyword()) :: keyword()
   def filter_group(group, configs) do
     Enum.reject(configs[group], fn {key, _v} ->
-      key in @reject_keys or (group == :phoenix and key == :serve_endpoints) or group == :postgrex
+      key in @reject_keys or group in @reject_groups or
+        (group == :phoenix and key == :serve_endpoints)
     end)
   end
 end

diff --git a/test/config/holder_test.exs b/test/config/holder_test.exs
index 15d48b5c7d5fa76c9d5b68993e3629e47d654725..abcaa27dd7e11ac1dcc7a76fe3ada3515ea8c00a 100644 (file)
--- a/test/config/holder_test.exs
+++ b/test/config/holder_test.exs
@@ -10,7 +10,6 @@ defmodule Pleroma.Config.HolderTest do
   test "default_config/0" do
     config = Holder.default_config()
     assert config[:pleroma][Pleroma.Uploaders.Local][:uploads] == "test/uploads"
-    assert config[:tesla][:adapter] == Tesla.Mock
 
     refute config[:pleroma][Pleroma.Repo]
     refute config[:pleroma][Pleroma.Web.Endpoint]
@@ -18,17 +17,15 @@ defmodule Pleroma.Config.HolderTest do
     refute config[:pleroma][:configurable_from_database]
     refute config[:pleroma][:database]
     refute config[:phoenix][:serve_endpoints]
+    refute config[:tesla][:adapter]
   end
 
   test "default_config/1" do
     pleroma_config = Holder.default_config(:pleroma)
     assert pleroma_config[Pleroma.Uploaders.Local][:uploads] == "test/uploads"
-    tesla_config = Holder.default_config(:tesla)
-    assert tesla_config[:adapter] == Tesla.Mock
   end
 
   test "default_config/2" do
     assert Holder.default_config(:pleroma, Pleroma.Uploaders.Local) == [uploads: "test/uploads"]
-    assert Holder.default_config(:tesla, :adapter) == Tesla.Mock
   end
 end