summaryrefslogtreecommitdiff
path: root/test/web/activity_pub
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-02-08 13:12:33 +0300
committerrinpatch <rinpatch@sdf.org>2019-02-08 13:12:33 +0300
commit6c21f5aa167c0ad37a18f3164c9ec53fbad492c2 (patch)
tree66836dfd3425fd1407c2f4cf4b14f0fbdc662140 /test/web/activity_pub
parent8a0b755c19ef9c896f69de2b1bf22418a3aedf6f (diff)
parentd84392c9e05342a70d3a759ac380dcd41f22ed0e (diff)
downloadpleroma-6c21f5aa167c0ad37a18f3164c9ec53fbad492c2.tar.gz
pleroma-6c21f5aa167c0ad37a18f3164c9ec53fbad492c2.zip
Merge branch 'develop' into feature/keyword-policy
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..570bee6b3 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_follows' set", %{conn: conn} do
+ user = insert(:user, %{info: %{hide_follows: true}})
user_two = insert(:user)
User.follow(user, user_two)