summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-06-16 18:10:00 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2020-06-16 18:10:00 +0000
commitb536e57124fda9adeb4c78739d0eb2be80d47f6e (patch)
treef4e8b161bba63289c21246d83968b637d2db3d3f /test
parent8bfacffabc1325fa908f253358bbe29093622b0a (diff)
parent1092b3650068169ece0ac95cd88ec0e4da30036b (diff)
downloadpleroma-b536e57124fda9adeb4c78739d0eb2be80d47f6e.tar.gz
pleroma-b536e57124fda9adeb4c78739d0eb2be80d47f6e.zip
Merge branch '1866-last-status-stuff' into 'develop'
Resolve "/api/v1/conversations returns the wrong `last_status`" Closes #1866 See merge request pleroma/pleroma!2647
Diffstat (limited to 'test')
-rw-r--r--test/web/mastodon_api/views/conversation_view_test.exs11
1 files changed, 10 insertions, 1 deletions
diff --git a/test/web/mastodon_api/views/conversation_view_test.exs b/test/web/mastodon_api/views/conversation_view_test.exs
index 6f84366f8..2e8203c9b 100644
--- a/test/web/mastodon_api/views/conversation_view_test.exs
+++ b/test/web/mastodon_api/views/conversation_view_test.exs
@@ -15,8 +15,17 @@ defmodule Pleroma.Web.MastodonAPI.ConversationViewTest do
user = insert(:user)
other_user = insert(:user)
+ {:ok, parent} = CommonAPI.post(user, %{status: "parent"})
+
{:ok, activity} =
- CommonAPI.post(user, %{status: "hey @#{other_user.nickname}", visibility: "direct"})
+ CommonAPI.post(user, %{
+ status: "hey @#{other_user.nickname}",
+ visibility: "direct",
+ in_reply_to_id: parent.id
+ })
+
+ {:ok, _reply_activity} =
+ CommonAPI.post(user, %{status: "hu", visibility: "public", in_reply_to_id: parent.id})
[participation] = Participation.for_user_with_last_activity_id(user)