summaryrefslogtreecommitdiff
path: root/test/config
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-07-13 13:32:21 -0500
committerMark Felder <feld@FreeBSD.org>2020-07-13 13:32:21 -0500
commit80c21100db306ce45856bbdb97d3439676babeeb (patch)
treed143f523da262df5176220fbe6dc0b6370c91ebc /test/config
parentce85db41a30d95555bbd44d8931c4a3a357938d8 (diff)
parent5d215fd81f529b639db9096ca71d4e7f0a6ed386 (diff)
downloadpleroma-80c21100db306ce45856bbdb97d3439676babeeb.tar.gz
pleroma-80c21100db306ce45856bbdb97d3439676babeeb.zip
Merge branch 'develop' into refactor/notification_settings
Diffstat (limited to 'test/config')
-rw-r--r--test/config/holder_test.exs5
1 files changed, 1 insertions, 4 deletions
diff --git a/test/config/holder_test.exs b/test/config/holder_test.exs
index 15d48b5c7..abcaa27dd 100644
--- 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