diff options
author | lambda <lain@soykaf.club> | 2019-05-03 17:26:39 +0000 |
---|---|---|
committer | lambda <lain@soykaf.club> | 2019-05-03 17:26:39 +0000 |
commit | 4948a73e3787a32140e433ded59be460ec29e8d7 (patch) | |
tree | 9efa30a7f425eda2efe4ae3f36edc875dad73458 /test/web/twitter_api/views | |
parent | 027ded0df799266d74d9680bd7ef24450efc910f (diff) | |
parent | b5ad1715b2d4a2a5bdaefa2d56bde71120d23acb (diff) | |
download | pleroma-4948a73e3787a32140e433ded59be460ec29e8d7.tar.gz pleroma-4948a73e3787a32140e433ded59be460ec29e8d7.zip |
Merge branch 'bugfix/emoji-size' into 'develop'
Bugfix: emoji size in profile
Closes #269
See merge request pleroma/pleroma!792
Diffstat (limited to 'test/web/twitter_api/views')
-rw-r--r-- | test/web/twitter_api/views/activity_view_test.exs | 2 | ||||
-rw-r--r-- | test/web/twitter_api/views/user_view_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/web/twitter_api/views/activity_view_test.exs b/test/web/twitter_api/views/activity_view_test.exs index 85815ba7e..1aa533b48 100644 --- a/test/web/twitter_api/views/activity_view_test.exs +++ b/test/web/twitter_api/views/activity_view_test.exs @@ -100,7 +100,7 @@ defmodule Pleroma.Web.TwitterAPI.ActivityViewTest do expected = ":firefox: meow" expected_html = - "<img height=\"32px\" width=\"32px\" alt=\"firefox\" title=\"firefox\" src=\"http://localhost:4001/emoji/Firefox.gif\" /> meow" + "<img class=\"emoji\" alt=\"firefox\" title=\"firefox\" src=\"http://localhost:4001/emoji/Firefox.gif\" /> meow" assert result["summary"] == expected assert result["summary_html"] == expected_html diff --git a/test/web/twitter_api/views/user_view_test.exs b/test/web/twitter_api/views/user_view_test.exs index c99dbddeb..74526673c 100644 --- a/test/web/twitter_api/views/user_view_test.exs +++ b/test/web/twitter_api/views/user_view_test.exs @@ -32,7 +32,7 @@ defmodule Pleroma.Web.TwitterAPI.UserViewTest do test "A user with emoji in username" do expected = - "<img height=\"32px\" width=\"32px\" alt=\"karjalanpiirakka\" title=\"karjalanpiirakka\" src=\"/file.png\" /> man" + "<img class=\"emoji\" alt=\"karjalanpiirakka\" title=\"karjalanpiirakka\" src=\"/file.png\" /> man" user = insert(:user, %{ |