aboutsummaryrefslogtreecommitdiff
path: root/test/web/feed
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-03-20 18:33:00 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-03-20 18:33:00 +0300
commit1c05f539aaea32fe993e5299e656aa44c322e8de (patch)
treedb7724289ac074e0b70b7405d9080e50b8a8175d /test/web/feed
parent0e27c274f4f68f3385753a2482d881bae7c35a06 (diff)
downloadpleroma-1c05f539aaea32fe993e5299e656aa44c322e8de.tar.gz
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
Diffstat (limited to 'test/web/feed')
-rw-r--r--test/web/feed/tag_controller_test.exs2
-rw-r--r--test/web/feed/user_controller_test.exs4
2 files changed, 3 insertions, 3 deletions
diff --git a/test/web/feed/tag_controller_test.exs b/test/web/feed/tag_controller_test.exs
index 5950605e8..1ec39ec5d 100644
--- a/test/web/feed/tag_controller_test.exs
+++ b/test/web/feed/tag_controller_test.exs
@@ -10,7 +10,7 @@ defmodule Pleroma.Web.Feed.TagControllerTest do
alias Pleroma.Web.Feed.FeedView
- clear_config([:feed])
+ setup do: clear_config([:feed])
test "gets a feed (ATOM)", %{conn: conn} do
Pleroma.Config.put(
diff --git a/test/web/feed/user_controller_test.exs b/test/web/feed/user_controller_test.exs
index 49cfecde3..3e52eb42b 100644
--- a/test/web/feed/user_controller_test.exs
+++ b/test/web/feed/user_controller_test.exs
@@ -12,10 +12,10 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
alias Pleroma.Object
alias Pleroma.User
- clear_config([:instance, :federating], true)
+ setup do: clear_config([:instance, :federating], true)
describe "feed" do
- clear_config([:feed])
+ setup do: clear_config([:feed])
test "gets a feed", %{conn: conn} do
Config.put(