diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 14:57:48 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 14:57:48 -0700 |
commit | 3a102a58f4d33f9a8c660f617fe1242d7baa9f90 (patch) | |
tree | 882f50430559409b8eaa47ff06d040081cc7be6e /actionpack/test | |
parent | b5ea25bc44ceb07f1828b7b7f67bec700d96e216 (diff) | |
download | rails-3a102a58f4d33f9a8c660f617fe1242d7baa9f90.tar.gz rails-3a102a58f4d33f9a8c660f617fe1242d7baa9f90.tar.bz2 rails-3a102a58f4d33f9a8c660f617fe1242d7baa9f90.zip |
use a parser to extract the group parts from the path
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/dispatch/mapper_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb index 58457b0c28..e3dcf9b88a 100644 --- a/actionpack/test/dispatch/mapper_test.rb +++ b/actionpack/test/dispatch/mapper_test.rb @@ -72,7 +72,7 @@ module ActionDispatch mapper = Mapper.new fakeset mapper.get '/*path/foo/:bar', :to => 'pages#show' assert_equal '/*path/foo/:bar(.:format)', fakeset.conditions.first[:path_info] - assert_nil fakeset.requirements.first[:path] + assert_equal(/.+?/, fakeset.requirements.first[:path]) end def test_map_wildcard_with_multiple_wildcard @@ -80,7 +80,7 @@ module ActionDispatch mapper = Mapper.new fakeset mapper.get '/*foo/*bar', :to => 'pages#show' assert_equal '/*foo/*bar(.:format)', fakeset.conditions.first[:path_info] - assert_nil fakeset.requirements.first[:foo] + assert_equal(/.+?/, fakeset.requirements.first[:foo]) assert_equal(/.+?/, fakeset.requirements.first[:bar]) end |