projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '1304-user-info-deprecation' into 'develop'
[akkoma]
/
test
/
web
/
mastodon_api
/
controllers
/
search_controller_test.exs
diff --git
a/test/web/mastodon_api/controllers/search_controller_test.exs
b/test/web/mastodon_api/controllers/search_controller_test.exs
index 49c79ff0a799140717d44002d78b94681b423d2a..7953fad62c197ada25def63fd8821988c7a19184 100644
(file)
--- a/
test/web/mastodon_api/controllers/search_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/search_controller_test.exs
@@
-42,7
+42,7
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
user_two = insert(:user, %{nickname: "shp@shitposter.club"})
user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
user_two = insert(:user, %{nickname: "shp@shitposter.club"})
user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
- {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about 2hu private"})
+ {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about 2hu private
天子
"})
{:ok, _activity} =
CommonAPI.post(user, %{
{:ok, _activity} =
CommonAPI.post(user, %{
@@
-52,9
+52,9
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
{:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"})
{:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"})
- conn = get(conn, "/api/v2/search", %{"q" => "2hu #private"})
-
-
assert results = json_response(conn,
200)
+ results =
+ get(conn, "/api/v2/search", %{"q" => "2hu #private"})
+
|> json_response(
200)
[account | _] = results["accounts"]
assert account["id"] == to_string(user_three.id)
[account | _] = results["accounts"]
assert account["id"] == to_string(user_three.id)
@@
-65,6
+65,13
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
[status] = results["statuses"]
assert status["id"] == to_string(activity.id)
[status] = results["statuses"]
assert status["id"] == to_string(activity.id)
+
+ results =
+ get(conn, "/api/v2/search", %{"q" => "天子"})
+ |> json_response(200)
+
+ [status] = results["statuses"]
+ assert status["id"] == to_string(activity.id)
end
end
end
end
@@
-197,17
+204,17
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
conn =
conn
|> assign(:user, user)
conn =
conn
|> assign(:user, user)
- |> get("/api/v1/search", %{"q" => "
shp@social.heldscal.la
", "resolve" => "true"})
+ |> get("/api/v1/search", %{"q" => "
mike@osada.macgirvin.com
", "resolve" => "true"})
assert results = json_response(conn, 200)
[account] = results["accounts"]
assert results = json_response(conn, 200)
[account] = results["accounts"]
- assert account["acct"] == "
shp@social.heldscal.la
"
+ assert account["acct"] == "
mike@osada.macgirvin.com
"
end
test "search doesn't fetch remote accounts if resolve is false", %{conn: conn} do
conn =
conn
end
test "search doesn't fetch remote accounts if resolve is false", %{conn: conn} do
conn =
conn
- |> get("/api/v1/search", %{"q" => "
shp@social.heldscal.la
", "resolve" => "false"})
+ |> get("/api/v1/search", %{"q" => "
mike@osada.macgirvin.com
", "resolve" => "false"})
assert results = json_response(conn, 200)
assert [] == results["accounts"]
assert results = json_response(conn, 200)
assert [] == results["accounts"]