summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/search_controller_test.exs
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-07-03 10:36:41 -0500
committerMark Felder <feld@FreeBSD.org>2020-07-03 10:36:41 -0500
commit4695bdd81bf9d2caed4337473d35ba021527e8a8 (patch)
tree0bc60c1bbc03d994701a282f47d32e856b54cff0 /test/web/mastodon_api/controllers/search_controller_test.exs
parentcc837f9d157f9d43a015a8908f5e2ee178442041 (diff)
parentc2a052a346d5104c3657343a885255d4d7179c75 (diff)
downloadpleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.tar.gz
pleroma-4695bdd81bf9d2caed4337473d35ba021527e8a8.zip
Merge branch 'develop' into issue/1790-updated-oban
Diffstat (limited to 'test/web/mastodon_api/controllers/search_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/search_controller_test.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/test/web/mastodon_api/controllers/search_controller_test.exs b/test/web/mastodon_api/controllers/search_controller_test.exs
index 826f37fbc..24d1959f8 100644
--- a/test/web/mastodon_api/controllers/search_controller_test.exs
+++ b/test/web/mastodon_api/controllers/search_controller_test.exs
@@ -79,6 +79,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
assert status["id"] == to_string(activity.id)
end
+ @tag capture_log: true
test "constructs hashtags from search query", %{conn: conn} do
results =
conn
@@ -318,11 +319,13 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
test "search fetches remote accounts", %{conn: conn} do
user = insert(:user)
+ query = URI.encode_query(%{q: " mike@osada.macgirvin.com ", resolve: true})
+
results =
conn
|> assign(:user, user)
|> assign(:token, insert(:oauth_token, user: user, scopes: ["read"]))
- |> get("/api/v1/search?q=mike@osada.macgirvin.com&resolve=true")
+ |> get("/api/v1/search?#{query}")
|> json_response_and_validate_schema(200)
[account] = results["accounts"]