diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-14 10:39:22 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2015-08-14 10:39:33 -0700 |
| commit | aaaa67902ee1d129a6907e4ebd726f383ad7002b (patch) | |
| tree | f3d2f08ad0a1414316bd37f747d73350a35b2fc8 /actionpack/test/dispatch | |
| parent | 7fa6600b52b7477a958473d504415b7610d39b34 (diff) | |
| download | rails-aaaa67902ee1d129a6907e4ebd726f383ad7002b.tar.gz rails-aaaa67902ee1d129a6907e4ebd726f383ad7002b.tar.bz2 rails-aaaa67902ee1d129a6907e4ebd726f383ad7002b.zip | |
pull up path parsing
`add_route` needs the AST, so rather than shove it in a hash and delete
later, lets move parsing up the stack so we can pass down later
Diffstat (limited to 'actionpack/test/dispatch')
| -rw-r--r-- | actionpack/test/dispatch/mapper_test.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb index 4155a44c39..0c506a13bf 100644 --- a/actionpack/test/dispatch/mapper_test.rb +++ b/actionpack/test/dispatch/mapper_test.rb @@ -98,7 +98,8 @@ module ActionDispatch def test_mapping_requirements options = { } scope = Mapper::Scope.new({}) - m = Mapper::Mapping.build(scope, FakeSet.new, '/store/:name(*rest)', 'foo', 'bar', nil, [:get], nil, {}, options) + ast = Journey::Parser.parse '/store/:name(*rest)' + m = Mapper::Mapping.build(scope, FakeSet.new, ast, 'foo', 'bar', nil, [:get], nil, {}, options) _, _, requirements, _ = m.to_route assert_equal(/.+?/, requirements[:rest]) end |