diff options
| author | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-03-20 16:54:55 +0000 |
| commit | d23e81903dfe5032bb20b92bcc7dfb47434ba669 (patch) | |
| tree | db7724289ac074e0b70b7405d9080e50b8a8175d /test/web/feed | |
| parent | 5efa5b0c4a08c2bf73d6926ee7c418e31a04195c (diff) | |
| parent | 1c05f539aaea32fe993e5299e656aa44c322e8de (diff) | |
| download | pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.tar.gz | |
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management
See merge request pleroma/pleroma!2312
Diffstat (limited to 'test/web/feed')
| -rw-r--r-- | test/web/feed/tag_controller_test.exs | 2 | ||||
| -rw-r--r-- | test/web/feed/user_controller_test.exs | 6 |
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 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 00c50f003..3e52eb42b 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( |