diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-29 16:09:49 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-29 16:09:49 +0400 |
| commit | 4a306720e8be8633e192f7b2c98f129a315939b9 (patch) | |
| tree | ed5ec059c532777a28eade72f384c8a800ead496 /test/web/federator_test.exs | |
| parent | d15aa9d9503e59b3cd0731394855781f435ec63c (diff) | |
| parent | 651f269568cb7e54cd96d8a0d8ea3533f77e9a3a (diff) | |
| download | pleroma-4a306720e8be8633e192f7b2c98f129a315939b9.tar.gz pleroma-4a306720e8be8633e192f7b2c98f129a315939b9.zip | |
Merge branch 'develop' into remove-twitter-api
Diffstat (limited to 'test/web/federator_test.exs')
| -rw-r--r-- | test/web/federator_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/federator_test.exs b/test/web/federator_test.exs index de90aa6e0..592fdccd1 100644 --- a/test/web/federator_test.exs +++ b/test/web/federator_test.exs @@ -23,7 +23,7 @@ defmodule Pleroma.Web.FederatorTest do setup_all do: clear_config([:instance, :federating], true) setup do: clear_config([:instance, :allow_relay]) - setup do: clear_config([:instance, :rewrite_policy]) + setup do: clear_config([:mrf, :policies]) setup do: clear_config([:mrf_keyword]) describe "Publish an activity" do @@ -158,7 +158,7 @@ defmodule Pleroma.Web.FederatorTest do Pleroma.Config.put([:mrf_keyword, :reject], ["lain"]) Pleroma.Config.put( - [:instance, :rewrite_policy], + [:mrf, :policies], Pleroma.Web.ActivityPub.MRF.KeywordPolicy ) |