projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into feature/tag_feed
[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 ee413eef7c8219a4f132f7df794db8397f185a29..7fedf42e5320b87a0269cad0f924ad3935799718 100644
(file)
--- a/
test/web/mastodon_api/controllers/search_controller_test.exs
+++ b/
test/web/mastodon_api/controllers/search_controller_test.exs
@@
-77,13
+77,11
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
describe ".account_search" do
test "account search", %{conn: conn} do
describe ".account_search" do
test "account search", %{conn: conn} do
- user = insert(:user)
user_two = insert(:user, %{nickname: "shp@shitposter.club"})
user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
results =
conn
user_two = insert(:user, %{nickname: "shp@shitposter.club"})
user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu"})
results =
conn
- |> assign(:user, user)
|> get("/api/v1/accounts/search", %{"q" => "shp"})
|> json_response(200)
|> get("/api/v1/accounts/search", %{"q" => "shp"})
|> json_response(200)
@@
-94,7
+92,6
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
results =
conn
results =
conn
- |> assign(:user, user)
|> get("/api/v1/accounts/search", %{"q" => "2hu"})
|> json_response(200)
|> get("/api/v1/accounts/search", %{"q" => "2hu"})
|> json_response(200)
@@
-104,11
+101,10
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
end
test "returns account if query contains a space", %{conn: conn} do
end
test "returns account if query contains a space", %{conn: conn} do
-
user =
insert(:user, %{nickname: "shp@shitposter.club"})
+ insert(:user, %{nickname: "shp@shitposter.club"})
results =
conn
results =
conn
- |> assign(:user, user)
|> get("/api/v1/accounts/search", %{"q" => "shp@shitposter.club xxx "})
|> json_response(200)
|> get("/api/v1/accounts/search", %{"q" => "shp@shitposter.club xxx "})
|> json_response(200)
@@
-165,15
+161,20
@@
defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
assert status["id"] == to_string(activity.id)
end
assert status["id"] == to_string(activity.id)
end
- test "search fetches remote statuses", %{conn: conn} do
+ test "search fetches remote statuses
and prefers them over other results
", %{conn: conn} do
capture_log(fn ->
capture_log(fn ->
+ {:ok, %{id: activity_id}} =
+ CommonAPI.post(insert(:user), %{
+ "status" => "check out https://shitposter.club/notice/2827873"
+ })
+
conn =
conn
|> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
assert results = json_response(conn, 200)
conn =
conn
|> get("/api/v1/search", %{"q" => "https://shitposter.club/notice/2827873"})
assert results = json_response(conn, 200)
- [status] = results["statuses"]
+ [status
, %{"id" => ^activity_id}
] = results["statuses"]
assert status["uri"] ==
"tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
assert status["uri"] ==
"tag:shitposter.club,2017-05-05:noticeId=2827873:objectType=comment"
@@
-204,17
+205,18
@@
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"})
+ |> assign(:token, insert(:oauth_token, user: user, scopes: ["read"]))
+ |> 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"]