aboutsummaryrefslogtreecommitdiff
path: root/test/config
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-02-18 09:06:27 -0600
committerMark Felder <feld@FreeBSD.org>2020-02-18 09:06:27 -0600
commitcf943492878c901cf2f0056ee2a8814e0322e9d8 (patch)
tree3ae91feb1a78eba87b627e216c035956bdba8853 /test/config
parent514c899275a32e6ef63305f9424c50344d41b12e (diff)
parentcf8307e71c3f68bc26a540783a3ca26766b3b56c (diff)
downloadpleroma-cf943492878c901cf2f0056ee2a8814e0322e9d8.tar.gz
Merge branch 'develop' into gun
Diffstat (limited to 'test/config')
-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)