diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-16 18:38:58 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-16 18:38:58 +0000 |
| commit | 28bcde5d982ee0cd7bfac68585311661f19de2c4 (patch) | |
| tree | e07ebc7ace22fc1078d5b500fe02e0c7bf13e1eb /test | |
| parent | 0ddee13c832df08da65ad0b1b7c11eea18afba26 (diff) | |
| parent | 4d330d9df13b7ff5d24fdd8b4eec1e111fa51297 (diff) | |
| download | pleroma-28bcde5d982ee0cd7bfac68585311661f19de2c4.tar.gz pleroma-28bcde5d982ee0cd7bfac68585311661f19de2c4.zip | |
Merge branch 'fix/1691-feed-render' into 'develop'
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
Diffstat (limited to 'test')
| -rw-r--r-- | test/web/feed/tag_controller_test.exs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/web/feed/tag_controller_test.exs b/test/web/feed/tag_controller_test.exs index e863df86b..d95aac108 100644 --- a/test/web/feed/tag_controller_test.exs +++ b/test/web/feed/tag_controller_test.exs @@ -150,8 +150,8 @@ defmodule Pleroma.Web.Feed.TagControllerTest do obj2 = Object.normalize(activity2) assert xpath(xml, ~x"//channel/item/description/text()"sl) == [ - HtmlEntities.decode(FeedView.activity_content(obj2)), - HtmlEntities.decode(FeedView.activity_content(obj1)) + HtmlEntities.decode(FeedView.activity_content(obj2.data)), + HtmlEntities.decode(FeedView.activity_content(obj1.data)) ] response = |