X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fuser_test.exs;h=523ab1ea430256ebb3ac257aac2080262df2a8ba;hb=39383a6b79f5fe8e449d8e1acbc60f265065ad07;hp=b33398ff6fcb25a8a780b4b9347e3dd96368bc06;hpb=cda1470e02100bfcdcbd128fd08d0af64dca7271;p=akkoma

diff --git a/test/user_test.exs b/test/user_test.exs
index b33398ff6..523ab1ea4 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -50,13 +50,36 @@ defmodule Pleroma.UserTest do
 
   test "follow_all follows mutliple users" do
     user = insert(:user)
+    followed_zero = insert(:user)
     followed_one = insert(:user)
     followed_two = insert(:user)
+    blocked = insert(:user)
+    not_followed = insert(:user)
 
-    {:ok, user} = User.follow_all(user, [followed_one, followed_two])
+    {:ok, user} = User.block(user, blocked)
+
+    {:ok, user} = User.follow(user, followed_zero)
+
+    {: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
+    user = insert(:user)
+    followed_zero = insert(:user)
+    followed_one = insert(:user)
+    followed_two = insert(:user)
+
+    {:ok, user} = User.follow_all(user, [followed_zero, followed_one])
+    assert length(user.following) == 3
+
+    {:ok, user} = User.follow_all(user, [followed_one, followed_two])
+    assert length(user.following) == 4
   end
 
   test "follow takes a user and another user" do