diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-19 06:07:48 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-19 10:10:00 -0300 |
| commit | 61d5d2d8a97fd289b81991cd79dca3112e7ca135 (patch) | |
| tree | d8f236d7ed6e7fd26829e0558ee5ddc242d49fee /actionpack/test | |
| parent | a82f1e3f5d11c8dfba9f4c911745ec40a7965216 (diff) | |
| download | rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.gz rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.tar.bz2 rails-61d5d2d8a97fd289b81991cd79dca3112e7ca135.zip | |
Merge pull request #7668 from Draiken/fix_issue_6497
Removing to_shorthand to fix #6497
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index 00c71dc8be..dc1f524d3b 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -362,6 +362,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest resources :errors, :shallow => true do resources :notices end + get 'api/version' end scope :path => 'api' do @@ -1376,6 +1377,12 @@ 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 |