diff options
| author | feld <feld@feld.me> | 2021-02-02 17:57:58 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-02-02 17:57:58 +0000 |
| commit | d289ad8579dacdf1459bbbdaf404bfcd042255ae (patch) | |
| tree | da6bfbe54853ad66dd81763e7b8d3be3b121a2a3 /test/mix/tasks | |
| parent | c369d2b93028e4dc11f1f2c4cd7380ee0392ccac (diff) | |
| parent | 6a2d3fb9a3775fc0e167c71bb8a8fba3608b2f17 (diff) | |
| download | pleroma-d289ad8579dacdf1459bbbdaf404bfcd042255ae.tar.gz pleroma-d289ad8579dacdf1459bbbdaf404bfcd042255ae.zip | |
Merge branch 'develop' into 'fix/2411-mutes-api'
# Conflicts:
# CHANGELOG.md
# docs/development/API/differences_in_mastoapi_responses.md
Diffstat (limited to 'test/mix/tasks')
| -rw-r--r-- | test/mix/tasks/pleroma/robots_txt_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/mix/tasks/pleroma/robots_txt_test.exs b/test/mix/tasks/pleroma/robots_txt_test.exs index 4b369d83c..028aa4ccc 100644 --- a/test/mix/tasks/pleroma/robots_txt_test.exs +++ b/test/mix/tasks/pleroma/robots_txt_test.exs @@ -12,7 +12,7 @@ defmodule Mix.Tasks.Pleroma.RobotsTxtTest do test "creates new dir" do path = "test/fixtures/new_dir/" file_path = path <> "robots.txt" - Pleroma.Config.put([:instance, :static_dir], path) + clear_config([:instance, :static_dir], path) on_exit(fn -> {:ok, ["test/fixtures/new_dir/", "test/fixtures/new_dir/robots.txt"]} = File.rm_rf(path) @@ -29,7 +29,7 @@ defmodule Mix.Tasks.Pleroma.RobotsTxtTest do test "to existance folder" do path = "test/fixtures/" file_path = path <> "robots.txt" - Pleroma.Config.put([:instance, :static_dir], path) + clear_config([:instance, :static_dir], path) on_exit(fn -> :ok = File.rm(file_path) |