diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-09-14 18:29:51 +0300 | 
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-09-14 18:29:51 +0300 | 
| commit | d7457c9165b83c0f1514cf0532b5a8bdc515ea02 (patch) | |
| tree | 65209338d595c55397f85ad2295bc48b778b820e /test/web/web_finger | |
| parent | 0bd2b85edbf3b7062570778649cf2b77cc7a0bce (diff) | |
| parent | 3ae448b592214b43af1d079c997c6f6b91d31aeb (diff) | |
| download | pleroma-d7457c9165b83c0f1514cf0532b5a8bdc515ea02.tar.gz pleroma-d7457c9165b83c0f1514cf0532b5a8bdc515ea02.zip | |
Merge branch 'develop' into refactor/subscription
Diffstat (limited to 'test/web/web_finger')
| -rw-r--r-- | test/web/web_finger/web_finger_controller_test.exs | 13 | 
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 | 
