diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-10 00:16:43 +0700 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-12-10 00:16:43 +0700 |
| commit | c098dec47344303bc00456bfbfc0d769abd8f199 (patch) | |
| tree | 709963edcda2d85a5d77ebce4a200ae04fff89cd /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 78299ab18205b0bbaf521640e188a862ca27aa61 (diff) | |
| parent | 0d2c13a119302d0d217a7cb61c28a01c620b1b61 (diff) | |
| download | pleroma-c098dec47344303bc00456bfbfc0d769abd8f199.tar.gz pleroma-c098dec47344303bc00456bfbfc0d769abd8f199.zip | |
Merge branch 'develop' into feature/custom-runtime-modules
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, %{ |