aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/resources_test.rb19
1 files changed, 17 insertions, 2 deletions
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