summaryrefslogtreecommitdiff
path: root/test/web/activity_pub/activity_pub_controller_test.exs
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-12 07:28:47 +0000
committerkaniini <nenolod@gmail.com>2018-12-12 07:28:47 +0000
commit2592b3c81a5af20536c3cc9709e3971d6cfb1e68 (patch)
tree89fba8fe2ed33bb25ef554f67e4659e255f81709 /test/web/activity_pub/activity_pub_controller_test.exs
parent2999a08e3590c43c623730b0cbf6b93045ac08c1 (diff)
parent89b3729afa130a62a47ed6372350ebfc5acb4064 (diff)
downloadpleroma-2592b3c81a5af20536c3cc9709e3971d6cfb1e68.tar.gz
pleroma-2592b3c81a5af20536c3cc9709e3971d6cfb1e68.zip
Merge branch 'support/issue_442' into 'develop'
[#442] fix warnings See merge request pleroma/pleroma!536
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 b4af2df5a..faeace016 100644
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@ -23,10 +23,10 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
test "with the relay disabled, it returns 404", %{conn: conn} do
Pleroma.Config.put([:instance, :allow_relay], false)
- res =
- conn
- |> get(activity_pub_path(conn, :relay))
- |> json_response(404)
+ conn
+ |> get(activity_pub_path(conn, :relay))
+ |> json_response(404)
+ |> assert
Pleroma.Config.put([:instance, :allow_relay], true)
end