diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 19:52:46 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-12-08 19:52:46 +0300 |
| commit | 5876a9cb79e53f932d63e457610852031669a222 (patch) | |
| tree | 6ff7335e9ddd5cfbce1e33ca075265c6f31b8b61 /test/web/mastodon_api/controllers/timeline_controller_test.exs | |
| parent | 3c3bba0b7c65187b3270ef3402442cf870a55198 (diff) | |
| parent | af5fef1f228a1781d7d9cad490d3b3a783389f5e (diff) | |
| download | pleroma-5876a9cb79e53f932d63e457610852031669a222.tar.gz pleroma-5876a9cb79e53f932d63e457610852031669a222.zip | |
Merge branch 'develop' into issue/1383
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, %{ |