From 959e993c7d112d9a30baae3d403687903a7f6a27 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Sat, 16 Sep 2017 16:40:20 +0200 Subject: Apply incoming custom emoji. --- .../web/twitter_api/representers/activity_representer_test.exs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'test/web') diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index 500afdac7..f08644611 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -70,7 +70,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do } } - content_html = "Some content mentioning @shp" + content_html = "Some :2hu: content mentioning @shp" content = HtmlSanitizeEx.strip_tags(content_html) date = DateTime.from_naive!(~N[2016-05-24 13:26:08.003], "Etc/UTC") |> DateTime.to_iso8601 @@ -99,7 +99,10 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do "like_count" => 5, "announcement_count" => 3, "context" => "2hu", - "tag" => ["content", "mentioning", "nsfw"] + "tag" => ["content", "mentioning", "nsfw"], + "emoji" => %{ + "2hu" => "corndog.png" + } }, "published" => date, "context" => "2hu" @@ -107,12 +110,13 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do local: false } + expected_html = "alert('YAY')Some 2hu content mentioning @shp" expected_status = %{ "id" => activity.id, "user" => UserView.render("show.json", %{user: user, for: follower}), "is_local" => false, - "statusnet_html" => HtmlSanitizeEx.basic_html(content_html), + "statusnet_html" => expected_html, "text" => content, "is_post_verb" => true, "created_at" => "Tue May 24 13:26:08 +0000 2016", -- cgit v1.2.3