aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorthedarkone <thedarkone2@gmail.com>2011-07-28 20:00:48 +0200
committerthedarkone <thedarkone2@gmail.com>2011-07-28 20:00:48 +0200
commit4d4d2179f68ecda5736feb6cccd897b73653bce9 (patch)
tree575357a7ff950791f65d99502414a65beb18aa56 /actionpack/test
parent02691d3516e68b2de5545ec7a495024a377f89fc (diff)
downloadrails-4d4d2179f68ecda5736feb6cccd897b73653bce9.tar.gz
rails-4d4d2179f68ecda5736feb6cccd897b73653bce9.tar.bz2
rails-4d4d2179f68ecda5736feb6cccd897b73653bce9.zip
There is no need to be destructive with the passed-in options.
This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/controller/resources_test.rb9
1 files changed, 9 insertions, 0 deletions
diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb
index 6ea492cf8b..3b1b5fc3ec 100644
--- a/actionpack/test/controller/resources_test.rb
+++ b/actionpack/test/controller/resources_test.rb
@@ -91,6 +91,15 @@ class ResourcesTest < ActionController::TestCase
end
end
+ def test_multiple_resources_with_options
+ expected_options = {:controller => 'threads', :action => 'index'}
+
+ with_restful_routing :messages, :comments, expected_options.slice(:controller) do
+ assert_recognizes(expected_options, :path => 'comments')
+ assert_recognizes(expected_options, :path => 'messages')
+ end
+ end
+
def test_with_custom_conditions
with_restful_routing :messages, :conditions => { :subdomain => 'app' } do
assert @routes.recognize_path("/messages", :method => :get, :subdomain => 'app')