From cb2bcee842f07358db4d37de1b9a32c9d69d487c Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 6 Jun 2019 16:18:27 +0200
Subject: User Search: Boost friends more strongly.

---
 test/tasks/user_test.exs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'test/tasks/user_test.exs')

diff --git a/test/tasks/user_test.exs b/test/tasks/user_test.exs
index 260ce0d95..6fd7c7113 100644
--- a/test/tasks/user_test.exs
+++ b/test/tasks/user_test.exs
@@ -366,4 +366,25 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       refute user.info.confirmation_token
     end
   end
+
+  describe "search" do
+    test "it returns users matching" do
+      user = insert(:user)
+      moon = insert(:user, nickname: "moon", name: "fediverse expert moon")
+      moot = insert(:user, nickname: "moot")
+      kawen = insert(:user, nickname: "kawen", name: "fediverse expert moon")
+
+      {:ok, user} = User.follow(user, kawen)
+
+      assert [moon.id, kawen.id] == User.Search.search("moon") |> Enum.map(& &1.id)
+      res = User.search("moo") |> Enum.map(& &1.id)
+      assert moon.id in res
+      assert moot.id in res
+      assert kawen.id in res
+      assert [moon.id, kawen.id] == User.Search.search("moon fediverse") |> Enum.map(& &1.id)
+
+      assert [kawen.id, moon.id] ==
+               User.Search.search("moon fediverse", for_user: user) |> Enum.map(& &1.id)
+    end
+  end
 end
-- 
cgit v1.2.3


From 2c63c6751203347907057c780ed8af465f182587 Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Mon, 24 Jun 2019 18:59:12 +0000
Subject: Rework user deletion

---
 test/tasks/user_test.exs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'test/tasks/user_test.exs')

diff --git a/test/tasks/user_test.exs b/test/tasks/user_test.exs
index 6fd7c7113..3d4b08fba 100644
--- a/test/tasks/user_test.exs
+++ b/test/tasks/user_test.exs
@@ -89,8 +89,7 @@ defmodule Mix.Tasks.Pleroma.UserTest do
       assert_received {:mix_shell, :info, [message]}
       assert message =~ " deleted"
 
-      user = User.get_cached_by_nickname(user.nickname)
-      assert user.info.deactivated
+      refute User.get_by_nickname(user.nickname)
     end
 
     test "no user to delete" do
-- 
cgit v1.2.3