Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 33 deletions

diff --git a/test/web/activity_pub/mrf/subchain_policy_test.exs b/test/web/activity_pub/mrf/subchain_policy_test.exs
deleted file mode 100644
index fff66cb7e..000000000
--- a/test/web/activity_pub/mrf/subchain_policy_test.exs
+++ /dev/null
@@ -1,33 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.ActivityPub.MRF.SubchainPolicyTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Web.ActivityPub.MRF.DropPolicy
-  alias Pleroma.Web.ActivityPub.MRF.SubchainPolicy
-
-  @message %{
-    "actor" => "https://banned.com",
-    "type" => "Create",
-    "object" => %{"content" => "hi"}
-  }
-  setup do: clear_config([:mrf_subchain, :match_actor])
-
-  test "it matches and processes subchains when the actor matches a configured target" do
-    Pleroma.Config.put([:mrf_subchain, :match_actor], %{
-      ~r/^https:\/\/banned.com/s => [DropPolicy]
-    })
-
-    {:reject, _} = SubchainPolicy.filter(@message)
-  end
-
-  test "it doesn't match and process subchains when the actor doesn't match a configured target" do
-    Pleroma.Config.put([:mrf_subchain, :match_actor], %{
-      ~r/^https:\/\/borked.com/s => [DropPolicy]
-    })
-
-    {:ok, _message} = SubchainPolicy.filter(@message)
-  end
-end