projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma 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..e863df86b0c7fa987a02149b98e5c99f40586696 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
- clear_config([:feed])
+
setup do:
clear_config([:feed])
test "gets a feed (ATOM)", %{conn: conn} do
Pleroma.Config.put(