Merge branch 'follow-enhancements' into 'develop'

Respect blocks in mass follow.

See merge request pleroma/pleroma!797
This commit is contained in:
kaniini 2019-02-09 21:03:42 +00:00
commit d5fe05c37e
2 changed files with 12 additions and 11 deletions

View file

@ -53,16 +53,20 @@ defmodule Pleroma.UserTest do
followed_zero = insert(:user)
followed_one = insert(:user)
followed_two = insert(:user)
blocked = insert(:user)
not_followed = insert(:user)
{:ok, user} = User.block(user, blocked)
{:ok, user} = User.follow(user, followed_zero)
{:ok, user} = User.follow_all(user, [followed_one, followed_two])
{:ok, user} = User.follow_all(user, [followed_one, followed_two, blocked])
assert User.following?(user, followed_one)
assert User.following?(user, followed_two)
assert User.following?(user, followed_zero)
refute User.following?(user, not_followed)
refute User.following?(user, blocked)
end
test "follow_all follows mutliple users without duplicating" do