aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-01 06:56:53 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-10-01 12:53:53 -0300
commit3b5bc8d71ba97ddc254ab3dc81893c82e81a783b (patch)
treee8795edca810d6413fbe808619912e018baf08ba /actionpack/test/dispatch
parenta02f67b39b0ca02a8dd871b75c9f2a9db3a40c7b (diff)
downloadrails-3b5bc8d71ba97ddc254ab3dc81893c82e81a783b.tar.gz
rails-3b5bc8d71ba97ddc254ab3dc81893c82e81a783b.tar.bz2
rails-3b5bc8d71ba97ddc254ab3dc81893c82e81a783b.zip
Merge pull request #7789 from senny/7777_resource_functions_modify_options
resource and resources do no longer modify passed options
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/routing_test.rb20
1 files changed, 20 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index dc1f524d3b..f32b1b9c71 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1186,6 +1186,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
end
end
+ def test_resource_does_not_modify_passed_options
+ options = {:id => /.+?/, :format => /json|xml/}
+ self.class.stub_controllers do |routes|
+ routes.draw do
+ resource :user, options
+ end
+ end
+ assert_equal({:id => /.+?/, :format => /json|xml/}, options)
+ end
+
+ def test_resources_does_not_modify_passed_options
+ options = {:id => /.+?/, :format => /json|xml/}
+ self.class.stub_controllers do |routes|
+ routes.draw do
+ resources :users, options
+ end
+ end
+ assert_equal({:id => /.+?/, :format => /json|xml/}, options)
+ end
+
def test_path_names
with_test_routes do
get '/pt/projetos'