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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bd3d137743f89339f8d7629a634a093435094c8e..e19d5b142f9b158cd45a954f83fc3a12773ca3d4 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -136,9 +136,6 @@ class ApplicationController < ActionController::Base
   end
 
   def respond_with_error(code)
-    respond_to do |format|
-      format.any  { head code }
-      format.html { render "errors/#{code}", layout: 'error', status: code }
-    end
+    render "errors/#{code}", layout: 'error', status: code
   end
 end

diff --git a/spec/controllers/application_controller_spec.rb b/spec/controllers/application_controller_spec.rb
index da4a794cddc30d94adcdbc8c200e2cf01173987b..63ae27a924ef98ec1120676cbec9a1affec43d9c 100644 (file)
--- a/spec/controllers/application_controller_spec.rb
+++ b/spec/controllers/application_controller_spec.rb
@@ -22,11 +22,6 @@ describe ApplicationController, type: :controller do
   end
 
   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
       subject
       expect(response).to have_http_status(code)