diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-04-08 18:48:10 +0700 |
commit | 9abf832b034bf3867272bd178d168c641129eff0 (patch) | |
tree | decc2cc28908a79df003ad668fb06cb74fa97159 /test/web/mastodon_api/mastodon_api_controller_test.exs | |
parent | c3d5c3513a3205313f0a2e28bb328ad5b48f2055 (diff) | |
parent | e19590c93f9adc5d743867b048aad9528810fc53 (diff) | |
download | pleroma-9abf832b034bf3867272bd178d168c641129eff0.tar.gz pleroma-9abf832b034bf3867272bd178d168c641129eff0.zip |
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
Diffstat (limited to 'test/web/mastodon_api/mastodon_api_controller_test.exs')
-rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs index cd01116e2..e16862a48 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -2342,6 +2342,22 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do assert acc_two == acc_three end + describe "custom emoji" do + test "with tags", %{conn: conn} do + [emoji | _body] = + conn + |> get("/api/v1/custom_emojis") + |> json_response(200) + + assert Map.has_key?(emoji, "shortcode") + assert Map.has_key?(emoji, "static_url") + assert Map.has_key?(emoji, "tags") + assert is_list(emoji["tags"]) + assert Map.has_key?(emoji, "url") + assert Map.has_key?(emoji, "visible_in_picker") + end + end + describe "index/2 redirections" do setup %{conn: conn} do session_opts = [ |