summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/mastodon_api_controller_test.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-06 22:40:24 +0000
committerkaniini <nenolod@gmail.com>2019-02-06 22:40:24 +0000
commit430f23323ce1d69258dbce665b3f73c046fc2895 (patch)
tree9d8f8fd5b1d64b42bda21e8c7c3786a48410c179 /test/web/mastodon_api/mastodon_api_controller_test.exs
parent1220a171466ff613978c39eb977902ee9492b187 (diff)
parent74518d0b607695a80e25f17de8369f47c7652b17 (diff)
downloadpleroma-430f23323ce1d69258dbce665b3f73c046fc2895.tar.gz
pleroma-430f23323ce1d69258dbce665b3f73c046fc2895.zip
Merge branch 'rename-followings' into 'develop'
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE See merge request pleroma/pleroma!787
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index d4e2acae3..f8da86004 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -1139,8 +1139,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert id == to_string(other_user.id)
end
- test "getting following, hide_followings", %{conn: conn} do
- user = insert(:user, %{info: %{hide_followings: true}})
+ test "getting following, hide_follows", %{conn: conn} do
+ user = insert(:user, %{info: %{hide_follows: true}})
other_user = insert(:user)
{:ok, user} = User.follow(user, other_user)
@@ -1151,8 +1151,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert [] == json_response(conn, 200)
end
- test "getting following, hide_followings, same user requesting", %{conn: conn} do
- user = insert(:user, %{info: %{hide_followings: true}})
+ test "getting following, hide_follows, same user requesting", %{conn: conn} do
+ user = insert(:user, %{info: %{hide_follows: true}})
other_user = insert(:user)
{:ok, user} = User.follow(user, other_user)