diff options
| author | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
| commit | 9ef912aecfbeef670db0614ec2014321c37f3b7a (patch) | |
| tree | 69eb0b5e11ca321e1ba8ca794171bf0cb425d16d /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7 (diff) | |
| parent | 92b4a1aa1bc750bb077ae45c422967f9712e247d (diff) | |
| download | pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.tar.gz pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.zip | |
Merge branch 'develop' into issue/1411
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, %{ |