diff options
author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
---|---|---|
committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
commit | dc63aaf84f07a6f8042f43617d8ec356fed85cec (patch) | |
tree | 5d12a05bce5dc1a23736fd37e7ca8c64580acd34 /test/pleroma/web/activity_pub/mrf_test.exs | |
parent | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (diff) | |
parent | 0910777d41f8b4b3096c35c5fc97fc357e5d8c8c (diff) | |
download | pleroma-2.4.0.tar.gz |
Merge branch 'release/2.4.0' into 'stable'v2.4.0
Release/2.4.0
See merge request pleroma/pleroma!3493
Diffstat (limited to 'test/pleroma/web/activity_pub/mrf_test.exs')
-rw-r--r-- | test/pleroma/web/activity_pub/mrf_test.exs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/test/pleroma/web/activity_pub/mrf_test.exs b/test/pleroma/web/activity_pub/mrf_test.exs index 7c1eef7e0..61d308b97 100644 --- a/test/pleroma/web/activity_pub/mrf_test.exs +++ b/test/pleroma/web/activity_pub/mrf_test.exs @@ -68,7 +68,12 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy]) expected = %{ - mrf_policies: ["NoOpPolicy"], + mrf_policies: ["NoOpPolicy", "HashtagPolicy"], + mrf_hashtag: %{ + federated_timeline_removal: [], + reject: [], + sensitive: ["nsfw"] + }, exclusions: false } @@ -79,8 +84,13 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do clear_config([:mrf, :policies], [MRFModuleMock]) expected = %{ - mrf_policies: ["MRFModuleMock"], + mrf_policies: ["MRFModuleMock", "HashtagPolicy"], mrf_module_mock: "some config data", + mrf_hashtag: %{ + federated_timeline_removal: [], + reject: [], + sensitive: ["nsfw"] + }, exclusions: false } |