projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mix format
[akkoma]
/
test
/
pleroma
/
user_search_test.exs
diff --git
a/test/pleroma/user_search_test.exs
b/test/pleroma/user_search_test.exs
index 78f042e55d94f5d512abf4cf448f02ab3b08c379..2af19b6de35a4a08624cd23eab193f395a73e6ca 100644
(file)
--- a/
test/pleroma/user_search_test.exs
+++ b/
test/pleroma/user_search_test.exs
@@
-3,7
+3,6
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.UserSearchTest do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.UserSearchTest do
- alias Pleroma.Repo
alias Pleroma.User
use Pleroma.DataCase
alias Pleroma.User
use Pleroma.DataCase
@@
-18,7
+17,7
@@
defmodule Pleroma.UserSearchTest do
setup do: clear_config([:instance, :limit_to_local_content])
test "returns a resolved user as the first result" do
setup do: clear_config([:instance, :limit_to_local_content])
test "returns a resolved user as the first result" do
-
Pleroma.Config.put
([:instance, :limit_to_local_content], false)
+
clear_config
([:instance, :limit_to_local_content], false)
user = insert(:user, %{nickname: "no_relation", ap_id: "https://lain.com/users/lain"})
_user = insert(:user, %{nickname: "com_user"})
user = insert(:user, %{nickname: "no_relation", ap_id: "https://lain.com/users/lain"})
_user = insert(:user, %{nickname: "com_user"})
@@
-65,6
+64,14
@@
defmodule Pleroma.UserSearchTest do
assert found_user.id == user.id
end
assert found_user.id == user.id
end
+ test "excludes deactivated users from results" do
+ user = insert(:user, %{nickname: "john t1000"})
+ insert(:user, %{is_active: false, nickname: "john t800"})
+
+ [found_user] = User.search("john")
+ assert found_user.id == user.id
+ end
+
# Note: as in Mastodon, `is_discoverable` doesn't anyhow relate to user searchability
test "includes non-discoverable users in results" do
insert(:user, %{nickname: "john 3000", is_discoverable: false})
# Note: as in Mastodon, `is_discoverable` doesn't anyhow relate to user searchability
test "includes non-discoverable users in results" do
insert(:user, %{nickname: "john 3000", is_discoverable: false})
@@
-199,7
+206,7
@@
defmodule Pleroma.UserSearchTest do
end
test "find only local users for authenticated users when `limit_to_local_content` is `:all`" do
end
test "find only local users for authenticated users when `limit_to_local_content` is `:all`" do
-
Pleroma.Config.put
([:instance, :limit_to_local_content], :all)
+
clear_config
([:instance, :limit_to_local_content], :all)
%{id: id} = insert(:user, %{name: "lain"})
insert(:user, %{name: "ebn", nickname: "lain@mastodon.social", local: false})
%{id: id} = insert(:user, %{name: "lain"})
insert(:user, %{name: "ebn", nickname: "lain@mastodon.social", local: false})
@@
-209,7
+216,7
@@
defmodule Pleroma.UserSearchTest do
end
test "find all users for unauthenticated users when `limit_to_local_content` is `false`" do
end
test "find all users for unauthenticated users when `limit_to_local_content` is `false`" do
-
Pleroma.Config.put
([:instance, :limit_to_local_content], false)
+
clear_config
([:instance, :limit_to_local_content], false)
u1 = insert(:user, %{name: "lain"})
u2 = insert(:user, %{name: "ebn", nickname: "lain@mastodon.social", local: false})
u1 = insert(:user, %{name: "lain"})
u2 = insert(:user, %{name: "ebn", nickname: "lain@mastodon.social", local: false})