AO3-6911 Add error page for Rack::Timeout::RequestTimeoutException

app/controllers/application_controller.rb

@@ -25,6 +25,12 @@ def raise_not_found
     redirect_to '/404'
   end
 
+  rescue_from Rack::Timeout::RequestTimeoutException, with: :raise_timeout
+
+  def raise_timeout
+    redirect_to timeout_error_path
+  end
+
   helper :all # include all helpers, all the time
 
   include HtmlCleaner

app/controllers/errors_controller.rb

@@ -6,6 +6,11 @@
   end
 
   def auth_error
-    @page_subtitle = "Auth Error"
+    @page_subtitle = t(".subtitle")
+  end
+
+  def timeout_error
+    @page_subtitle = t(".subtitle")
+    render "timeout_error", status: 504, formats: :html
   end
 end

app/views/errors/timeout_error.html.erb

@@ -0,0 +1,3 @@
+<h2 class="heading"><%= t(".title") %></h2>
+<h3 class="heading"><%= t(".subtitle") %></h3>
+<p><%= t(".html", contact_support_link: link_to(t(".contact_support_link"), new_feedback_report_path)) %></p>

config/locales/controllers/en.yml

@@ -90,6 +90,11 @@ en:
       error: Sorry, that comment could not be unhidden.
       permission_denied: Sorry, you don't have permission to unhide that comment.
       success: Comment successfully unhidden!
+  errors:
+    timeout_error:
+      subtitle: "Timeout Error"
+    auth_error:
+      subtitle: "Authentication Error"
   external_works:
     update:
       successfully_updated: External work was successfully updated.

config/locales/views/en.yml

@@ -611,6 +611,12 @@ en:
         restricted_html: A translation of [Restricted Work] by %{creator_link}
         revealed_html: A translation of %{work_link} by %{creator_link}
         unrevealed: A translation of a work in an unrevealed collection
+  errors:
+    timeout_error:
+      title: Timeout
+      subtitle: The page was responding too slowly. Please try again after a few minutes.
+      html: If you still get this error after a few tries, please %{contact_support_link}.
+      contact_support_link: contact Support
   feedbacks:
     new:
       abuse:

config/routes.rb

@@ -53,6 +53,7 @@
   get '/422', to: 'errors#422'
   get '/500', to: 'errors#500'
   get '/auth_error', to: 'errors#auth_error'
+  get "/timeout_error", to: "errors#timeout_error"
 
   #### DOWNLOADS ####
 

spec/controllers/errors_controller_spec.rb

@@ -28,4 +28,20 @@
       expect(response.header["Content-Type"]).to eq("text/html; charset=utf-8")
     end
   end
+
+  describe "GET #auth_error" do
+    it "returns an HTML auth error page" do
+      get :auth_error
+      expect(response.status).to eq(200)
+      expect(response.header["Content-Type"]).to eq("text/html; charset=utf-8")
+    end
+  end
+
+  describe "GET #timeout_error" do
+    it "returns an HTML timeout error page" do
+      get :timeout_error
+      expect(response.status).to eq(504)
+      expect(response.header["Content-Type"]).to eq("text/html; charset=utf-8")
+    end
+  end
 end