X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fuser_search_test.exs;h=559ba59668a057e10c75aec384c2ffeb34fe2d8d;hb=79f9ddd8b725519f719219b70b8dd8558d5212cf;hp=9a74b9764b20666857d8f0ad0785d50f16b5cf27;hpb=3d2989278c2f97fb5247d0b58b99b77f400f3185;p=akkoma

diff --git a/test/user_search_test.exs b/test/user_search_test.exs
index 9a74b9764..559ba5966 100644
--- a/test/user_search_test.exs
+++ b/test/user_search_test.exs
@@ -25,11 +25,13 @@ defmodule Pleroma.UserSearchTest do
       assert found_user.id == user.id
     end
 
-    test "excludes bots from results" do
-      insert(:user, actor_type: "Service", nickname: "bot1")
-      insert(:user, actor_type: "Application", nickname: "bot2")
+    test "excludes service actors from results" do
+      insert(:user, actor_type: "Application", nickname: "user1")
+      service = insert(:user, actor_type: "Service", nickname: "user2")
+      person = insert(:user, actor_type: "Person", nickname: "user3")
 
-      assert [] = User.search("bot")
+      assert [found_user1, found_user2] = User.search("user")
+      assert [found_user1.id, found_user2.id] -- [service.id, person.id] == []
     end
 
     test "accepts limit parameter" do
@@ -44,30 +46,49 @@ defmodule Pleroma.UserSearchTest do
       assert length(User.search("john", limit: 3, offset: 3)) == 2
     end
 
-    test "finds a user by full or partial nickname" do
+    defp clear_virtual_fields(user) do
+      Map.merge(user, %{search_rank: nil, search_type: nil})
+    end
+
+    test "finds a user by full nickname or its leading fragment" do
       user = insert(:user, %{nickname: "john"})
 
       Enum.each(["john", "jo", "j"], fn query ->
         assert user ==
                  User.search(query)
                  |> List.first()
-                 |> Map.put(:search_rank, nil)
-                 |> Map.put(:search_type, nil)
+                 |> clear_virtual_fields()
       end)
     end
 
-    test "finds a user by full or partial name" do
+    test "finds a user by full name or leading fragment(s) of its words" do
       user = insert(:user, %{name: "John Doe"})
 
       Enum.each(["John Doe", "JOHN", "doe", "j d", "j", "d"], fn query ->
         assert user ==
                  User.search(query)
                  |> List.first()
-                 |> Map.put(:search_rank, nil)
-                 |> Map.put(:search_type, nil)
+                 |> clear_virtual_fields()
       end)
     end
 
+    test "matches by leading fragment of user domain" do
+      user = insert(:user, %{nickname: "arandom@dude.com"})
+      insert(:user, %{nickname: "iamthedude"})
+
+      assert [user.id] == User.search("dud") |> Enum.map(& &1.id)
+    end
+
+    test "ranks full nickname match higher than full name match" do
+      nicknamed_user = insert(:user, %{nickname: "hj@shigusegubu.club"})
+      named_user = insert(:user, %{nickname: "xyz@sample.com", name: "HJ"})
+
+      results = User.search("hj")
+
+      assert [nicknamed_user.id, named_user.id] == Enum.map(results, & &1.id)
+      assert Enum.at(results, 0).search_rank > Enum.at(results, 1).search_rank
+    end
+
     test "finds users, considering density of matched tokens" do
       u1 = insert(:user, %{name: "Bar Bar plus Word Word"})
       u2 = insert(:user, %{name: "Word Word Bar Bar Bar"})