projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/database-configuration-whitelist' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
views
/
conversation_view_test.exs
diff --git
a/test/web/mastodon_api/views/conversation_view_test.exs
b/test/web/mastodon_api/views/conversation_view_test.exs
index a2a880705b644edde3f0d4a78dff8ac9217ab2ef..6f84366f86d0f6e69c1c02912c46717361589b83 100644
(file)
--- a/
test/web/mastodon_api/views/conversation_view_test.exs
+++ b/
test/web/mastodon_api/views/conversation_view_test.exs
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationViewTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.MastodonAPI.ConversationViewTest do
@@
-16,7
+16,7
@@
defmodule Pleroma.Web.MastodonAPI.ConversationViewTest do
other_user = insert(:user)
{:ok, activity} =
other_user = insert(:user)
{:ok, activity} =
- CommonAPI.post(user, %{
"status" => "hey @#{other_user.nickname}", "visibility" =>
"direct"})
+ CommonAPI.post(user, %{
status: "hey @#{other_user.nickname}", visibility:
"direct"})
[participation] = Participation.for_user_with_last_activity_id(user)
[participation] = Participation.for_user_with_last_activity_id(user)
@@
-30,5
+30,6
@@
defmodule Pleroma.Web.MastodonAPI.ConversationViewTest do
assert [account] = conversation.accounts
assert account.id == other_user.id
assert [account] = conversation.accounts
assert account.id == other_user.id
+ assert conversation.last_status.pleroma.direct_conversation_id == participation.id
end
end
end
end