summaryrefslogtreecommitdiff
path: root/test/web/feed
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-04-17 15:51:24 +0200
committerlain <lain@soykaf.club>2020-04-17 15:51:24 +0200
commit8c2c325598dcd85f76752a17b39ce27689a65250 (patch)
tree5283acd447e60c401631aab4b01768d3f79d142e /test/web/feed
parent372614cfd3119b589c9c47619445714e8ae6c07e (diff)
parent6936854878860d1f6d04db1cd14a00208c6a5728 (diff)
downloadpleroma-8c2c325598dcd85f76752a17b39ce27689a65250.tar.gz
pleroma-8c2c325598dcd85f76752a17b39ce27689a65250.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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 =