diff options
| author | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:13:56 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2020-04-20 10:15:40 -0500 |
| commit | bedc558809832ce6ef6063fe91656a0fff0e222c (patch) | |
| tree | f844a11ae25f1866bffb79d9eaf0d66aa2babcd6 /test/web/feed | |
| parent | b54c8813d632cb44c7deb207e91bd32f01f33794 (diff) | |
| parent | 28165dad3ac02a6d3ba4b0cda51992a1831515dd (diff) | |
| download | pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.tar.gz pleroma-bedc558809832ce6ef6063fe91656a0fff0e222c.zip | |
Merge remote-tracking branch 'upstream/develop' into accept-deletes
Diffstat (limited to 'test/web/feed')
| -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 = |