summaryrefslogtreecommitdiff
path: root/test/config/transfer_task_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-02-18 17:46:09 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-02-18 17:46:09 +0300
commit61d9f43e463a3b3b0c1e4b9c98c22e222797bd82 (patch)
treed0db351126377c4a648155df4dfdfd4358874b9c /test/config/transfer_task_test.exs
parent269d592181bff8601f6545b85158ee1c222ff20d (diff)
parent3fa2ac68df10f6ffe3c1ea76fa10c30da90f4bd0 (diff)
downloadpleroma-61d9f43e463a3b3b0c1e4b9c98c22e222797bd82.tar.gz
pleroma-61d9f43e463a3b3b0c1e4b9c98c22e222797bd82.zip
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
Diffstat (limited to 'test/config/transfer_task_test.exs')
-rw-r--r--test/config/transfer_task_test.exs8
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)