X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fuser_test.exs;h=151b9afc04d482c732ef208b7be37e49db5e8e8c;hb=33beb51da423f5f80311453ad9025aa66984eb12;hp=81827afa318a11e43d88dd6d8a8bd73f8e25b92b;hpb=44aef2183e0f44dbb8619ad3438e80cca67fb5cb;p=akkoma

diff --git a/test/user_test.exs b/test/user_test.exs
index 81827afa3..151b9afc0 100644
--- 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}"
@@ -37,6 +32,9 @@ defmodule Pleroma.UserTest do
 
     user = Repo.get(User, user.id)
 
+    followed = User.get_by_ap_id(followed.ap_id)
+    assert followed.info["follower_count"] == 1
+
     assert user.following == [User.ap_followers(followed)]
   end
 
@@ -210,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
@@ -224,7 +224,76 @@ defmodule Pleroma.UserTest do
 
       {:ok, res} = User.get_friends(user)
 
-      assert res == [followed_one, followed_two]
+      followed_one = User.get_by_ap_id(followed_one.ap_id)
+      followed_two = User.get_by_ap_id(followed_two.ap_id)
+      assert Enum.member?(res, followed_one)
+      assert Enum.member?(res, followed_two)
+      refute Enum.member?(res, not_followed)
+    end
+  end
+
+  describe "updating note and follower count" do
+    test "it sets the info->note_count property" do
+      note = insert(:note)
+
+      user = User.get_by_ap_id(note.data["actor"])
+
+      assert user.info["note_count"] == nil
+
+      {:ok, user} = User.update_note_count(user)
+
+      assert user.info["note_count"] == 1
+    end
+
+    test "it increases the info->note_count property" do
+      note = insert(:note)
+      user = User.get_by_ap_id(note.data["actor"])
+
+      assert user.info["note_count"] == nil
+
+      {:ok, user} = User.increase_note_count(user)
+
+      assert user.info["note_count"] == 1
+
+      {:ok, user} = User.increase_note_count(user)
+
+      assert user.info["note_count"] == 2
+    end
+
+    test "it sets the info->follower_count property" do
+      user = insert(:user)
+      follower = insert(:user)
+
+      User.follow(follower, user)
+
+      assert user.info["follower_count"] == nil
+
+      {:ok, user} = User.update_follower_count(user)
+
+      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