aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/debug_exceptions_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-01-17 12:00:05 -0800
committerJosé Valim <jose.valim@gmail.com>2012-01-17 12:00:05 -0800
commitba154bd76fb481d9faca123e988924bd864c0318 (patch)
tree89cb9542a0717e52477e6c0ae08fd703ce80dd6d /actionpack/test/dispatch/debug_exceptions_test.rb
parent422958f17cbe1b6009313b7acd01cc11aacec3d7 (diff)
parent96a817fb2c5ca32c69469a9d2dc13630d8fa5e8a (diff)
downloadrails-ba154bd76fb481d9faca123e988924bd864c0318.tar.gz
rails-ba154bd76fb481d9faca123e988924bd864c0318.tar.bz2
rails-ba154bd76fb481d9faca123e988924bd864c0318.zip
Merge pull request #4497 from carlosantoniodasilva/action-controller-refactor
Action controller refactor - remove Compatibility module
Diffstat (limited to 'actionpack/test/dispatch/debug_exceptions_test.rb')
-rw-r--r--actionpack/test/dispatch/debug_exceptions_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index f3dc160d7d..c3a565990e 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -24,7 +24,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
when "/pass"
[404, { "X-Cascade" => "pass" }, self]
when "/not_found"
- raise ActionController::UnknownAction
+ raise AbstractController::ActionNotFound
when "/runtime_error"
raise RuntimeError
when "/method_not_allowed"
@@ -83,7 +83,7 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
get "/not_found", {}, {'action_dispatch.show_exceptions' => true}
assert_response 404
- assert_match(/#{ActionController::UnknownAction.name}/, body)
+ assert_match(/#{AbstractController::ActionNotFound.name}/, body)
get "/method_not_allowed", {}, {'action_dispatch.show_exceptions' => true}
assert_response 405