diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-20 22:08:34 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-03-20 22:08:34 +0400 |
| commit | 80e15716102e03323b117ade919035402cc7408f (patch) | |
| tree | 60b57dde12b4feb693a6383b71f813561a48a928 /test/object | |
| parent | 5ad54d1bd556f3dc957aa1d2ebe6314618e75399 (diff) | |
| parent | d74405fc1a27bb3d13f4ead2bc2369f23827a781 (diff) | |
| download | pleroma-80e15716102e03323b117ade919035402cc7408f.tar.gz pleroma-80e15716102e03323b117ade919035402cc7408f.zip | |
Merge branch 'develop' into global-status-expiration
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, |