diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-19 07:35:34 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2019-09-19 07:35:34 +0300 |
| commit | d4ed3a35b8aa34cd968113970bbab445eb251703 (patch) | |
| tree | dbbf93e12e33932d7774ab72fb54ff0ee08031d1 /test/web/web_finger | |
| parent | 2b40e57a72f3ee3209b204a5ae5e0221b1d66c7e (diff) | |
| parent | f95a2b2cda236f7c0e5ced2a4698e2b10d99fa53 (diff) | |
| download | pleroma-d4ed3a35b8aa34cd968113970bbab445eb251703.tar.gz pleroma-d4ed3a35b8aa34cd968113970bbab445eb251703.zip | |
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to 'test/web/web_finger')
| -rw-r--r-- | test/web/web_finger/web_finger_controller_test.exs | 15 | ||||
| -rw-r--r-- | test/web/web_finger/web_finger_test.exs | 2 |
2 files changed, 10 insertions, 7 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..49cd1460b 100644 --- a/test/web/web_finger/web_finger_controller_test.exs +++ b/test/web/web_finger/web_finger_controller_test.exs @@ -1,10 +1,11 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only 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 diff --git a/test/web/web_finger/web_finger_test.exs b/test/web/web_finger/web_finger_test.exs index 8fdb9adea..696c1bd70 100644 --- a/test/web/web_finger/web_finger_test.exs +++ b/test/web/web_finger/web_finger_test.exs @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.WebFingerTest do |