projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'chore/bump-linkify' into 'develop'
[akkoma]
/
test
/
pleroma
/
web
/
mastodon_api
/
controllers
/
conversation_controller_test.exs
diff --git
a/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
b/test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
index 291b6b2953e4601f92cd89f6ec3c5ebe5ed64b4b..c67e584dd73632762cadcaf5eaf0cf610e3e9e73 100644
(file)
--- a/
test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
+++ b/
test/pleroma/web/mastodon_api/controllers/conversation_controller_test.exs
@@
-65,12
+65,11
@@
defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
assert Participation.unread_count(user_one) == 0
end
assert Participation.unread_count(user_one) == 0
end
- test "
special behaviour when conversation have only one user
", %{
+ test "
includes the user if the user is the only participant
", %{
user: user_one,
user: user_one,
- user_two: user_two,
conn: conn
} do
conn: conn
} do
- {:ok, direct} = create_direct_message(user_one, [])
+ {:ok,
_
direct} = create_direct_message(user_one, [])
res_conn = get(conn, "/api/v1/conversations")
res_conn = get(conn, "/api/v1/conversations")
@@
-78,14
+77,11
@@
defmodule Pleroma.Web.MastodonAPI.ConversationControllerTest do
assert [
%{
assert [
%{
- "accounts" => res_accounts,
- "last_status" => res_last_status
+ "accounts" => [account]
}
] = response
}
] = response
- account_ids = Enum.map(res_accounts, & &1["id"])
- assert length(res_accounts) == 1
- assert user_one.id in account_ids
+ assert user_one.id == account["id"]
end
test "observes limit params", %{
end
test "observes limit params", %{