summaryrefslogtreecommitdiff
path: root/test/web/feed
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2020-05-01 06:21:59 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2020-05-01 06:21:59 +0300
commita92c713d9c761563c72d0f660574878aa569249a (patch)
treece88697749dbe26331b255883b4fa9631002e8b4 /test/web/feed
parent270c3fe446a374202b6d64ce487f7df29ecb1c14 (diff)
parent0dd863f8f53d30d37e35d4ec2c4e34d09a266a85 (diff)
downloadpleroma-a92c713d9c761563c72d0f660574878aa569249a.tar.gz
pleroma-a92c713d9c761563c72d0f660574878aa569249a.zip
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'test/web/feed')
-rw-r--r--test/web/feed/tag_controller_test.exs4
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 =