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 14:40:17 +0300
committerMaxim Filippov <colixer@gmail.com>2019-09-16 14:40:17 +0300
commit219dca1b00a60805545dd3de433de285cc944af5 (patch)
treef8ffd4f93bf3f7bcd7ce0b789a18fb425134781a /test/web/web_finger/web_finger_controller_test.exs
parent736165c082d34ef4d52367ea8315c228a1df3944 (diff)
parent409e701ab849475c81073d80a973487d67cadaae (diff)
downloadpleroma-219dca1b00a60805545dd3de433de285cc944af5.tar.gz
pleroma-219dca1b00a60805545dd3de433de285cc944af5.zip
Merge branch 'develop' into feature/return-total-for-reports
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