diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-03 10:36:41 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-03 10:36:41 -0500 |
| commit | 4695bdd81bf9d2caed4337473d35ba021527e8a8 (patch) | |
| tree | 0bc60c1bbc03d994701a282f47d32e856b54cff0 /test/web/federator_test.exs | |
| parent | cc837f9d157f9d43a015a8908f5e2ee178442041 (diff) | |
| parent | c2a052a346d5104c3657343a885255d4d7179c75 (diff) | |
| download | pleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.tar.gz pleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.zip | |
Merge branch 'develop' into issue/1790-updated-oban
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 ) |