diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-02 14:33:20 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-11-02 14:33:20 -0200 |
| commit | 4a8636264dedd5bfafab79b88812478ce333f1f8 (patch) | |
| tree | 345baa128e5cd07af3d2448f7fba331d477e7cce /actionpack/test | |
| parent | de3dff317010df12d15225f2bca4a7e914eb596c (diff) | |
| download | rails-4a8636264dedd5bfafab79b88812478ce333f1f8.tar.gz rails-4a8636264dedd5bfafab79b88812478ce333f1f8.tar.bz2 rails-4a8636264dedd5bfafab79b88812478ce333f1f8.zip | |
Revert "Merge pull request #7668 from Draiken/fix_issue_6497"
This reverts commit 61d5d2d8a97fd289b81991cd79dca3112e7ca135.
Conflicts:
actionpack/CHANGELOG.md
REASON: This added a backward incompatible change.
Diffstat (limited to 'actionpack/test')
| -rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 7 |
1 files changed, 0 insertions, 7 deletions
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 |