summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/activity_pub_controller_test.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-03-20 18:33:00 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-03-20 18:33:00 +0300
commit1c05f539aaea32fe993e5299e656aa44c322e8de (patch)
treedb7724289ac074e0b70b7405d9080e50b8a8175d /test/web/activity_pub/activity_pub_controller_test.exs
parent0e27c274f4f68f3385753a2482d881bae7c35a06 (diff)
downloadpleroma-1c05f539aaea32fe993e5299e656aa44c322e8de.tar.gz
pleroma-1c05f539aaea32fe993e5299e656aa44c322e8de.zip
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
Diffstat (limited to 'test/web/activity_pub/activity_pub_controller_test.exs')
-rw-r--r--test/web/activity_pub/activity_pub_controller_test.exs8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/web/activity_pub/activity_pub_controller_test.exs b/test/web/activity_pub/activity_pub_controller_test.exs
index df0c53458..573853afa 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -26,10 +26,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
:ok
end
- clear_config([:instance, :federating], true)
+ setup do: clear_config([:instance, :federating], true)
describe "/relay" do
- clear_config([:instance, :allow_relay])
+ setup do: clear_config([:instance, :allow_relay])
test "with the relay active, it returns the relay user", %{conn: conn} do
res =
@@ -1225,8 +1225,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
|> json_response(403)
end
- clear_config([:media_proxy])
- clear_config([Pleroma.Upload])
+ setup do: clear_config([:media_proxy])
+ setup do: clear_config([Pleroma.Upload])
test "POST /api/ap/upload_media", %{conn: conn} do
user = insert(:user)