From d2eafa8b736c2f300658925e70290fb3d996959b Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Mon, 31 Jul 2006 20:32:48 +0000 Subject: Dup the options passed to map.resources so that multiple resources get the same options. [Rick Olson] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4639 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/controller/resources_test.rb | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'actionpack/test/controller') diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index 054c251d59..bc8fc76536 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -6,6 +6,7 @@ class MessagesController < ActionController::Base end class CommentsController < ActionController::Base + def index() render :nothing => true end def rescue_action(e) raise e end end @@ -16,12 +17,26 @@ class ResourcesTest < Test::Unit::TestCase end end + def test_multiple_default_restful_routes + with_restful_routing :messages, :comments do + assert_simply_restful_for :messages + assert_simply_restful_for :comments + end + end + def test_with_path_prefix with_restful_routing :messages, :path_prefix => '/thread/:thread_id' do assert_simply_restful_for :messages, :path_prefix => 'thread/5/', :options => { :thread_id => '5' } end end + def test_multile_with_path_prefix + with_restful_routing :messages, :comments, :path_prefix => '/thread/:thread_id' do + assert_simply_restful_for :messages, :path_prefix => 'thread/5/', :options => { :thread_id => '5' } + assert_simply_restful_for :comments, :path_prefix => 'thread/5/', :options => { :thread_id => '5' } + end + end + def test_with_collection_action with_restful_routing :messages, :collection => { :rss => :get } do rss_options = {:action => 'rss'} @@ -86,9 +101,9 @@ class ResourcesTest < Test::Unit::TestCase end protected - def with_restful_routing(resource, *args) + def with_restful_routing(*args) with_routing do |set| - set.draw { |map| map.resources(resource, *args) } + set.draw { |map| map.resources(*args) } yield end end -- cgit v1.2.3