summaryrefslogtreecommitdiff
path: root/test/conversation
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@gmail.com>2019-04-29 03:44:04 +0700
committerlain <lain@soykaf.club>2019-05-01 19:03:55 +0200
commit8af55728e47f9f62d237704cd5a33fba5f946fa2 (patch)
tree959cb63b23b24ecec18f8a107e663c424fa68315 /test/conversation
parent45f790becc2cc63ac000c6432fe8c84e0b589822 (diff)
downloadpleroma-8af55728e47f9f62d237704cd5a33fba5f946fa2.tar.gz
pleroma-8af55728e47f9f62d237704cd5a33fba5f946fa2.zip
Fix tests
Diffstat (limited to 'test/conversation')
-rw-r--r--test/conversation/participation_test.exs20
1 files changed, 9 insertions, 11 deletions
diff --git a/test/conversation/participation_test.exs b/test/conversation/participation_test.exs
index 5791fa0db..568953b07 100644
--- a/test/conversation/participation_test.exs
+++ b/test/conversation/participation_test.exs
@@ -67,24 +67,22 @@ defmodule Pleroma.Conversation.ParticipationTest do
"in_reply_to_status_id" => activity_one.id
})
- assert [participation_one, participation_two] =
- Participation.for_user(user)
- |> Repo.preload(:conversation)
+ assert [participation_one, participation_two] = Participation.for_user(user)
- assert participation_one.conversation.ap_id == activity_three.data["object"]["context"]
- assert participation_two.conversation.ap_id == activity_two.data["object"]["context"]
+ object2 = Pleroma.Object.normalize(activity_two)
+ object3 = Pleroma.Object.normalize(activity_three)
+
+ assert participation_one.conversation.ap_id == object3.data["context"]
+ assert participation_two.conversation.ap_id == object2.data["context"]
# Pagination
- assert [participation_one] =
- Participation.for_user(user, %{limit: 1})
- |> Repo.preload(:conversation)
+ assert [participation_one] = Participation.for_user(user, %{"limit" => 1})
- assert participation_one.conversation.ap_id == activity_three.data["object"]["context"]
+ assert participation_one.conversation.ap_id == object3.data["context"]
# With last_activity_id
assert [participation_one] =
- Participation.for_user_with_last_activity_id(user, %{limit: 1})
- |> Repo.preload(:conversation)
+ Participation.for_user_with_last_activity_id(user, %{"limit" => 1})
assert participation_one.last_activity_id == activity_three.id
end