Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

3 files changed, 0 insertions, 141 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
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
diff --git a/test/web/pleroma_api/views/scrobble_view_test.exs b/test/web/pleroma_api/views/scrobble_view_test.exs
deleted file mode 100644
index 6bdb56509..000000000
--- a/test/web/pleroma_api/views/scrobble_view_test.exs
+++ /dev/null
@@ -1,20 +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.StatusViewTest do
-  use Pleroma.DataCase
-
-  alias Pleroma.Web.PleromaAPI.ScrobbleView
-
-  import Pleroma.Factory
-
-  test "successfully renders a Listen activity (pleroma extension)" do
-    listen_activity = insert(:listen)
-
-    status = ScrobbleView.render("show.json", activity: listen_activity)
-
-    assert status.length == listen_activity.data["object"]["length"]
-    assert status.title == listen_activity.data["object"]["title"]
-  end
-end