Merge pull request #9434 from zires/dev

Journey::Path::Pattern#new raise more meaningful exception message.
This commit is contained in:
Rafael Mendonça França 2013-02-26 09:15:43 -08:00
commit 28bebb225f
3 changed files with 7 additions and 1 deletions

@ -3,6 +3,8 @@
## Rails 4.0.0.beta1 (February 25, 2013) ##
* Make ActionDispatch::Journey::Path::Pattern#new raise more meaningful exception message. *Thierry Zires*
* Fix `respond_to` not using formats that have no block if all is present. *Michael Grosser*
* New applications use an encrypted session store by default.

@ -20,7 +20,7 @@ def initialize(strexp)
@separators = strexp.separators.join
@anchored = strexp.anchor
else
raise "wtf bro: #{strexp}"
raise ArgumentError, "Bad expression: #{strexp}"
end
@names = nil

@ -75,6 +75,10 @@ class TestPattern < ActiveSupport::TestCase
end
end
def test_to_raise_exception_with_bad_expression
assert_raise(ArgumentError, "Bad expression: []") { Pattern.new [] }
end
def test_to_regexp_with_extended_group
strexp = Router::Strexp.new(
'/page/:name',