aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-09-25 18:07:22 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-09-25 18:07:22 -0300
commit4af5899e25229961cbd3df9dfe80c2f46fa04f6c (patch)
treeb1e8365595fe151cde1276d3c5289548ee477377 /actionpack
parent3a88535149da08ec4e1609a3af1e06241b2ecb94 (diff)
downloadrails-4af5899e25229961cbd3df9dfe80c2f46fa04f6c.tar.gz
rails-4af5899e25229961cbd3df9dfe80c2f46fa04f6c.tar.bz2
rails-4af5899e25229961cbd3df9dfe80c2f46fa04f6c.zip
Revert "Merge pull request #16966 from why-el/symbolize-path-params"
This reverts commit 9d05d6de52871e57bfbf54a60de005e8a5f5b0e4, reversing changes made to 0863c9248fd47a15e88e05ce4fcd80966684c0e3. The change in the behaviour reported at #16958 doesn't exist since 4.0 and 4.1 works in the same way
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/routing/route_set.rb1
-rw-r--r--actionpack/test/dispatch/routing/route_set_test.rb8
2 files changed, 0 insertions, 9 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 602d2b3944..f51bee3b31 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -287,7 +287,6 @@ module ActionDispatch
}
end
- inner_options.symbolize_keys!
result.merge!(inner_options)
end
end
diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
index 87d44064ea..c465d56bde 100644
--- a/actionpack/test/dispatch/routing/route_set_test.rb
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -80,14 +80,6 @@ module ActionDispatch
assert_equal '/foo/1/bar/2', url_helpers.foo_bar_path(2, foo_id: 1)
end
- test "stringified controller and action keys are properly symbolized" do
- draw do
- root 'foo#bar'
- end
-
- assert_equal '/', url_helpers.root_path('controller' => 'foo', 'action' => 'bar')
- end
-
private
def draw(&block)
@set.draw(&block)