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

diff --git a/test/web/pleroma_api/views/chat/message_reference_view_test.exs b/test/web/pleroma_api/views/chat/message_reference_view_test.exs
deleted file mode 100644
index 40dbae3cd..000000000
--- a/test/web/pleroma_api/views/chat/message_reference_view_test.exs
+++ /dev/null
@@ -1,72 +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.PleromaAPI.Chat.MessageReferenceViewTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Chat
-  alias Pleroma.Chat.MessageReference
-  alias Pleroma.Object
-  alias Pleroma.Web.ActivityPub.ActivityPub
-  alias Pleroma.Web.CommonAPI
-  alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
-
-  import Pleroma.Factory
-
-  test "it displays a chat message" do
-    user = insert(:user)
-    recipient = insert(:user)
-
-    file = %Plug.Upload{
-      content_type: "image/jpg",
-      path: Path.absname("test/fixtures/image.jpg"),
-      filename: "an_image.jpg"
-    }
-
-    {:ok, upload} = ActivityPub.upload(file, actor: user.ap_id)
-    {:ok, activity} = CommonAPI.post_chat_message(user, recipient, "kippis :firefox:")
-
-    chat = Chat.get(user.id, recipient.ap_id)
-
-    object = Object.normalize(activity)
-
-    cm_ref = MessageReference.for_chat_and_object(chat, object)
-
-    chat_message = MessageReferenceView.render("show.json", chat_message_reference: cm_ref)
-
-    assert chat_message[:id] == cm_ref.id
-    assert chat_message[:content] == "kippis :firefox:"
-    assert chat_message[:account_id] == user.id
-    assert chat_message[:chat_id]
-    assert chat_message[:created_at]
-    assert chat_message[:unread] == false
-    assert match?([%{shortcode: "firefox"}], chat_message[:emojis])
-
-    clear_config([:rich_media, :enabled], true)
-
-    Tesla.Mock.mock(fn
-      %{url: "https://example.com/ogp"} ->
-        %Tesla.Env{status: 200, body: File.read!("test/fixtures/rich_media/ogp.html")}
-    end)
-
-    {:ok, activity} =
-      CommonAPI.post_chat_message(recipient, user, "gkgkgk https://example.com/ogp",
-        media_id: upload.id
-      )
-
-    object = Object.normalize(activity)
-
-    cm_ref = MessageReference.for_chat_and_object(chat, object)
-
-    chat_message_two = MessageReferenceView.render("show.json", chat_message_reference: cm_ref)
-
-    assert chat_message_two[:id] == cm_ref.id
-    assert chat_message_two[:content] == object.data["content"]
-    assert chat_message_two[:account_id] == recipient.id
-    assert chat_message_two[:chat_id] == chat_message[:chat_id]
-    assert chat_message_two[:attachment]
-    assert chat_message_two[:unread] == true
-    assert chat_message_two[:card]
-  end
-end