diff options
author | lain <lain@soykaf.club> | 2020-02-18 14:32:03 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-02-18 14:32:03 +0000 |
commit | c07efd5b42aad48ad6dbbb5a029b096086929b3f (patch) | |
tree | 556be4a8264d4212217917db52899aef35aadb59 /test/config/transfer_task_test.exs | |
parent | fb6c2576dcb5dce6122b699738e2ccdaaa0fc2c6 (diff) | |
parent | dad23e3766fb90c2c9b6bca7b5531273242659ad (diff) | |
download | pleroma-c07efd5b42aad48ad6dbbb5a029b096086929b3f.tar.gz pleroma-c07efd5b42aad48ad6dbbb5a029b096086929b3f.zip |
Merge branch 'need-reboot-flag' into 'develop'
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
Diffstat (limited to 'test/config/transfer_task_test.exs')
-rw-r--r-- | test/config/transfer_task_test.exs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs index ebdc951cf..3d7218dde 100644 --- a/test/config/transfer_task_test.exs +++ b/test/config/transfer_task_test.exs @@ -109,6 +109,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) @@ -125,7 +129,7 @@ defmodule Pleroma.Config.TransferTaskTest do ) 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) @@ -138,7 +142,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) |