aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/routing_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
-rw-r--r--actionpack/test/controller/routing_test.rb9
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index d52da58807..a9a970d67d 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -976,7 +976,7 @@ class RouteSetTest < ActiveSupport::TestCase
params = set.recognize_path("/people", :method => :put)
assert_equal("update", params[:action])
- assert_raise(ActionController::NotImplemented) {
+ assert_raise(ActionController::RoutingError) {
set.recognize_path("/people", :method => :bacon)
}
@@ -992,12 +992,9 @@ class RouteSetTest < ActiveSupport::TestCase
assert_equal("destroy", params[:action])
assert_equal("5", params[:id])
- begin
+ assert_raise(ActionController::RoutingError) {
set.recognize_path("/people/5", :method => :post)
- flunk 'Should have raised MethodNotAllowed'
- rescue ActionController::MethodNotAllowed => e
- assert_equal [:get, :put, :delete], e.allowed_methods
- end
+ }
end
def test_recognize_with_alias_in_conditions