summaryrefslogtreecommitdiff
path: root/test/object
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-03-20 16:54:55 +0000
committerlain <lain@soykaf.club>2020-03-20 16:54:55 +0000
commitd23e81903dfe5032bb20b92bcc7dfb47434ba669 (patch)
treedb7724289ac074e0b70b7405d9080e50b8a8175d /test/object
parent5efa5b0c4a08c2bf73d6926ee7c418e31a04195c (diff)
parent1c05f539aaea32fe993e5299e656aa44c322e8de (diff)
downloadpleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.tar.gz
pleroma-d23e81903dfe5032bb20b92bcc7dfb47434ba669.zip
Merge branch 'clear-config-test-improvements' into 'develop'
Improved in-test config management See merge request pleroma/pleroma!2312
Diffstat (limited to 'test/object')
-rw-r--r--test/object/fetcher_test.exs5
1 files changed, 2 insertions, 3 deletions
diff --git a/test/object/fetcher_test.exs b/test/object/fetcher_test.exs
index 4775ee152..c06e91f12 100644
--- a/test/object/fetcher_test.exs
+++ b/test/object/fetcher_test.exs
@@ -28,8 +28,7 @@ defmodule Pleroma.Object.FetcherTest do
describe "max thread distance restriction" do
@ap_id "http://mastodon.example.org/@admin/99541947525187367"
-
- clear_config([:instance, :federation_incoming_replies_max_depth])
+ setup do: clear_config([:instance, :federation_incoming_replies_max_depth])
test "it returns thread depth exceeded error if thread depth is exceeded" do
Pleroma.Config.put([:instance, :federation_incoming_replies_max_depth], 0)
@@ -160,7 +159,7 @@ defmodule Pleroma.Object.FetcherTest do
end
describe "signed fetches" do
- clear_config([:activitypub, :sign_object_fetches])
+ setup do: clear_config([:activitypub, :sign_object_fetches])
test_with_mock "it signs fetches when configured to do so",
Pleroma.Signature,