projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'web-push-fix' into 'develop'
[akkoma]
/
test
/
web
/
federator_test.exs
diff --git
a/test/web/federator_test.exs
b/test/web/federator_test.exs
index de90aa6e055af94b277cb8eded78a590c3104e47..592fdccd19168a86f3c42ff95f448a5c13df977a 100644
(file)
--- 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_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
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(
Pleroma.Config.put([:mrf_keyword, :reject], ["lain"])
Pleroma.Config.put(
- [:
instance, :rewrite_policy
],
+ [:
mrf, :policies
],
Pleroma.Web.ActivityPub.MRF.KeywordPolicy
)
Pleroma.Web.ActivityPub.MRF.KeywordPolicy
)