diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-22 02:07:19 +0000 |
| commit | 7fcbda702e76b6390076c28832f5aea80086d15a (patch) | |
| tree | 265bf6acf11ad7987850c8733ea1b36248cc8c24 /test/web/twitter_api/views | |
| parent | 6c0e07b8bdc85f757e2d1e6993e64f2e1540deb6 (diff) | |
| parent | 3cefdc62e0dda75985221853fb123572d6fc068b (diff) | |
| download | pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.tar.gz pleroma-7fcbda702e76b6390076c28832f5aea80086d15a.zip | |
Merge branch 'rework-emoji-management' into 'develop'
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
Diffstat (limited to 'test/web/twitter_api/views')
| -rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index b5440c612..d84ab7420 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -91,16 +91,16 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do test "a create activity with a summary containing emoji" do {:ok, activity} = CommonAPI.post(insert(:user), %{ - "spoiler_text" => ":woollysocks: meow", + "spoiler_text" => ":firefox: meow", "status" => "." }) result = ActivityView.render("activity.json", activity: activity) - expected = ":woollysocks: meow" + expected = ":firefox: meow" expected_html = - "<img height=\"32px\" width=\"32px\" alt=\"woollysocks\" title=\"woollysocks\" src=\"http://localhost:4001/finmoji/128px/woollysocks-128.png\" /> meow" + "<img height=\"32px\" width=\"32px\" alt=\"firefox\" title=\"firefox\" src=\"http://localhost:4001/emoji/Firefox.gif\" /> meow" assert result["summary"] == expected assert result["summary_html"] == expected_html |