diff options
author | Michael Colavita <colavitam@gmail.com> | 2015-07-13 13:48:10 -0400 |
---|---|---|
committer | Michael Colavita <colavitam@gmail.com> | 2015-07-13 13:48:10 -0400 |
commit | 0c8dd2cab6793973384f7320c2cb2b832ec38aff (patch) | |
tree | b670b7c53569e518be44317b7eaa7bd22548fde5 /actionpack/test/controller | |
parent | 08e41a043218583d34e34316df82d38e4d7f1b55 (diff) | |
download | rails-0c8dd2cab6793973384f7320c2cb2b832ec38aff.tar.gz rails-0c8dd2cab6793973384f7320c2cb2b832ec38aff.tar.bz2 rails-0c8dd2cab6793973384f7320c2cb2b832ec38aff.zip |
:only and :except are now chained for routing resource(s)
Allow chaining the :only and :except options for routing resource(s).
Previously, the following yielded routes for both show and destroy:
resource :account, :only => [:show, :destroy], :except => :destroy
This now yields only the show action. This chaining can be useful for
passing optional :except options to code that makes use of the :only
option (e.g. for a gem with its own routing methods).
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r-- | actionpack/test/controller/resources_test.rb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index 5a279639cc..603d7848f9 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -838,6 +838,28 @@ class ResourcesTest < ActionController::TestCase end end + def test_resource_has_show_action_but_does_not_have_destroy_action + with_routing do |set| + set.draw do + resources :products, :only => [:show, :destroy], :except => :destroy + end + + assert_resource_allowed_routes('products', {}, { :id => '1' }, :show, [:index, :new, :create, :edit, :update, :destroy]) + assert_resource_allowed_routes('products', { :format => 'xml' }, { :id => '1' }, :show, [:index, :new, :create, :edit, :update, :destroy]) + end + end + + def test_singleton_resource_has_show_action_but_does_not_have_destroy_action + with_routing do |set| + set.draw do + resource :account, :only => [:show, :destroy], :except => :destroy + end + + assert_singleton_resource_allowed_routes('accounts', {}, :show, [:new, :create, :edit, :update, :destroy]) + assert_singleton_resource_allowed_routes('accounts', { :format => 'xml' }, :show, [:new, :create, :edit, :update, :destroy]) + end + end + def test_resource_has_only_create_action_and_named_route with_routing do |set| set.draw do |