diff options
| author | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 |
|---|---|---|
| committer | Alexander Strizhakov <alex.strizhakov@gmail.com> | 2020-03-20 20:47:54 +0300 |
| commit | 9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch) | |
| tree | e6755e3d585d753ad7da171a858508d4a1603a49 /test/tasks | |
| parent | 51ce0813d351cad900966aea49a6f6d17d33f964 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip | |
Merge branch 'develop' into gun
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/" |