projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'automatic-authentication-and-instance-publicity-checks' into 'develop'
[akkoma]
/
test
/
web
/
feed
/
tag_controller_test.exs
diff --git
a/test/web/feed/tag_controller_test.exs
b/test/web/feed/tag_controller_test.exs
index da1caf049559204c2a2ea14bc93cc61ff2555821..d95aac108620ae31cccef07f94fc7e17817cc51d 100644
(file)
--- a/
test/web/feed/tag_controller_test.exs
+++ b/
test/web/feed/tag_controller_test.exs
@@
-12,7
+12,7
@@
defmodule Pleroma.Web.Feed.TagControllerTest do
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Feed.FeedView
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Feed.FeedView
- clear_config([:feed])
+
setup do:
clear_config([:feed])
test "gets a feed (ATOM)", %{conn: conn} do
Pleroma.Config.put(
test "gets a feed (ATOM)", %{conn: conn} do
Pleroma.Config.put(
@@
-150,8
+150,8
@@
defmodule Pleroma.Web.Feed.TagControllerTest do
obj2 = Object.normalize(activity2)
assert xpath(xml, ~x"//channel/item/description/text()"sl) == [
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 =
]
response =