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, 26 deletions

diff --git a/test/web/activity_pub/object_validators/follow_validation_test.exs b/test/web/activity_pub/object_validators/follow_validation_test.exs
deleted file mode 100644
index 6e1378be2..000000000
--- a/test/web/activity_pub/object_validators/follow_validation_test.exs
+++ /dev/null
@@ -1,26 +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.ObjectValidators.FollowValidationTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Web.ActivityPub.Builder
-  alias Pleroma.Web.ActivityPub.ObjectValidator
-
-  import Pleroma.Factory
-
-  describe "Follows" do
-    setup do
-      follower = insert(:user)
-      followed = insert(:user)
-
-      {:ok, valid_follow, []} = Builder.follow(follower, followed)
-      %{follower: follower, followed: followed, valid_follow: valid_follow}
-    end
-
-    test "validates a basic follow object", %{valid_follow: valid_follow} do
-      assert {:ok, _follow, []} = ObjectValidator.validate(valid_follow, [])
-    end
-  end
-end