diff options
| author | lambda <pleromagit@rogerbraun.net> | 2017-11-03 08:56:44 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2017-11-03 08:56:44 +0000 |
| commit | fa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0 (patch) | |
| tree | 558115d281c48d6546376652a110d08ee1e4ff8b /test/web/mastodon_api/account_view_test.exs | |
| parent | 8a1a7191fd9348fb35fc1aa322dd90869c7dfceb (diff) | |
| parent | c6b9b777dacef2fce51e43a25e3af9c9fac9a87e (diff) | |
| download | pleroma-fa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0.tar.gz pleroma-fa1f11e8e9c31b0ed2857ca3c3feb78552ed54d0.zip | |
Merge branch 'feature/blocks' into 'develop'
Feature/blocks
See merge request pleroma/pleroma!5
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 |