summaryrefslogtreecommitdiff
path: root/test/web/ostatus
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-04-10 14:20:48 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-04-10 14:20:48 +0400
commit7f692343c80ddf353712490edfbcdb14866f5685 (patch)
tree7ef90078d87fafb1eb25986c92af17a9eede37be /test/web/ostatus
parentfc2eb1fbd6a5b38a3cf72e557cce1029d6b7f16f (diff)
parentce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff)
downloadpleroma-7f692343c80ddf353712490edfbcdb14866f5685.tar.gz
pleroma-7f692343c80ddf353712490edfbcdb14866f5685.zip
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'test/web/ostatus')
-rw-r--r--test/web/ostatus/ostatus_controller_test.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/ostatus/ostatus_controller_test.exs b/test/web/ostatus/ostatus_controller_test.exs
index 6787b414b..bb349cb19 100644
--- a/test/web/ostatus/ostatus_controller_test.exs
+++ b/test/web/ostatus/ostatus_controller_test.exs
@@ -136,7 +136,7 @@ defmodule Pleroma.Web.OStatus.OStatusControllerTest do
user = insert(:user)
- {:ok, like_activity, _} = CommonAPI.favorite(note_activity.id, user)
+ {:ok, like_activity} = CommonAPI.favorite(user, note_activity.id)
assert like_activity.data["type"] == "Like"