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

diff --git a/test/web/activity_pub/mrf/ensure_re_prepended_test.exs b/test/web/activity_pub/mrf/ensure_re_prepended_test.exs
deleted file mode 100644
index 9a283f27d..000000000
--- a/test/web/activity_pub/mrf/ensure_re_prepended_test.exs
+++ /dev/null
@@ -1,92 +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.EnsureRePrependedTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Activity
-  alias Pleroma.Object
-  alias Pleroma.Web.ActivityPub.MRF.EnsureRePrepended
-
-  describe "rewrites summary" do
-    test "it adds `re:` to summary object when child summary and parent summary equal" do
-      message = %{
-        "type" => "Create",
-        "object" => %{
-          "summary" => "object-summary",
-          "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "object-summary"}}}
-        }
-      }
-
-      assert {:ok, res} = EnsureRePrepended.filter(message)
-      assert res["object"]["summary"] == "re: object-summary"
-    end
-
-    test "it adds `re:` to summary object when child summary containts re-subject of parent summary " do
-      message = %{
-        "type" => "Create",
-        "object" => %{
-          "summary" => "object-summary",
-          "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "re: object-summary"}}}
-        }
-      }
-
-      assert {:ok, res} = EnsureRePrepended.filter(message)
-      assert res["object"]["summary"] == "re: object-summary"
-    end
-  end
-
-  describe "skip filter" do
-    test "it skip if type isn't 'Create'" do
-      message = %{
-        "type" => "Annotation",
-        "object" => %{"summary" => "object-summary"}
-      }
-
-      assert {:ok, res} = EnsureRePrepended.filter(message)
-      assert res == message
-    end
-
-    test "it skip if summary is empty" do
-      message = %{
-        "type" => "Create",
-        "object" => %{
-          "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "summary"}}}
-        }
-      }
-
-      assert {:ok, res} = EnsureRePrepended.filter(message)
-      assert res == message
-    end
-
-    test "it skip if inReplyTo is empty" do
-      message = %{"type" => "Create", "object" => %{"summary" => "summary"}}
-      assert {:ok, res} = EnsureRePrepended.filter(message)
-      assert res == message
-    end
-
-    test "it skip if parent and child summary isn't equal" do
-      message = %{
-        "type" => "Create",
-        "object" => %{
-          "summary" => "object-summary",
-          "inReplyTo" => %Activity{object: %Object{data: %{"summary" => "summary"}}}
-        }
-      }
-
-      assert {:ok, res} = EnsureRePrepended.filter(message)
-      assert res == message
-    end
-
-    test "it skips if the object is only a reference" do
-      message = %{
-        "type" => "Create",
-        "object" => "somereference"
-      }
-
-      assert {:ok, res} = EnsureRePrepended.filter(message)
-      assert res == message
-    end
-  end
-end