diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-05-24 19:52:24 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-05-24 19:52:24 +0000 |
| commit | c2dcd767cf4abaa88da946e12ca643840b65e184 (patch) | |
| tree | 93d394f2e1fc6d892c1eba85e9b39f9870d2b9b3 /test/web/twitter_api/twitter_api_controller_test.exs | |
| parent | 6b9a6838331210dd514d5ecda52783c183bd1bbf (diff) | |
| parent | 1197ec10a83c2e61251abe383bea2bcc690d9c09 (diff) | |
| download | pleroma-c2dcd767cf4abaa88da946e12ca643840b65e184.tar.gz | |
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
Diffstat (limited to 'test/web/twitter_api/twitter_api_controller_test.exs')
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 73443e053..c2ea41aa3 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -444,7 +444,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do test "with credentials", %{conn: conn, user: current_user} do blocked = insert(:user) - {:ok, current_user} = User.block(current_user, blocked) + {:ok, current_user, blocked} = TwitterAPI.block(current_user, %{"user_id" => blocked.id}) assert User.blocks?(current_user, blocked) conn = |