diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-12-12 02:16:23 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-12-12 02:16:23 +0300 |
| commit | 3ecf131511afc1fc366be6402ca94cf0e6c30e11 (patch) | |
| tree | 0e8a59c43ccc344bb7d57c32826675aa706b7e8e /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | cc36a8ea906bd22884101632c6d62c9572e846e1 (diff) | |
| parent | fd697cf2090b61db60a02694c3227850df176e2d (diff) | |
| download | pleroma-3ecf131511afc1fc366be6402ca94cf0e6c30e11.tar.gz pleroma-3ecf131511afc1fc366be6402ca94cf0e6c30e11.zip | |
Merge branch 'develop' into feature/report-notes
Diffstat (limited to 'test/web/mastodon_api/controllers/timeline_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/timeline_controller_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/timeline_controller_test.exs b/test/web/mastodon_api/controllers/timeline_controller_test.exs index 61b6cea75..dc17cc963 100644 --- a/test/web/mastodon_api/controllers/timeline_controller_test.exs +++ b/test/web/mastodon_api/controllers/timeline_controller_test.exs @@ -194,7 +194,7 @@ defmodule Pleroma.Web.MastodonAPI.TimelineControllerTest do blocker = insert(:user) blocked = insert(:user) user = insert(:user) - {:ok, blocker} = User.block(blocker, blocked) + {:ok, _user_relationship} = User.block(blocker, blocked) {:ok, _blocked_direct} = CommonAPI.post(blocked, %{ |