AkkomaGang/akkoma
AkkomaGang/akkoma
13
63
Fork 84
Code Issues 162 Pull requests 13 Packages Projects 2 Releases 14 Wiki Activity

ensure .exs config is used before default #197

Merged
floatingghost merged 4 commits from config-priority into develop 2022-09-02 22:05:40 +00:00
Conversation 0 Commits 4 Files changed 2 +10 -2
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit c8e6422549 - Show all commits

12
test/pleroma/config/transfer_task_test.exs
View file

@ -43,21 +43,28 @@ defmodule Pleroma.Config.TransferTaskTest do
Application.delete_env(:quack, :test_key) Application.delete_env(:quack, :test_key)
Application.delete_env(:postgrex, :test_key) Application.delete_env(:postgrex, :test_key)
Application.put_env(:logger, :level, initial) Application.put_env(:logger, :level, initial)
Application.delete_env(:pleroma, :instance)
System.delete_env("RELEASE_NAME") System.delete_env("RELEASE_NAME")
end) end)
end end
test "transfer task falls back to env before default" do test "transfer task falls back to env before default" do
instance = Application.get_env(:pleroma, :instance)
insert(:config, key: :instance, value: [name: "wow"]) insert(:config, key: :instance, value: [name: "wow"])
clear_config([:instance, :static_dir], "static_dir_from_env") clear_config([:instance, :static_dir], "static_dir_from_env")
TransferTask.start_link([]) TransferTask.start_link([])
assert Application.get_env(:pleroma, :instance)[:name] == "wow" assert Application.get_env(:pleroma, :instance)[:name] == "wow"
assert Application.get_env(:pleroma, :instance)[:static_dir] == "static_dir_from_env" assert Application.get_env(:pleroma, :instance)[:static_dir] == "static_dir_from_env"
on_exit(fn ->
Application.put_env(:pleroma, :instance, instance)
end)
end end
test "transfer task falls back to release defaults if no other values found" do test "transfer task falls back to release defaults if no other values found" do
instance = Application.get_env(:pleroma, :instance)
System.put_env("RELEASE_NAME", "akkoma") System.put_env("RELEASE_NAME", "akkoma")
Pleroma.Config.Holder.save_default() Pleroma.Config.Holder.save_default()
insert(:config, key: :instance, value: [name: "wow"]) insert(:config, key: :instance, value: [name: "wow"])
@ -69,8 +76,9 @@ defmodule Pleroma.Config.TransferTaskTest do
assert Application.get_env(:pleroma, :instance)[:static_dir] == "/var/lib/akkoma/static" assert Application.get_env(:pleroma, :instance)[:static_dir] == "/var/lib/akkoma/static"
on_exit(fn -> on_exit(fn ->
Application.delete_env(:pleroma, :instance)
System.delete_env("RELEASE_NAME") System.delete_env("RELEASE_NAME")
Pleroma.Config.Holder.save_default()
Application.put_env(:pleroma, :instance, instance)
end) end)
end end