summaryrefslogtreecommitdiff
path: root/test/config/holder_test.exs
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-03-11 15:16:18 +0000
committerrinpatch <rinpatch@sdf.org>2020-03-11 15:16:18 +0000
commit7cdabdc0dff3bae1c7209f50c609ebf154d25ea7 (patch)
tree5ef577ef2fcedfd58bd188cc35955dea9fd83513 /test/config/holder_test.exs
parentf92c447bbc38db417beb2ac505c17649c6de01d2 (diff)
parentfce090c1de543f0bcebf47cfc2a32f99f8ef401f (diff)
downloadpleroma-7cdabdc0dff3bae1c7209f50c609ebf154d25ea7.tar.gz
pleroma-7cdabdc0dff3bae1c7209f50c609ebf154d25ea7.zip
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
Merging default release config on app start Closes #1610 See merge request pleroma/pleroma!2288
Diffstat (limited to 'test/config/holder_test.exs')
-rw-r--r--test/config/holder_test.exs16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/config/holder_test.exs b/test/config/holder_test.exs
index 2368d4856..15d48b5c7 100644
--- a/test/config/holder_test.exs
+++ b/test/config/holder_test.exs
@@ -7,8 +7,8 @@ defmodule Pleroma.Config.HolderTest do
alias Pleroma.Config.Holder
- test "config/0" do
- config = Holder.config()
+ test "default_config/0" do
+ config = Holder.default_config()
assert config[:pleroma][Pleroma.Uploaders.Local][:uploads] == "test/uploads"
assert config[:tesla][:adapter] == Tesla.Mock
@@ -20,15 +20,15 @@ defmodule Pleroma.Config.HolderTest do
refute config[:phoenix][:serve_endpoints]
end
- test "config/1" do
- pleroma_config = Holder.config(:pleroma)
+ test "default_config/1" do
+ pleroma_config = Holder.default_config(:pleroma)
assert pleroma_config[Pleroma.Uploaders.Local][:uploads] == "test/uploads"
- tesla_config = Holder.config(:tesla)
+ tesla_config = Holder.default_config(:tesla)
assert tesla_config[:adapter] == Tesla.Mock
end
- test "config/2" do
- assert Holder.config(:pleroma, Pleroma.Uploaders.Local) == [uploads: "test/uploads"]
- assert Holder.config(:tesla, :adapter) == Tesla.Mock
+ 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