Merge branch 'develop' into fix/deprecation-warning-welcome-message

This commit is contained in:
Mark Felder 2020-09-25 13:08:33 -05:00
commit d1c724ef34

View File

@ -61,6 +61,8 @@ defmodule Pleroma.Web.ActivityPub.MRFTest do
describe "describe/0" do describe "describe/0" do
test "it works as expected with noop policy" do test "it works as expected with noop policy" do
clear_config([:mrf, :policies], [Pleroma.Web.ActivityPub.MRF.NoOpPolicy])
expected = %{ expected = %{
mrf_policies: ["NoOpPolicy"], mrf_policies: ["NoOpPolicy"],
exclusions: false exclusions: false