summaryrefslogtreecommitdiff
path: root/test/config
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-07-06 11:27:06 +0200
committerlain <lain@soykaf.club>2020-07-06 11:27:06 +0200
commit74b88c0a8bb12c3d534c826d6d1547bc40fff634 (patch)
tree7764900ac5be30ccc40e6d18e5fe9989c880721c /test/config
parentef4c16f6f19c0544ed22972c78195547b4cf3f5d (diff)
parent69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff)
downloadpleroma-74b88c0a8bb12c3d534c826d6d1547bc40fff634.tar.gz
pleroma-74b88c0a8bb12c3d534c826d6d1547bc40fff634.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into chat-federation-information
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