diff options
| author | Konstantin Haase <konstantin.mailinglists@googlemail.com> | 2014-11-29 01:26:10 +0100 |
|---|---|---|
| committer | Konstantin Haase <konstantin.mailinglists@googlemail.com> | 2014-11-29 01:26:10 +0100 |
| commit | 0d690d75fbb088e967556ea186140ec96b320c42 (patch) | |
| tree | 225d6423f2aead298ff4389f3e6f837a69266f58 /actionpack/test/journey | |
| parent | b599f99281d54047751e48789c44b73ccaec124c (diff) | |
| download | rails-0d690d75fbb088e967556ea186140ec96b320c42.tar.gz rails-0d690d75fbb088e967556ea186140ec96b320c42.tar.bz2 rails-0d690d75fbb088e967556ea186140ec96b320c42.zip | |
make OR in journey patterns compile to a valid regular expression
Diffstat (limited to 'actionpack/test/journey')
| -rw-r--r-- | actionpack/test/journey/path/pattern_test.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/journey/path/pattern_test.rb b/actionpack/test/journey/path/pattern_test.rb index 9dfdfc23ed..6939b426f6 100644 --- a/actionpack/test/journey/path/pattern_test.rb +++ b/actionpack/test/journey/path/pattern_test.rb @@ -16,6 +16,7 @@ module ActionDispatch '/:controller(.:format)' => %r{\A/(#{x})(?:\.([^/.?]+))?\Z}, '/:controller/*foo' => %r{\A/(#{x})/(.+)\Z}, '/:controller/*foo/bar' => %r{\A/(#{x})/(.+)/bar\Z}, + '/:foo|*bar' => %r{\A/(?:([^/.?]+)|(.+))\Z}, }.each do |path, expected| define_method(:"test_to_regexp_#{path}") do strexp = Router::Strexp.build( @@ -39,6 +40,7 @@ module ActionDispatch '/:controller(.:format)' => %r{\A/(#{x})(?:\.([^/.?]+))?}, '/:controller/*foo' => %r{\A/(#{x})/(.+)}, '/:controller/*foo/bar' => %r{\A/(#{x})/(.+)/bar}, + '/:foo|*bar' => %r{\A/(?:([^/.?]+)|(.+))}, }.each do |path, expected| define_method(:"test_to_non_anchored_regexp_#{path}") do strexp = Router::Strexp.build( |