summaryrefslogtreecommitdiff
path: root/test/web/mastodon_api/controllers/search_controller_test.exs
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-10-18 16:04:57 +0000
committerkaniini <ariadne@dereferenced.org>2019-10-18 16:04:57 +0000
commit4053a82f41691195d1b29cc9eb3f6ed6814ee12f (patch)
tree31075bdd659c45b688e3b670acc5c9b41a7abc63 /test/web/mastodon_api/controllers/search_controller_test.exs
parent223c0c0136be81a363b114538948e8e0317540af (diff)
parentc2ae6310dc09e65515c7b8774d2b85b5ef7da1a1 (diff)
downloadpleroma-4053a82f41691195d1b29cc9eb3f6ed6814ee12f.tar.gz
pleroma-4053a82f41691195d1b29cc9eb3f6ed6814ee12f.zip
Merge branch 'feature/ostatus-removal' into 'develop'
ostatus removal Closes #1145 See merge request pleroma/pleroma!1854
Diffstat (limited to 'test/web/mastodon_api/controllers/search_controller_test.exs')
-rw-r--r--test/web/mastodon_api/controllers/search_controller_test.exs6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/mastodon_api/controllers/search_controller_test.exs b/test/web/mastodon_api/controllers/search_controller_test.exs
index ee413eef7..7953fad62 100644
--- a/test/web/mastodon_api/controllers/search_controller_test.exs
+++ b/test/web/mastodon_api/controllers/search_controller_test.exs
@@ -204,17 +204,17 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do
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 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
- |> 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"]