astrid
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to always returns html document in error pages (#12214)

pull/12379/head
Yamagishi Kazutoshi 2019-11-14 06:53:05 +09:00 committed by Eugen Rochko
parent 6c60ccee8a
commit afb398b583
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/application_controller.rb
View File

@ -136,9 +136,6 @@ class ApplicationController < ActionController::Base
end end
def respond_with_error(code) def respond_with_error(code)
respond_to do |format| render "errors/#{code}", layout: 'error', status: code
format.any { head code }
format.html { render "errors/#{code}", layout: 'error', status: code }
end
end end
end end

5
spec/controllers/application_controller_spec.rb
View File

@ -22,11 +22,6 @@ describe ApplicationController, type: :controller do
end end
shared_examples 'respond_with_error' do |code| shared_examples 'respond_with_error' do |code|
it "returns http #{code} for any" do
subject
expect(response).to have_http_status(code)
end
it "returns http #{code} for http" do it "returns http #{code} for http" do
subject subject
expect(response).to have_http_status(code) expect(response).to have_http_status(code)