diff options
author | lain <lain@soykaf.club> | 2020-04-06 11:59:01 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-04-06 11:59:01 +0000 |
commit | 349b9d86dc25ae9514781ef2ac56953fa357a031 (patch) | |
tree | 82fe9db708847369f7cbef107da9c6734cea8e4d /test/web/activity_pub/views | |
parent | 8444e7ee9651f3b1836954a3891b5ae26ee79f99 (diff) | |
parent | 772bc258cde11b3203ad9420f69321ccd56db91a (diff) | |
download | pleroma-349b9d86dc25ae9514781ef2ac56953fa357a031.tar.gz pleroma-349b9d86dc25ae9514781ef2ac56953fa357a031.zip |
Merge branch 'remake-remodel-2' into 'develop'
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
Diffstat (limited to 'test/web/activity_pub/views')
-rw-r--r-- | test/web/activity_pub/views/object_view_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/activity_pub/views/object_view_test.exs b/test/web/activity_pub/views/object_view_test.exs index de5ffc5b3..6c006206b 100644 --- a/test/web/activity_pub/views/object_view_test.exs +++ b/test/web/activity_pub/views/object_view_test.exs @@ -59,7 +59,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectViewTest do object = Object.normalize(note) user = insert(:user) - {:ok, like_activity, _} = CommonAPI.favorite(note.id, user) + {:ok, like_activity} = CommonAPI.favorite(user, note.id) result = ObjectView.render("object.json", %{object: like_activity}) |