diff options
| author | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-05-16 17:07:09 +0000 |
| commit | d15aa9d9503e59b3cd0731394855781f435ec63c (patch) | |
| tree | 844810415def046a2fc886d0bc1baeb1ff9afb21 /test/web/ostatus | |
| parent | 9cf4c4fa73e68f03791c5cc70505b710be39b677 (diff) | |
| parent | 3bc1138dd9beec03d2336fa1ad45dd23816f5285 (diff) | |
| download | pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.tar.gz pleroma-d15aa9d9503e59b3cd0731394855781f435ec63c.zip | |
Merge branch 'develop' into 'remove-twitter-api'
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
Diffstat (limited to 'test/web/ostatus')
| -rw-r--r-- | test/web/ostatus/ostatus_controller_test.exs | 2 |
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" |