diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 16 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 7 |
3 files changed, 7 insertions, 18 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index a257e8c600..9da9e9366b 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,11 @@ ## Rails 3.2.9 (unreleased) ## +* Revert the shorthand routes scoped with `:module` option fix + This added a regression since it is changing the URL mapping. + This makes the stable release backward compatible. + + *Rafael Mendonça França* + * Revert the `assert_template` fix to not pass with ever string that matches the template name. This added a regression since people were relying on this buggy behavior. This will introduce back #3849 but this stable release will be backward compatible. @@ -72,16 +78,6 @@ *Tim Vandecasteele* -* Fixed a bug with shorthand routes scoped with the `:module` option not - adding the module to the controller as described in issue #6497. - This should now work properly: - - scope :module => "engine" do - get "api/version" # routes to engine/api#version - end - - *Luiz Felipe Garcia Pereira* - * Respect `config.digest = false` for `asset_path` Previously, the `asset_path` internals only respected the `:digest` diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index cd2f464506..952219631a 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -166,7 +166,7 @@ module ActionDispatch controller ||= default_controller action ||= default_action - unless controller.is_a?(Regexp) + unless controller.is_a?(Regexp) || to_shorthand controller = [@scope[:module], controller].compact.join("/").presence end diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index f32b1b9c71..d5caa9634f 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -362,7 +362,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest resources :errors, :shallow => true do resources :notices end - get 'api/version' end scope :path => 'api' do @@ -1397,12 +1396,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest end end - def test_match_shorthand_with_module - assert_equal '/api/version', api_version_path - get '/api/version' - assert_equal 'api/api#version', @response.body - end - def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper with_test_routes do assert_equal '/replies', replies_path |