summaryrefslogtreecommitdiff
path: root/test/config
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2020-03-24 20:32:49 +0100
commit212c31c63796a21233e8decf7ce46853383286fd (patch)
tree0cc01fbf91ddb5037d67b39f0af80737aeec51ad /test/config
parent64165d1df95bc3a22260dafa4584471427685864 (diff)
parent8eebc75c152ee339bac347350266e3bc6536016b (diff)
downloadpleroma-212c31c63796a21233e8decf7ce46853383286fd.tar.gz
pleroma-212c31c63796a21233e8decf7ce46853383286fd.zip
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
Diffstat (limited to 'test/config')
-rw-r--r--test/config/transfer_task_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/config/transfer_task_test.exs b/test/config/transfer_task_test.exs
index 01d04761d..0265a6156 100644
--- a/test/config/transfer_task_test.exs
+++ b/test/config/transfer_task_test.exs
@@ -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)