X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=test%2Fconfig%2Ftransfer_task_test.exs;h=0265a61560d9d24df391e1d64b3e4e880ab6934c;hb=d607b4d84002ff14f51713f1ac74a4971e2dffac;hp=0d328f0c32b66f994303001bcce9667c20fdfece;hpb=e93cc561cd42ff4ca7f3c95cdbf8dfa7fb9f4a74;p=akkoma
diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs
index 0d328f0c3..0265a6156 100644
--- a/test/config/transfer_task_test.exs
+++ b/test/config/transfer_task_test.exs
@@ -1,5 +1,5 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Config.TransferTaskTest do
@@ -10,9 +10,7 @@ defmodule Pleroma.Config.TransferTaskTest do
alias Pleroma.Config.TransferTask
alias Pleroma.ConfigDB
- clear_config(:configurable_from_database) do
- Pleroma.Config.put(:configurable_from_database, true)
- end
+ setup do: clear_config(:configurable_from_database, true)
test "transfer config values from db to env" do
refute Application.get_env(:pleroma, :test_key)
@@ -70,7 +68,7 @@ defmodule Pleroma.Config.TransferTaskTest do
assert Application.get_env(:quack, :level) == :info
assert Application.get_env(:quack, :meta) == [:none]
- default = Pleroma.Config.Holder.config(:quack, :webhook_url)
+ default = Pleroma.Config.Holder.default_config(:quack, :webhook_url)
assert Application.get_env(:quack, :webhook_url) == default
on_exit(fn ->
@@ -109,6 +107,10 @@ defmodule Pleroma.Config.TransferTaskTest do
end
describe "pleroma restart" do
+ setup do
+ on_exit(fn -> Restarter.Pleroma.refresh() end)
+ end
+
test "don't restart if no reboot time settings were changed" do
emoji = Application.get_env(:pleroma, :emoji)
on_exit(fn -> Application.put_env(:pleroma, :emoji, emoji) end)
@@ -119,10 +121,13 @@ defmodule Pleroma.Config.TransferTaskTest do
value: [groups: [a: 1, b: 2]]
})
- assert capture_log(fn -> TransferTask.start_link([]) end) =~ ""
+ refute String.contains?(
+ capture_log(fn -> TransferTask.start_link([]) end),
+ "pleroma restarted"
+ )
end
- test "restart pleroma on reboot time key" do
+ test "on reboot time key" do
chat = Application.get_env(:pleroma, :chat)
on_exit(fn -> Application.put_env(:pleroma, :chat, chat) end)
@@ -135,7 +140,7 @@ defmodule Pleroma.Config.TransferTaskTest do
assert capture_log(fn -> TransferTask.start_link([]) end) =~ "pleroma restarted"
end
- test "restart pleroma on reboot time subkey" do
+ test "on reboot time subkey" do
captcha = Application.get_env(:pleroma, Pleroma.Captcha)
on_exit(fn -> Application.put_env(:pleroma, Pleroma.Captcha, captcha) end)
@@ -169,7 +174,10 @@ defmodule Pleroma.Config.TransferTaskTest do
value: [seconds_valid: 60]
})
- assert capture_log(fn -> TransferTask.load_and_update_env([], false) end) =~ ""
+ refute String.contains?(
+ capture_log(fn -> TransferTask.load_and_update_env([], false) end),
+ "pleroma restarted"
+ )
end
end
end