hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Merge branch 'feature/split-hide-network' into 'develop'"

Browse source 
This reverts merge request !733
This commit is contained in:
kaniini 2019-02-01 20:22:58 +00:00
commit 486749064f
10 changed files with 45 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/web/mastodon_api/mastodon_api_controller_test.exs
View file

@ -1099,9 +1099,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert id == to_string(user.id)
end
test "getting followers, hide_followers", %{conn: conn} do
test "getting followers, hide_network", %{conn: conn} do
user = insert(:user)
other_user = insert(:user, %{info: %{hide_followers: true}})
other_user = insert(:user, %{info: %{hide_network: true}})
{:ok, _user} = User.follow(user, other_user)
conn =
@ -1111,9 +1111,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
assert [] == json_response(conn, 200)
end
test "getting followers, hide_followers, same user requesting", %{conn: conn} do
test "getting followers, hide_network, same user requesting", %{conn: conn} do
user = insert(:user)
other_user = insert(:user, %{info: %{hide_followers: true}})
other_user = insert(:user, %{info: %{hide_network: true}})
{:ok, _user} = User.follow(user, other_user)
conn =
@ -1137,8 +1137,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_network", %{conn: conn} do
user = insert(:user, %{info: %{hide_network: true}})
other_user = insert(:user)
{:ok, user} = User.follow(user, other_user)
@ -1149,8 +1149,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_network, same user requesting", %{conn: conn} do
user = insert(:user, %{info: %{hide_network: true}})
other_user = insert(:user)
{:ok, user} = User.follow(user, other_user)