diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-03-29 06:57:34 +0300 |
commit | dfd2c741849e9afaf35e3ddbecbb50feb47f5d22 (patch) | |
tree | 92d77142391ed6eab45a4bec792ed02be91fbe39 /test/object | |
parent | edb659dc579fe56227adef0b0704ff13b6ef717e (diff) | |
parent | 4e81b4b190161ebb0c496c682fa8e1e0c38a3903 (diff) | |
download | pleroma-dfd2c741849e9afaf35e3ddbecbb50feb47f5d22.tar.gz |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'test/object')
-rw-r--r-- | test/object/fetcher_test.exs | 5 |
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, |