diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-12-06 00:12:21 +0300 |
| commit | cdff5b82670313e46c2b362d4cf041779af6a6bd (patch) | |
| tree | edc39a1b48f48334480e709fbda844cb120b32f8 /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 9f99640cfc81f28c0b6cdb5f6ef065b3e46f5f23 (diff) | |
| parent | 67d8df04a440ec9b2949bdddd3a3d8dd70c9b140 (diff) | |
| download | pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.tar.gz pleroma-cdff5b82670313e46c2b362d4cf041779af6a6bd.zip | |
Merge branch 'develop' into fix/mrf-delete
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, %{ |