diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-29 00:52:50 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-06-29 00:52:50 +0300 |
| commit | 657277ffc0d3d25be4376ed629057a2d2cefb2e1 (patch) | |
| tree | 3fdd4ca236669df9b2afc5bfcd0e5d6002e23666 /test/conversation | |
| parent | c0fa0001476a8a45878a0c75125627164497eddf (diff) | |
| parent | c6668c2e7b9908e479527914ca7eb2c838aaab06 (diff) | |
| download | pleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.tar.gz pleroma-657277ffc0d3d25be4376ed629057a2d2cefb2e1.zip | |
Resolve conflicts
Diffstat (limited to 'test/conversation')
| -rw-r--r-- | test/conversation/participation_test.exs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/conversation/participation_test.exs b/test/conversation/participation_test.exs index 0e60bfca5..2a03e5d67 100644 --- a/test/conversation/participation_test.exs +++ b/test/conversation/participation_test.exs @@ -72,8 +72,11 @@ defmodule Pleroma.Conversation.ParticipationTest do object2 = Pleroma.Object.normalize(activity_two) object3 = Pleroma.Object.normalize(activity_three) + user = Repo.get(Pleroma.User, user.id) + assert participation_one.conversation.ap_id == object3.data["context"] assert participation_two.conversation.ap_id == object2.data["context"] + assert participation_one.conversation.users == [user] # Pagination assert [participation_one] = Participation.for_user(user, %{"limit" => 1}) |