luna/kemal
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Set default exception Content-Type to text/html. Fixes #202

Browse source
This commit is contained in:
sdogruyol 2016-11-06 11:58:18 +03:00
parent 87d88318de
commit 4267a5eea9
2 changed files with 27 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
spec/common_exception_handler_spec.cr
View file

@ -34,11 +34,12 @@ describe "Kemal::CommonExceptionHandler" do
io.rewind io.rewind
response = HTTP::Client::Response.from_io(io, decompress: false) response = HTTP::Client::Response.from_io(io, decompress: false)
response.status_code.should eq 403 response.status_code.should eq 403
response.headers["Content-Type"].should eq "text/html"
response.body.should eq "403 error" response.body.should eq "403 error"
end end
it "renders custom 500 error" do it "renders custom 500 error" do
error 500 do error 500 do |env|
"Something happened" "Something happened"
end end
get "/" do |env| get "/" do |env|
@ -54,6 +55,29 @@ describe "Kemal::CommonExceptionHandler" do
io.rewind io.rewind
response = HTTP::Client::Response.from_io(io, decompress: false) response = HTTP::Client::Response.from_io(io, decompress: false)
response.status_code.should eq 500 response.status_code.should eq 500
response.headers["Content-Type"].should eq "text/html"
response.body.should eq "Something happened"
end
it "keeps the specified error Content-Type" do
error 500 do |env|
"Something happened"
end
get "/" do |env|
env.response.content_type = "application/json"
env.response.status_code = 500
end
request = HTTP::Request.new("GET", "/")
io = MemoryIO.new
response = HTTP::Server::Response.new(io)
context = HTTP::Server::Context.new(request, response)
Kemal::CommonExceptionHandler::INSTANCE.next = Kemal::RouteHandler::INSTANCE
Kemal::CommonExceptionHandler::INSTANCE.call(context)
response.close
io.rewind
response = HTTP::Client::Response.from_io(io, decompress: false)
response.status_code.should eq 500
response.headers["Content-Type"].should eq "application/json"
response.body.should eq "Something happened" response.body.should eq "Something happened"
end end
end end

4
src/kemal/common_exception_handler.cr
View file

@ -20,9 +20,9 @@ module Kemal
def call_exception_with_status_code(context, status_code) def call_exception_with_status_code(context, status_code)
if Kemal.config.error_handlers.has_key?(status_code) if Kemal.config.error_handlers.has_key?(status_code)
context.response.status_code = status_code context.response.content_type = "text/html" unless context.response.headers.has_key?("Content-Type")
context.response.print Kemal.config.error_handlers[status_code].call(context) context.response.print Kemal.config.error_handlers[status_code].call(context)
return context context
end end
end end
end end