projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
[akkoma]
/
test
/
web
/
pleroma_api
/
views
/
chat_message_view_test.exs
diff --git
a/test/web/pleroma_api/views/chat_message_view_test.exs
b/test/web/pleroma_api/views/chat_message_view_test.exs
index 5c4c8b0d59839f58406f7f3e45a0e5011aea0761..d7a2d10a5a32de6944d4c4aac8ef577246d3829c 100644
(file)
--- a/
test/web/pleroma_api/views/chat_message_view_test.exs
+++ b/
test/web/pleroma_api/views/chat_message_view_test.exs
@@
-7,6
+7,7
@@
defmodule Pleroma.Web.PleromaAPI.ChatMessageViewTest do
alias Pleroma.Chat
alias Pleroma.Object
alias Pleroma.Chat
alias Pleroma.Object
+ alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.ChatMessageView
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.PleromaAPI.ChatMessageView
@@
-15,6
+16,14
@@
defmodule Pleroma.Web.PleromaAPI.ChatMessageViewTest do
test "it displays a chat message" do
user = insert(:user)
recipient = insert(:user)
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)
{:ok, activity} = CommonAPI.post_chat_message(user, recipient, "kippis :firefox:")
chat = Chat.get(user.id, recipient.ap_id)
@@
-30,7
+39,7
@@
defmodule Pleroma.Web.PleromaAPI.ChatMessageViewTest do
assert chat_message[:created_at]
assert match?([%{shortcode: "firefox"}], chat_message[:emojis])
assert chat_message[:created_at]
assert match?([%{shortcode: "firefox"}], chat_message[:emojis])
- {:ok, activity} = CommonAPI.post_chat_message(recipient, user, "gkgkgk")
+ {:ok, activity} = CommonAPI.post_chat_message(recipient, user, "gkgkgk"
, media_id: upload.id
)
object = Object.normalize(activity)
object = Object.normalize(activity)
@@
-40,5
+49,6
@@
defmodule Pleroma.Web.PleromaAPI.ChatMessageViewTest do
assert chat_message_two[:content] == "gkgkgk"
assert chat_message_two[:account_id] == recipient.id
assert chat_message_two[:chat_id] == chat_message[:chat_id]
assert chat_message_two[:content] == "gkgkgk"
assert chat_message_two[:account_id] == recipient.id
assert chat_message_two[:chat_id] == chat_message[:chat_id]
+ assert chat_message_two[:attachment]
end
end
end
end