Merge remote-tracking branch 'upstream/pull/4929'

[rails.git] / test / controllers / errors_controller_test.rb

diff --git a/test/controllers/errors_controller_test.rb b/test/controllers/errors_controller_test.rb
index 01b07efc89a998eaf5ddd2cf69e2e8fd75182d2f..253cbbdc0bf795463afd2061ee610c789b11b663 100644 (file)
--- a/test/controllers/errors_controller_test.rb
+++ b/test/controllers/errors_controller_test.rb
@@ -1,7 +1,11 @@
 require "test_helper"
 
 require "test_helper"
 

-class ErrorsControllerTest < ActionController::TestCase
+class ErrorsControllerTest < ActionDispatch::IntegrationTest

   def test_routes
   def test_routes

+    assert_routing(
+      { :path => "/400", :method => :get },
+      { :controller => "errors", :action => "bad_request" }
+    )

     assert_routing(
       { :path => "/403", :method => :get },
       { :controller => "errors", :action => "forbidden" }
     assert_routing(
       { :path => "/403", :method => :get },
       { :controller => "errors", :action => "forbidden" }


@@ -16,18 +20,23 @@ class ErrorsControllerTest < ActionController::TestCase
     )
   end
 
     )
   end
 

+  def test_bad_request
+    get "/400"
+    assert_response :bad_request
+  end
+

   def test_forbidden
   def test_forbidden

-    get :forbidden
+    get "/403"

     assert_response :forbidden
   end
 
   def test_not_found
     assert_response :forbidden
   end
 
   def test_not_found

-    get :not_found
+    get "/404"

     assert_response :not_found
   end
 
   def test_internal_server_error
     assert_response :not_found
   end
 
   def test_internal_server_error

-    get :internal_server_error
+    get "/500"

     assert_response :internal_server_error
   end
 end
     assert_response :internal_server_error
   end
 end