projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships...
[akkoma]
/
test
/
web
/
activity_pub
/
mrf
/
keyword_policy_test.exs
diff --git
a/test/web/activity_pub/mrf/keyword_policy_test.exs
b/test/web/activity_pub/mrf/keyword_policy_test.exs
index 602892a3702ab14d43ec99a35080e783686d3481..fd1f7aec804ef13ea635ed2ba9923741e1c48335 100644
(file)
--- a/
test/web/activity_pub/mrf/keyword_policy_test.exs
+++ b/
test/web/activity_pub/mrf/keyword_policy_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 201
9
Pleroma Authors <https://pleroma.social/>
+# Copyright © 201
7-2020
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do
@@
-7,6
+7,8
@@
defmodule Pleroma.Web.ActivityPub.MRF.KeywordPolicyTest do
alias Pleroma.Web.ActivityPub.MRF.KeywordPolicy
alias Pleroma.Web.ActivityPub.MRF.KeywordPolicy
+ setup do: clear_config(:mrf_keyword)
+
setup do
Pleroma.Config.put([:mrf_keyword], %{reject: [], federated_timeline_removal: [], replace: []})
end
setup do
Pleroma.Config.put([:mrf_keyword], %{reject: [], federated_timeline_removal: [], replace: []})
end