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_view_test.exs
diff --git
a/test/web/pleroma_api/views/chat_view_test.exs
b/test/web/pleroma_api/views/chat_view_test.exs
index 8568d98c631423bf605aadfbae3a51c81ea45c7f..6062a0cfef122d2e469d510141d63228c8ae0d2e 100644
(file)
--- a/
test/web/pleroma_api/views/chat_view_test.exs
+++ b/
test/web/pleroma_api/views/chat_view_test.exs
@@
-8,9
+8,10
@@
defmodule Pleroma.Web.PleromaAPI.ChatViewTest do
alias Pleroma.Chat
alias Pleroma.Object
alias Pleroma.Web.CommonAPI
alias Pleroma.Chat
alias Pleroma.Object
alias Pleroma.Web.CommonAPI
+ alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView
alias Pleroma.Web.MastodonAPI.AccountView
- alias Pleroma.Web.PleromaAPI.ChatView
alias Pleroma.Web.PleromaAPI.ChatMessageView
alias Pleroma.Web.PleromaAPI.ChatMessageView
+ alias Pleroma.Web.PleromaAPI.ChatView
import Pleroma.Factory
import Pleroma.Factory
@@
-26,7
+27,8
@@
defmodule Pleroma.Web.PleromaAPI.ChatViewTest do
id: "#{chat.id}",
account: AccountView.render("show.json", user: recipient),
unread: 0,
id: "#{chat.id}",
account: AccountView.render("show.json", user: recipient),
unread: 0,
- last_message: nil
+ last_message: nil,
+ updated_at: Utils.to_masto_date(chat.updated_at)
}
{:ok, chat_message_creation} = CommonAPI.post_chat_message(user, recipient, "hello")
}
{:ok, chat_message_creation} = CommonAPI.post_chat_message(user, recipient, "hello")