diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:58:39 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-07-12 05:58:39 +0000 |
| commit | 4a922305afb9b445d11522be73428f10a7d1fc19 (patch) | |
| tree | c01932f082fa5a4ef5f7726b78e7f2aaacef5fab /test | |
| parent | 14054dd582f905439bb73368335f93bbb9bc23c7 (diff) | |
| parent | 971bb4f2bde125c1f8397c244a6fbdec0d26716b (diff) | |
| download | pleroma-4a922305afb9b445d11522be73428f10a7d1fc19.tar.gz pleroma-4a922305afb9b445d11522be73428f10a7d1fc19.zip | |
Merge branch 'feature/article-support' into 'develop'
article support (plume, etc)
See merge request pleroma/pleroma!240
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/twitter_api/representers/activity_representer_test.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/web/twitter_api/representers/activity_representer_test.exs b/test/web/twitter_api/representers/activity_representer_test.exs index 16c6e7b0d..7505093dd 100644 --- a/test/web/twitter_api/representers/activity_representer_test.exs +++ b/test/web/twitter_api/representers/activity_representer_test.exs @@ -126,7 +126,7 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenterTest do } expected_html = - "<span>2hu</span><br />alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{ + "<p>2hu</p>alert('YAY')Some <img height='32px' width='32px' alt='2hu' title='2hu' src='corndog.png' /> content mentioning <a href=\"#{ mentioned_user.ap_id }\">@shp</a>" |