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

diff --git a/test/web/pleroma_api/views/chat_view_test.exs b/test/web/pleroma_api/views/chat_view_test.exs
deleted file mode 100644
index 02484b705..000000000
--- a/test/web/pleroma_api/views/chat_view_test.exs
+++ /dev/null
@@ -1,49 +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.ChatViewTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Chat
-  alias Pleroma.Chat.MessageReference
-  alias Pleroma.Object
-  alias Pleroma.Web.CommonAPI
-  alias Pleroma.Web.CommonAPI.Utils
-  alias Pleroma.Web.MastodonAPI.AccountView
-  alias Pleroma.Web.PleromaAPI.Chat.MessageReferenceView
-  alias Pleroma.Web.PleromaAPI.ChatView
-
-  import Pleroma.Factory
-
-  test "it represents a chat" do
-    user = insert(:user)
-    recipient = insert(:user)
-
-    {:ok, chat} = Chat.get_or_create(user.id, recipient.ap_id)
-
-    represented_chat = ChatView.render("show.json", chat: chat)
-
-    assert represented_chat == %{
-             id: "#{chat.id}",
-             account:
-               AccountView.render("show.json", user: recipient, skip_visibility_check: true),
-             unread: 0,
-             last_message: nil,
-             updated_at: Utils.to_masto_date(chat.updated_at)
-           }
-
-    {:ok, chat_message_creation} = CommonAPI.post_chat_message(user, recipient, "hello")
-
-    chat_message = Object.normalize(chat_message_creation, false)
-
-    {:ok, chat} = Chat.get_or_create(user.id, recipient.ap_id)
-
-    represented_chat = ChatView.render("show.json", chat: chat)
-
-    cm_ref = MessageReference.for_chat_and_object(chat, chat_message)
-
-    assert represented_chat[:last_message] ==
-             MessageReferenceView.render("show.json", chat_message_reference: cm_ref)
-  end
-end