projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'align-mastodon-conversations' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
mastodon_api_controller_test.exs
diff --git
a/test/web/mastodon_api/mastodon_api_controller_test.exs
b/test/web/mastodon_api/mastodon_api_controller_test.exs
index f5f87d8afe85715e7e09cdc52a3a06eb983317a7..9482f4cb8511654059c7d6b7fbdf04079eb7c5e8 100644
(file)
--- a/
test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/
test/web/mastodon_api/mastodon_api_controller_test.exs
@@
-317,12
+317,13
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
test "Conversations", %{conn: conn} do
user_one = insert(:user)
user_two = insert(:user)
test "Conversations", %{conn: conn} do
user_one = insert(:user)
user_two = insert(:user)
+ user_three = insert(:user)
{:ok, user_two} = User.follow(user_two, user_one)
{:ok, direct} =
CommonAPI.post(user_one, %{
{:ok, user_two} = User.follow(user_two, user_one)
{:ok, direct} =
CommonAPI.post(user_one, %{
- "status" => "Hi @#{user_two.nickname}!",
+ "status" => "Hi @#{user_two.nickname}
, @#{user_three.nickname}
!",
"visibility" => "direct"
})
"visibility" => "direct"
})
@@
-348,7
+349,10
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
}
] = response
}
] = response
+ account_ids = Enum.map(res_accounts, & &1["id"])
assert length(res_accounts) == 2
assert length(res_accounts) == 2
+ assert user_two.id in account_ids
+ assert user_three.id in account_ids
assert is_binary(res_id)
assert unread == true
assert res_last_status["id"] == direct.id
assert is_binary(res_id)
assert unread == true
assert res_last_status["id"] == direct.id