summaryrefslogtreecommitdiff
path: root/test/web/views
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2019-06-03 09:12:17 -0500
committerMark Felder <feld@FreeBSD.org>2019-06-03 09:12:17 -0500
commitf4e2595592ccca6cedd64669baef7bdd2a6547d0 (patch)
tree6806a79345c7599b0d436df8b6c46e75b54d1292 /test/web/views
parent3c4cab9be18ff543d025177b418ddd0b16050e68 (diff)
parent9789e000b05621435dc0c03833f564481e0b80e6 (diff)
downloadpleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.tar.gz
pleroma-f4e2595592ccca6cedd64669baef7bdd2a6547d0.zip
Merge branch 'develop' into update-oauth-template
Diffstat (limited to 'test/web/views')
-rw-r--r--test/web/views/error_view_test.exs19
1 files changed, 13 insertions, 6 deletions
diff --git a/test/web/views/error_view_test.exs b/test/web/views/error_view_test.exs
index d529fd2c3..3857d585f 100644
--- a/test/web/views/error_view_test.exs
+++ b/test/web/views/error_view_test.exs
@@ -4,6 +4,7 @@
defmodule Pleroma.Web.ErrorViewTest do
use Pleroma.Web.ConnCase, async: true
+ import ExUnit.CaptureLog
# Bring render/3 and render_to_string/3 for testing custom views
import Phoenix.View
@@ -13,17 +14,23 @@ defmodule Pleroma.Web.ErrorViewTest do
end
test "render 500.json" do
- assert render(Pleroma.Web.ErrorView, "500.json", []) ==
- %{errors: %{detail: "Internal server error", reason: "nil"}}
+ assert capture_log(fn ->
+ assert render(Pleroma.Web.ErrorView, "500.json", []) ==
+ %{errors: %{detail: "Internal server error", reason: "nil"}}
+ end) =~ "[error] Internal server error: nil"
end
test "render any other" do
- assert render(Pleroma.Web.ErrorView, "505.json", []) ==
- %{errors: %{detail: "Internal server error", reason: "nil"}}
+ assert capture_log(fn ->
+ assert render(Pleroma.Web.ErrorView, "505.json", []) ==
+ %{errors: %{detail: "Internal server error", reason: "nil"}}
+ end) =~ "[error] Internal server error: nil"
end
test "render 500.json with reason" do
- assert render(Pleroma.Web.ErrorView, "500.json", reason: "test reason") ==
- %{errors: %{detail: "Internal server error", reason: "\"test reason\""}}
+ assert capture_log(fn ->
+ assert render(Pleroma.Web.ErrorView, "500.json", reason: "test reason") ==
+ %{errors: %{detail: "Internal server error", reason: "\"test reason\""}}
+ end) =~ "[error] Internal server error: \"test reason\""
end
end