diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-07 23:47:43 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-07 23:47:43 +0000 |
| commit | 14a762a213db0d00550c1421651ef689249c9c57 (patch) | |
| tree | 43f1a7520301af2ac1d90efd4dd01dbe0c9043bf /test | |
| parent | 403f9d118dadcef806044831221d5c67800ce34d (diff) | |
| parent | c1d07da4e18cc2acd11a5a131e1482aec5996552 (diff) | |
| download | pleroma-14a762a213db0d00550c1421651ef689249c9c57.tar.gz pleroma-14a762a213db0d00550c1421651ef689249c9c57.zip | |
Merge branch 'fix/tusk' into 'develop'
Fix signin and initial loading with Tusk
See merge request pleroma/pleroma!333
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/mastodon_api/account_view_test.exs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/web/mastodon_api/account_view_test.exs b/test/web/mastodon_api/account_view_test.exs index 7d0367d01..e1e07fbcd 100644 --- a/test/web/mastodon_api/account_view_test.exs +++ b/test/web/mastodon_api/account_view_test.exs @@ -123,8 +123,10 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do followed_by: false, blocking: true, muting: false, + muting_notifications: false, requested: false, - domain_blocking: false + domain_blocking: false, + showing_reblogs: false } assert expected == AccountView.render("relationship.json", %{user: user, target: other_user}) |