kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #2549 from trek/RoutingErrorForMissingControllers

Browse source 
When a route references a missing controller, raise ActionController::RoutingError with clearer message
This commit is contained in:
Aaron Patterson 2012-05-21 11:00:43 -07:00
commit 513a0525c2
2 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
actionpack/lib/action_dispatch/routing/route_set.rb
View file

@ -663,9 +663,13 @@ module ActionDispatch
dispatcher = dispatcher.app dispatcher = dispatcher.app
end end
if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false) if dispatcher.is_a?(Dispatcher)
dispatcher.prepare_params!(params) if dispatcher.controller(params, false)
return params dispatcher.prepare_params!(params)
return params
else
raise ActionController::RoutingError, "A route matches #{path.inspect}, but references missing controller: #{params[:controller].camelize}Controller"
end
end end
end end

10
actionpack/test/controller/routing_test.rb
View file

@ -1037,6 +1037,16 @@ class RouteSetTest < ActiveSupport::TestCase
end end
end end
def test_route_error_with_missing_controller
set.draw do
get "/people" => "missing#index"
end
assert_raise(ActionController::RoutingError) {
set.recognize_path("/people", :method => :get)
}
end
def test_recognize_with_encoded_id_and_regex def test_recognize_with_encoded_id_and_regex
set.draw do set.draw do
get 'page/:id' => 'pages#show', :id => /[a-zA-Z0-9\+]+/ get 'page/:id' => 'pages#show', :id => /[a-zA-Z0-9\+]+/