projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
[akkoma]
/
test
/
web
/
activity_pub
/
activity_pub_controller_test.exs
diff --git
a/test/web/activity_pub/activity_pub_controller_test.exs
b/test/web/activity_pub/activity_pub_controller_test.exs
index 01c955c0a547f4e1d305749ee3deb7e5cc08564c..fbacb399335cd5bc56e4e198504175a98f8776b5 100644
(file)
--- a/
test/web/activity_pub/activity_pub_controller_test.exs
+++ b/
test/web/activity_pub/activity_pub_controller_test.exs
@@
-26,12
+26,10
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
:ok
end
:ok
end
- clear_config([:instance, :federating]) do
- Config.put([:instance, :federating], true)
- end
+ setup do: clear_config([:instance, :federating], true)
describe "/relay" do
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 =
test "with the relay active, it returns the relay user", %{conn: conn} do
res =
@@
-1227,8
+1225,8
@@
defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
|> json_response(403)
end
|> 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)
test "POST /api/ap/upload_media", %{conn: conn} do
user = insert(:user)