diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 11:39:20 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 11:39:20 -0700 |
| commit | 9ce057d8ccc799eb4844494e3c6ee553969a66d3 (patch) | |
| tree | d8c3856173917e656ffc5915a819dacbf06d3c1c /actionpack/test/controller/routing_test.rb | |
| parent | 3f46e7aae9f56a8fa1f4dd800d8947d780cd5534 (diff) | |
| parent | d03aa104e069be4e301efa8cefb90a2a785a7bff (diff) | |
| download | rails-9ce057d8ccc799eb4844494e3c6ee553969a66d3.tar.gz rails-9ce057d8ccc799eb4844494e3c6ee553969a66d3.tar.bz2 rails-9ce057d8ccc799eb4844494e3c6ee553969a66d3.zip | |
Merge pull request #6160 from carlosantoniodasilva/resource-route-canonical-action
Force given path to http methods in mapper to skip canonical action checking
Diffstat (limited to 'actionpack/test/controller/routing_test.rb')
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index bcb4e6a766..cd91064ab8 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -1405,7 +1405,7 @@ class RouteSetTest < ActiveSupport::TestCase end end end - + def test_route_with_subdomain_and_constraints_must_receive_params name_param = nil set.draw do @@ -1418,7 +1418,7 @@ class RouteSetTest < ActiveSupport::TestCase set.recognize_path('http://subdomain.example.org/page/mypage')) assert_equal(name_param, 'mypage') end - + def test_route_requirement_recognize_with_ignore_case set.draw do get 'page/:name' => 'pages#show', |