summaryrefslogtreecommitdiff
path: root/test/web
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-11-27 13:40:39 +0000
committerlain <lain@soykaf.club>2019-11-27 13:40:39 +0000
commitef1718a045065ec800dbd2b60879a28eb82caad8 (patch)
tree8880b11c1bb85a6919ff1cb2d639f5645dc59a80 /test/web
parent139b1feda122a8828a562c127989c8778a817308 (diff)
parentf595cfe6230715681e8ba93f73480bf695b3a243 (diff)
downloadpleroma-ef1718a045065ec800dbd2b60879a28eb82caad8.tar.gz
pleroma-ef1718a045065ec800dbd2b60879a28eb82caad8.zip
Merge branch 'remove-user-info' into 'develop'
Remove User.user_info/2 See merge request pleroma/pleroma!2016
Diffstat (limited to 'test/web')
-rw-r--r--test/web/mastodon_api/views/account_view_test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/web/mastodon_api/views/account_view_test.exs b/test/web/mastodon_api/views/account_view_test.exs
index af88841ed..15bfcbb78 100644
--- a/test/web/mastodon_api/views/account_view_test.exs
+++ b/test/web/mastodon_api/views/account_view_test.exs
@@ -350,7 +350,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountViewTest do
}
}
- assert expected == AccountView.render("show.json", %{user: user, for: other_user})
+ assert expected ==
+ AccountView.render("show.json", %{user: refresh_record(user), for: other_user})
end
test "returns the settings store if the requesting user is the represented user and it's requested specifically" do