summaryrefslogtreecommitdiff
path: root/test/web/feed
diff options
context:
space:
mode:
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.exs6
2 files changed, 3 insertions, 5 deletions
diff --git a/test/web/feed/tag_controller_test.exs b/test/web/feed/tag_controller_test.exs
index da1caf049..e863df86b 100644
--- 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(
diff --git a/test/web/feed/user_controller_test.exs b/test/web/feed/user_controller_test.exs
index 5c91c33d8..05ad427c2 100644
--- a/test/web/feed/user_controller_test.exs
+++ b/test/web/feed/user_controller_test.exs
@@ -12,12 +12,10 @@ defmodule Pleroma.Web.Feed.UserControllerTest do
alias Pleroma.Object
alias Pleroma.User
- clear_config([:instance, :federating]) do
- Config.put([:instance, :federating], true)
- end
+ 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(