diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-10-11 15:59:35 +0300 | 
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-10-11 15:59:35 +0300 | 
| commit | c0aca32dd0aed522cfc537cc88b77f7ff254946b (patch) | |
| tree | 352f8d034c0325d370417070cec43eb32376656d /test/web/mastodon_api/controllers/search_controller_test.exs | |
| parent | aaa4252f416fbad099f95232de4cf6eab11dd7d2 (diff) | |
| parent | 44afe4c8870d14ae2cd22ff5cfa04555cf5907bd (diff) | |
| download | pleroma-c0aca32dd0aed522cfc537cc88b77f7ff254946b.tar.gz pleroma-c0aca32dd0aed522cfc537cc88b77f7ff254946b.zip  | |
Merge branch 'develop' into feature/multiple-users-activation-permissions
Diffstat (limited to 'test/web/mastodon_api/controllers/search_controller_test.exs')
| -rw-r--r-- | test/web/mastodon_api/controllers/search_controller_test.exs | 15 | 
1 files changed, 11 insertions, 4 deletions
diff --git a/test/web/mastodon_api/controllers/search_controller_test.exs b/test/web/mastodon_api/controllers/search_controller_test.exs index 49c79ff0a..0ca896e01 100644 --- a/test/web/mastodon_api/controllers/search_controller_test.exs +++ b/test/web/mastodon_api/controllers/search_controller_test.exs @@ -40,7 +40,7 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do      test "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"}) +      user_three = insert(:user, %{nickname: "shp@heldscal.la", name: "I love 2hu 天子"})        {:ok, activity} = CommonAPI.post(user, %{"status" => "This is about 2hu private"}) @@ -52,9 +52,9 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do        {: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) @@ -65,6 +65,13 @@ defmodule Pleroma.Web.MastodonAPI.SearchControllerTest do        [status] = results["statuses"]        assert status["id"] == to_string(activity.id) + +      results = +        get(conn, "/api/v2/search", %{"q" => "天子"}) +        |> json_response(200) + +      [account] == results["accounts"] +      assert account["id"] == to_string(user_three.id)      end    end  | 
