Tests: errors_controller_test.rb

Fixes #612

app/controllers/application_controller.rb

@@ -20,10 +20,4 @@ def allow_geoblacklight_params
   def after_message_create_path
     main_app.try(:root_path) || '/'
   end
-
-  protected
-
-  def not_found
-    raise ActionController::RoutingError.new('Not Found')
-  end
 end

app/controllers/errors_controller.rb

@@ -1,9 +1,9 @@
 class ErrorsController < ApplicationController
   def not_found
-    render status: 404, layout: 'blacklight', template: 'errors/not_found.html.erb'
+    render 'errors/not_found', status: :not_found
   end
 
   def internal_server_error
-    render status: 500, layout: 'blacklight', template: 'errors/internal_server_error.html.erb'
+    render 'errors/internal_server_error', status: :internal_server_error
   end
-end
+end

test/controllers/errors_controller_test.rb

@@ -1,19 +1,15 @@
 require 'test_helper'
 
 class ErrorsControllerTest < ActionDispatch::IntegrationTest
-  test "bad facet id should return not_found" do
-    assert_raises(ActionController::RoutingError) do
-      get '/catalog/facet/about'
-    end
-  end
-
   test "should get not_found" do
     get '/404'
-    assert_response :success
+    assert_response :not_found
+    assert_template 'errors/not_found'
   end
 
   test "should get internal_server_error" do
     get '/500'
-    assert_response :success
+    assert_response :internal_server_error
+    assert_template 'errors/internal_server_error'
   end
-end
+end