summaryrefslogtreecommitdiff
path: root/test/object
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-03-20 20:47:54 +0300
commit9bae9b1b1bf4f48e20ce0b2d9b670648d052e069 (patch)
treee6755e3d585d753ad7da171a858508d4a1603a49 /test/object
parent51ce0813d351cad900966aea49a6f6d17d33f964 (diff)
parentd74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff)
downloadpleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.tar.gz
pleroma-9bae9b1b1bf4f48e20ce0b2d9b670648d052e069.zip
Merge branch 'develop' into gun
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,