diff options
author | lain <lain@soykaf.club> | 2019-08-12 12:51:08 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-08-12 12:51:08 +0200 |
commit | 23c46f7e72701b773d87b825526450e5f4ec6322 (patch) | |
tree | 3f463132f9f299a44811ea04c085bfa30e1a469b /test | |
parent | a2b98f6d58218c5806247743aa0a2a600c9959ab (diff) | |
download | pleroma-23c46f7e72701b773d87b825526450e5f4ec6322.tar.gz |
Conversations: Use 'recipients' for accounts in conversation view.
According to gargron, this is the intended usage.
Diffstat (limited to 'test')
-rw-r--r-- | test/web/mastodon_api/conversation_view_test.exs | 6 | ||||
-rw-r--r-- | test/web/pleroma_api/pleroma_api_controller_test.exs | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/test/web/mastodon_api/conversation_view_test.exs b/test/web/mastodon_api/conversation_view_test.exs index e32cde5a8..27f668d9f 100644 --- a/test/web/mastodon_api/conversation_view_test.exs +++ b/test/web/mastodon_api/conversation_view_test.exs @@ -30,11 +30,5 @@ defmodule Pleroma.Web.MastodonAPI.ConversationViewTest do assert [account] = conversation.accounts assert account.id == other_user.id - - assert recipients = conversation.pleroma.recipients - recipient_ids = recipients |> Enum.map(& &1.id) - - assert user.id in recipient_ids - assert other_user.id in recipient_ids end end diff --git a/test/web/pleroma_api/pleroma_api_controller_test.exs b/test/web/pleroma_api/pleroma_api_controller_test.exs index 7c75fb229..56bc1572c 100644 --- a/test/web/pleroma_api/pleroma_api_controller_test.exs +++ b/test/web/pleroma_api/pleroma_api_controller_test.exs @@ -67,10 +67,10 @@ defmodule Pleroma.Web.PleromaAPI.PleromaAPIControllerTest do assert result["id"] == participation.id |> to_string - assert recipients = result["pleroma"]["recipients"] - recipient_ids = Enum.map(recipients, & &1["id"]) + [participation] = Participation.for_user(user) + participation = Repo.preload(participation, :recipients) - assert user.id in recipient_ids - assert other_user.id in recipient_ids + assert user in participation.recipients + assert other_user in participation.recipients end end |