Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
Fix Pleroma.Config.get!/1 raising an error when value is false See merge request pleroma/pleroma!1148
This commit is contained in:
commit
dfd031c26a
|
@ -12,8 +12,12 @@ def get(key), do: get(key, nil)
|
||||||
def get([key], default), do: get(key, default)
|
def get([key], default), do: get(key, default)
|
||||||
|
|
||||||
def get([parent_key | keys], default) do
|
def get([parent_key | keys], default) do
|
||||||
Application.get_env(:pleroma, parent_key)
|
case :pleroma
|
||||||
|> get_in(keys) || default
|
|> Application.get_env(parent_key)
|
||||||
|
|> get_in(keys) do
|
||||||
|
nil -> default
|
||||||
|
any -> any
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def get(key, default) do
|
def get(key, default) do
|
||||||
|
|
|
@ -28,6 +28,15 @@ test "get/1 with a list of keys" do
|
||||||
assert Pleroma.Config.get([:azerty, :uiop], true) == true
|
assert Pleroma.Config.get([:azerty, :uiop], true) == true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "get/1 when value is false" do
|
||||||
|
Pleroma.Config.put([:instance, :false_test], false)
|
||||||
|
Pleroma.Config.put([:instance, :nested], [])
|
||||||
|
Pleroma.Config.put([:instance, :nested, :false_test], false)
|
||||||
|
|
||||||
|
assert Pleroma.Config.get([:instance, :false_test]) == false
|
||||||
|
assert Pleroma.Config.get([:instance, :nested, :false_test]) == false
|
||||||
|
end
|
||||||
|
|
||||||
test "get!/1" do
|
test "get!/1" do
|
||||||
assert Pleroma.Config.get!(:instance) == Application.get_env(:pleroma, :instance)
|
assert Pleroma.Config.get!(:instance) == Application.get_env(:pleroma, :instance)
|
||||||
|
|
||||||
|
@ -43,6 +52,15 @@ test "get!/1" do
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "get!/1 when value is false" do
|
||||||
|
Pleroma.Config.put([:instance, :false_test], false)
|
||||||
|
Pleroma.Config.put([:instance, :nested], [])
|
||||||
|
Pleroma.Config.put([:instance, :nested, :false_test], false)
|
||||||
|
|
||||||
|
assert Pleroma.Config.get!([:instance, :false_test]) == false
|
||||||
|
assert Pleroma.Config.get!([:instance, :nested, :false_test]) == false
|
||||||
|
end
|
||||||
|
|
||||||
test "put/2 with a key" do
|
test "put/2 with a key" do
|
||||||
Pleroma.Config.put(:config_test, true)
|
Pleroma.Config.put(:config_test, true)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue