aboutsummaryrefslogtreecommitdiff
path: root/test/web/twitter_api
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-04-08 09:50:00 +0000
committerlambda <lain@soykaf.club>2019-04-08 09:50:00 +0000
commit23067908de957bb1e7ad2c87e64ae91e4328cb87 (patch)
tree2c75327c2b35d5759eb971d5486a7f30bef8d386 /test/web/twitter_api
parentb177e1e7f330ff1531be190949db7f75e378a449 (diff)
parent7410aee886fbb38615bb595b8b7be0722761a0a4 (diff)
downloadpleroma-23067908de957bb1e7ad2c87e64ae91e4328cb87.tar.gz
Merge branch 'feature/770-add-emoji-tags' into 'develop'
Feature/770 add emoji tags See merge request pleroma/pleroma!998
Diffstat (limited to 'test/web/twitter_api')
-rw-r--r--test/web/twitter_api/util_controller_test.exs21
1 files changed, 21 insertions, 0 deletions
diff --git a/test/web/twitter_api/util_controller_test.exs b/test/web/twitter_api/util_controller_test.exs
index e4dd97d46..410f20f87 100644
--- a/test/web/twitter_api/util_controller_test.exs
+++ b/test/web/twitter_api/util_controller_test.exs
@@ -170,6 +170,27 @@ defmodule Pleroma.Web.TwitterAPI.UtilControllerTest do
end
end
+ describe "/api/pleroma/emoji" do
+ test "returns json with custom emoji with tags", %{conn: conn} do
+ [emoji | _body] =
+ conn
+ |> get("/api/pleroma/emoji")
+ |> json_response(200)
+
+ [key] = Map.keys(emoji)
+
+ %{
+ ^key => %{
+ "image_url" => url,
+ "tags" => tags
+ }
+ } = emoji
+
+ assert is_binary(url)
+ assert is_list(tags)
+ end
+ end
+
describe "GET /ostatus_subscribe?acct=...." do
test "adds status to pleroma instance if the `acct` is a status", %{conn: conn} do
conn =