Merge pull request #249 from codebender/fix/custom_404_page

just3ws · just3ws · commit 9035ebf1c382 · 2014-11-25T00:58:51.000-06:00
Display custom 404 page: invalid route / record not found - Bounty #428
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -21,8 +21,7 @@ class ApplicationController < ActionController::Base
   after_action :record_visit
   after_action :record_location
 
-  rescue_from ActiveRecord::RecordNotFound, with: :render_404 unless Rails.env.production?
-  rescue_from ActionController::RoutingError, with: :render_404 unless Rails.env.production?
+  rescue_from ActiveRecord::RecordNotFound, with: :render_404
 
   protected
 
@@ -183,7 +182,7 @@ def not_on_achievements?
   end
 
   def render_404
-    render template: 'error/not_found', status: :not_found
+    render template: 'errors/not_found', status: :not_found
   end
 
   def render_500
diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb
@@ -0,0 +1,21 @@
+class ErrorsController < ApplicationController
+  def not_found
+    render status: :not_found
+  end
+
+  def unacceptable
+    respond_to do |format|
+      format.html { render 'public/422', status: :unprocessable_entity }
+      format.xml  { head :unprocessable_entity }
+      format.json { head :unprocessable_entity }
+    end
+  end
+
+  def internal_error
+    respond_to do |format|
+      format.html { render 'public/500', status: :internal_server_error }
+      format.xml  { head :internal_server_error }
+      format.json { head :internal_server_error }
+    end
+  end
+end
diff --git a/app/views/error/not_found.json b/app/views/error/not_found.json
diff --git a/app/views/error/not_found.xml b/app/views/error/not_found.xml
diff --git a/app/views/errors/_helpful_links.html.haml b/app/views/errors/_helpful_links.html.haml
diff --git a/app/views/errors/not_found.html.haml b/app/views/errors/not_found.html.haml
@@ -9,5 +9,4 @@
         If you don't believe you should be seeing this error,
         #{ link_to "please contact us", contact_us_path }!
 
-      = render partial: "error/helpful_links"
-
+      = render partial: "errors/helpful_links"
diff --git a/app/views/errors/not_found.json b/app/views/errors/not_found.json
@@ -0,0 +1 @@
+{}
diff --git a/app/views/errors/not_found.xml b/app/views/errors/not_found.xml
@@ -0,0 +1 @@
+<error>404</error>
diff --git a/config/application.rb b/config/application.rb
@@ -39,6 +39,8 @@ class Application < Rails::Application
 
     config.rakismet.key = ENV['AKISMET_KEY']
     config.rakismet.url = ENV['AKISMET_URL']
+
+    config.exceptions_app = self.routes
   end
 end
 
diff --git a/config/routes.rb b/config/routes.rb
diff --git a/spec/features/errors/internal_error_spec.rb b/spec/features/errors/internal_error_spec.rb
@@ -0,0 +1,22 @@
+require "rails_helper"
+
+feature "Custom 500 Page" do
+  before(:all) do
+    Rails.application.config.action_dispatch.show_exceptions = true
+    Rails.application.config.consider_all_requests_local = false
+  end
+
+  after(:all) do
+    Rails.application.config.action_dispatch.show_exceptions = false
+    Rails.application.config.consider_all_requests_local = true
+  end
+
+  scenario 'User is presented 500 page when an exception is raised' do
+    allow(User).to receive(:find_by_username!).and_raise(StandardError)
+
+    visit '/user_causes_500_error'
+
+    expect(page).
+      to have_content('Coderwall had an issue but hold on to your localhosts')
+  end
+end
diff --git a/spec/features/errors/not_found_spec.rb b/spec/features/errors/not_found_spec.rb
@@ -0,0 +1,25 @@
+require "rails_helper"
+
+feature "Custom 404 Page" do
+  before(:all) do
+    Rails.application.config.action_dispatch.show_exceptions = true
+    Rails.application.config.consider_all_requests_local = false
+  end
+
+  after(:all) do
+    Rails.application.config.action_dispatch.show_exceptions = false
+    Rails.application.config.consider_all_requests_local = true
+  end
+
+  scenario 'user is presented 404 page when they visit invalid path' do
+    visit '/fake/path/doesnt/match/route'
+
+    expect(page).to have_content('Uh oh, something went wrong!')
+  end
+
+  scenario 'user is presented 404 page when then visit a bad user path' do
+    visit '/not_a_real_username'
+
+    expect(page).to have_content('Uh oh, something went wrong!')
+  end
+end
