diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-11-05 12:12:19 +0100 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-11-05 12:12:19 +0100 |
| commit | 7252f6b054dfdfac1f9bac77c442c5a1ebd898af (patch) | |
| tree | 4cc9941c82ed2b2151b3ef2518dfe440c5c17fe5 /test/web/mastodon_api/account_view_test.exs | |
| parent | 046bee34d3b19c046dba59c1d6cb08548f978859 (diff) | |
| parent | fa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0 (diff) | |
| download | pleroma-7252f6b054dfdfac1f9bac77c442c5a1ebd898af.tar.gz pleroma-7252f6b054dfdfac1f9bac77c442c5a1ebd898af.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'test/web/mastodon_api/account_view_test.exs')
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index aa74ed966..c62cb4f36 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -51,12 +51,13 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do other_user = insert(:user) {:ok, user} = User.follow(user, other_user) + {:ok, user} = User.block(user, other_user) expected = %{ id: other_user.id, following: true, followed_by: false, - blocking: false, + blocking: true, muting: false, requested: false, domain_blocking: false |