diff options
author | lain <lain@soykaf.club> | 2020-07-06 12:15:59 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-07-06 12:15:59 +0200 |
commit | 1963e143c5feace9eb9a3be29b0eeba2ad88751a (patch) | |
tree | 9a7ae160dd452db000e33af62f61057667c5953f /test/config | |
parent | 67d92ac7b7b977debac8f8e580db1f0e1ef3ed52 (diff) | |
parent | 69f0b286f7b3e0518ac7ae54dfb06539dc179698 (diff) | |
download | pleroma-1963e143c5feace9eb9a3be29b0eeba2ad88751a.tar.gz pleroma-1963e143c5feace9eb9a3be29b0eeba2ad88751a.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove-twitter-api
Diffstat (limited to 'test/config')
-rw-r--r-- | test/config/holder_test.exs | 5 |
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 |