diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-30 11:00:00 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-06-03 11:33:50 -0700 |
commit | 57d0da86b4ee35c254dce3b7ea926b09871e517b (patch) | |
tree | c80a7fd8d90f9a32e16fc1aa0a25917ed4ebcda9 /actionpack | |
parent | c91648b107a967123e523393962e92f89e989dcf (diff) | |
download | rails-57d0da86b4ee35c254dce3b7ea926b09871e517b.tar.gz rails-57d0da86b4ee35c254dce3b7ea926b09871e517b.tar.bz2 rails-57d0da86b4ee35c254dce3b7ea926b09871e517b.zip |
add a test for missing "via" parameter
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 2 | ||||
-rw-r--r-- | actionpack/test/dispatch/routing_test.rb | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 961c3afd91..fc658482dc 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -221,7 +221,7 @@ module ActionDispatch "If you want to expose your action to GET, use `get` in the router:\n" \ " Instead of: match \"controller#action\"\n" \ " Do: get \"controller#action\"" - raise msg + raise ArgumentError, msg end if via = options[:via] diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb index d6477e19bb..6826e5906d 100644 --- a/actionpack/test/dispatch/routing_test.rb +++ b/actionpack/test/dispatch/routing_test.rb @@ -2242,6 +2242,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest assert_equal '/api/1.0/users/first.last.xml', api_user_path(:version => '1.0', :id => 'first.last', :format => :xml) end + def test_match_without_via + assert_raises(ArgumentError) do + draw do + match '/foo/bar', :to => 'files#show' + end + end + end + def test_glob_parameter_accepts_regexp draw do get '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/ |