summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/views
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-03-25 09:05:17 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-03-25 09:05:17 +0300
commit012d428e1ffdd83888f339e4dbaec344202eebe1 (patch)
tree41483fdfb5c75e6d338ad48b83f7d4e621365694 /test/web/activity_pub/views
parente743c2232970e321c833604b232520587ad8e402 (diff)
parent8eebc75c152ee339bac347350266e3bc6536016b (diff)
downloadpleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.tar.gz
pleroma-012d428e1ffdd83888f339e4dbaec344202eebe1.zip
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
Diffstat (limited to 'test/web/activity_pub/views')
-rw-r--r--test/web/activity_pub/views/object_view_test.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/test/web/activity_pub/views/object_view_test.exs b/test/web/activity_pub/views/object_view_test.exs
index 09866e99b..de5ffc5b3 100644
--- a/test/web/activity_pub/views/object_view_test.exs
+++ b/test/web/activity_pub/views/object_view_test.exs
@@ -37,9 +37,7 @@ defmodule Pleroma.Web.ActivityPub.ObjectViewTest do
end
describe "note activity's `replies` collection rendering" do
- clear_config([:activitypub, :note_replies_output_limit]) do
- Pleroma.Config.put([:activitypub, :note_replies_output_limit], 5)
- end
+ setup do: clear_config([:activitypub, :note_replies_output_limit], 5)
test "renders `replies` collection for a note activity" do
user = insert(:user)