diff options
| author | feld <feld@feld.me> | 2021-02-03 14:23:23 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-02-03 14:23:23 +0000 |
| commit | 008499f65a33f5d42a98cc3719f6ab5e8def40d6 (patch) | |
| tree | 1bcf258f38105267d4f655d8aed68d1ab502523f /test/mix | |
| parent | 39335d42513e47289fc825d04680531b84862686 (diff) | |
| parent | c3dd860a027ef1339285b5b62dc62e0b48bc6855 (diff) | |
| download | pleroma-008499f65a33f5d42a98cc3719f6ab5e8def40d6.tar.gz pleroma-008499f65a33f5d42a98cc3719f6ab5e8def40d6.zip | |
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'test/mix')
| -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) |