summaryrefslogtreecommitdiff
path: root/test/web/activity_pub
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-02-01 17:05:29 +0000
committerkaniini <nenolod@gmail.com>2019-02-01 17:05:29 +0000
commit0a82a7e6d6f92bf3ca83cf039a445f7c8ce23336 (patch)
tree119d8103065971b10b915056d59d30c584ef00d9 /test/web/activity_pub
parentfc7644798d72a6b8c99fb05196ec9143d00e9ef4 (diff)
parent3e968f9ef22f48819f5f08a493ccf13d6b52cca8 (diff)
downloadpleroma-0a82a7e6d6f92bf3ca83cf039a445f7c8ce23336.tar.gz
pleroma-0a82a7e6d6f92bf3ca83cf039a445f7c8ce23336.zip
Merge branch 'feature/split-hide-network' into 'develop'
Split hide_network into hide_followers & hide_followings See merge request pleroma/pleroma!733
Diffstat (limited to 'test/web/activity_pub')
-rw-r--r--test/web/activity_pub/activity_pub_controller_test.exs8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index d3dd160dd..0a0103793 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -386,9 +386,9 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert result["first"]["orderedItems"] == [user.ap_id]
end
- test "it returns returns empty if the user has 'hide_network' set", %{conn: conn} do
+ test "it returns returns empty if the user has 'hide_followers' set", %{conn: conn} do
user = insert(:user)
- user_two = insert(:user, %{info: %{hide_network: true}})
+ user_two = insert(:user, %{info: %{hide_followers: true}})
User.follow(user, user_two)
result =
@@ -441,8 +441,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
assert result["first"]["orderedItems"] == [user_two.ap_id]
end
- test "it returns returns empty if the user has 'hide_network' set", %{conn: conn} do
- user = insert(:user, %{info: %{hide_network: true}})
+ test "it returns returns empty if the user has 'hide_followings' set", %{conn: conn} do
+ user = insert(:user, %{info: %{hide_followings: true}})
user_two = insert(:user)
User.follow(user, user_two)