diff options
| author | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
| commit | d23e81903dfe5032bb20b92bcc7dfb47434ba669 (patch) | |
| tree | db7724289ac074e0b70b7405d9080e50b8a8175d /test/tasks | |
| parent | 5efa5b0c4a08c2bf73d6926ee7c418e31a04195c (diff) | |
| parent | 1c05f539aaea32fe993e5299e656aa44c322e8de (diff) | |
| download | pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.tar.gz | |
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
Diffstat (limited to 'test/tasks')
| -rw-r--r-- | test/tasks/config_test.exs | 4 | ||||
| -rw-r--r-- | test/tasks/robots_txt_test.exs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/test/tasks/config_test.exs b/test/tasks/config_test.exs index a6c0de351..3dee4f082 100644 --- a/test/tasks/config_test.exs +++ b/test/tasks/config_test.exs @@ -20,9 +20,7 @@ defmodule Mix.Tasks.Pleroma.ConfigTest do :ok end - clear_config_all(:configurable_from_database) do - Pleroma.Config.put(:configurable_from_database, true) - end + setup_all do: clear_config(:configurable_from_database, true) test "error if file with custom settings doesn't exist" do Mix.Tasks.Pleroma.Config.migrate_to_db("config/not_existance_config_file.exs") diff --git a/test/tasks/robots_txt_test.exs b/test/tasks/robots_txt_test.exs index e03c9c192..7040a0e4e 100644 --- a/test/tasks/robots_txt_test.exs +++ b/test/tasks/robots_txt_test.exs @@ -7,7 +7,7 @@ defmodule Mix.Tasks.Pleroma.RobotsTxtTest do use Pleroma.Tests.Helpers alias Mix.Tasks.Pleroma.RobotsTxt - clear_config([:instance, :static_dir]) + setup do: clear_config([:instance, :static_dir]) test "creates new dir" do path = "test/fixtures/new_dir/" |