diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-01 20:23:55 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-01 20:23:55 +0000 |
| commit | 09e1c8c05dedf96710571a55f0be65fdff4ccdd0 (patch) | |
| tree | d639c4f000b3ecafa6c5b7ea8b99f25557ac5141 /test/web/activity_pub/activity_pub_controller_test.exs | |
| parent | 28bfb09b01d324e149e9f36a74db2674a07b07da (diff) | |
| parent | 486749064f72ac5078a42ed339519afbbf48027a (diff) | |
| download | pleroma-09e1c8c05dedf96710571a55f0be65fdff4ccdd0.tar.gz pleroma-09e1c8c05dedf96710571a55f0be65fdff4ccdd0.zip | |
Merge branch 'revert-0a82a7e6' into 'develop'
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
See merge request pleroma/pleroma!758
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
| -rw-r--r-- | test/web/activity_pub/activity_pub_controller_test.exs | 8 |
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 0a0103793..d3dd160dd 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_followers' set", %{conn: conn} do + test "it returns returns empty if the user has 'hide_network' set", %{conn: conn} do user = insert(:user) - user_two = insert(:user, %{info: %{hide_followers: true}}) + user_two = insert(:user, %{info: %{hide_network: 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_followings' set", %{conn: conn} do - user = insert(:user, %{info: %{hide_followings: true}}) + test "it returns returns empty if the user has 'hide_network' set", %{conn: conn} do + user = insert(:user, %{info: %{hide_network: true}}) user_two = insert(:user) User.follow(user, user_two) |
