Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

[akkoma] / test / user_test.exs

diff --git a/test/user_test.exs b/test/user_test.exs
index ae9a48e743cc8ddc36a82ffbb0b9c3e96f25f06b..151b9afc04d482c732ef208b7be37e49db5e8e8c 100644 (file)
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -9,11 +9,6 @@ defmodule Pleroma.UserTest do
   import Ecto.Query
 
   test "ap_id returns the activity pub id for the user" do
-    host =
-      Application.get_env(:pleroma, Pleroma.Web.Endpoint)
-      |> Keyword.fetch!(:url)
-      |> Keyword.fetch!(:host)
-
     user = UserBuilder.build
 
     expected_ap_id = "#{Pleroma.Web.base_url}/users/#{user.nickname}"
@@ -213,7 +208,9 @@ defmodule Pleroma.UserTest do
 
       {:ok, res} = User.get_followers(user)
 
-      assert res == [follower_one, follower_two]
+      assert Enum.member?(res, follower_one)
+      assert Enum.member?(res, follower_two)
+      refute Enum.member?(res, not_follower)
     end
 
     test "gets all friends (followed users) for a given user" do
@@ -229,7 +226,9 @@ defmodule Pleroma.UserTest do
 
       followed_one = User.get_by_ap_id(followed_one.ap_id)
       followed_two = User.get_by_ap_id(followed_two.ap_id)
-      assert res == [followed_one, followed_two]
+      assert Enum.member?(res, followed_one)
+      assert Enum.member?(res, followed_two)
+      refute Enum.member?(res, not_followed)
     end
   end
 
@@ -274,5 +273,28 @@ defmodule Pleroma.UserTest do
       assert user.info["follower_count"] == 1
     end
   end
+
+  describe "blocks" do
+    test "it blocks people" do
+      user = insert(:user)
+      blocked_user = insert(:user)
+
+      refute User.blocks?(user, blocked_user)
+
+      {:ok, user} = User.block(user, blocked_user)
+
+      assert User.blocks?(user, blocked_user)
+    end
+
+    test "it unblocks users" do
+      user = insert(:user)
+      blocked_user = insert(:user)
+
+      {:ok, user} = User.block(user, blocked_user)
+      {:ok, user} = User.unblock(user, blocked_user)
+
+      refute User.blocks?(user, blocked_user)
+    end
+  end
 end