diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-10 15:07:37 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-07-10 15:07:37 +0000 |
| commit | 3ff4a06ebe3b8fc8acaa29da0c9170d006b58987 (patch) | |
| tree | dcba1470964c8407e40fb89fa1f9ac2f092f7a12 /test | |
| parent | b972b972e00d1528f77fe726e066f35cf1323cb7 (diff) | |
| parent | 252e129b1e784147cf29868bcc191f88a9b7d5b9 (diff) | |
| download | pleroma-3ff4a06ebe3b8fc8acaa29da0c9170d006b58987.tar.gz | |
Merge branch 'features/mastoapi-emoji-categories' into 'develop'
MastoAPI: Add categories to custom emojis
See merge request pleroma/pleroma!1365
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/mastodon_api/mastodon_api_controller_test.exs | 1 |
1 files changed, 1 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 64f14f794..8afb1497b 100644 --- a/test/web/mastodon_api/mastodon_api_controller_test.exs +++ b/test/web/mastodon_api/mastodon_api_controller_test.exs @@ -2958,6 +2958,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do assert Map.has_key?(emoji, "static_url") assert Map.has_key?(emoji, "tags") assert is_list(emoji["tags"]) + assert Map.has_key?(emoji, "category") assert Map.has_key?(emoji, "url") assert Map.has_key?(emoji, "visible_in_picker") end |