summaryrefslogtreecommitdiff
path: root/test/web/web_finger/web_finger_controller_test.exs
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-09-16 19:44:06 +0300
committerMaxim Filippov <colixer@gmail.com>2019-09-16 19:44:06 +0300
commitdf15ed13d15db5b5a371345fcb9968b5af4100af (patch)
tree02f8834a25733ed7ee02fa9aa4dd66b606f78030 /test/web/web_finger/web_finger_controller_test.exs
parentd1abf7a3585e4bc1ebea4f615ae2e149d5a56918 (diff)
parenta58f29b826333c1ecb0907228f0e087a3ecd9778 (diff)
downloadpleroma-df15ed13d15db5b5a371345fcb9968b5af4100af.tar.gz
pleroma-df15ed13d15db5b5a371345fcb9968b5af4100af.zip
Merge branch 'develop' into feature/moderation-log-filters
Diffstat (limited to 'test/web/web_finger/web_finger_controller_test.exs')
-rw-r--r--test/web/web_finger/web_finger_controller_test.exs13
1 files changed, 8 insertions, 5 deletions
diff --git a/test/web/web_finger/web_finger_controller_test.exs b/test/web/web_finger/web_finger_controller_test.exs
index e23086b2a..bd3ccaaf7 100644
--- a/test/web/web_finger/web_finger_controller_test.exs
+++ b/test/web/web_finger/web_finger_controller_test.exs
@@ -5,6 +5,7 @@
defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do
use Pleroma.Web.ConnCase
+ import ExUnit.CaptureLog
import Pleroma.Factory
import Tesla.Mock
@@ -75,11 +76,13 @@ defmodule Pleroma.Web.WebFinger.WebFingerControllerTest do
test "Sends a 404 when invalid format" do
user = insert(:user)
- assert_raise Phoenix.NotAcceptableError, fn ->
- build_conn()
- |> put_req_header("accept", "text/html")
- |> get("/.well-known/webfinger?resource=acct:#{user.nickname}@localhost")
- end
+ assert capture_log(fn ->
+ assert_raise Phoenix.NotAcceptableError, fn ->
+ build_conn()
+ |> put_req_header("accept", "text/html")
+ |> get("/.well-known/webfinger?resource=acct:#{user.nickname}@localhost")
+ end
+ end) =~ "no supported media type in accept header"
end
test "Sends a 400 when resource param is missing" do