aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test/template
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-18 12:47:38 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-18 12:47:38 -0200
commitb5c13fcdaa3f3746888b174caa3df2873846df2e (patch)
treeb574a7d913758fbd3dd85e7a84b211c6bd88a122 /actionview/test/template
parent90101afe1ab9e8d5b241f968f164171c2d9c4fc6 (diff)
parent4752e7d83794ecf23c6d0367f0bcad8eee33da59 (diff)
downloadrails-b5c13fcdaa3f3746888b174caa3df2873846df2e.tar.gz
rails-b5c13fcdaa3f3746888b174caa3df2873846df2e.tar.bz2
rails-b5c13fcdaa3f3746888b174caa3df2873846df2e.zip
Merge pull request #20797 from byroot/prevent-url-for-ac-parameters
Prevent ActionController::Parameters in url_for
Diffstat (limited to 'actionview/test/template')
-rw-r--r--actionview/test/template/url_helper_test.rb9
1 files changed, 0 insertions, 9 deletions
diff --git a/actionview/test/template/url_helper_test.rb b/actionview/test/template/url_helper_test.rb
index 62fa75bc63..784a48ed8d 100644
--- a/actionview/test/template/url_helper_test.rb
+++ b/actionview/test/template/url_helper_test.rb
@@ -636,10 +636,6 @@ class UrlHelperControllerTest < ActionController::TestCase
render inline: "<%= url_for controller: 'url_helper_controller_test/url_helper', action: 'show_url_for' %>"
end
- def show_overridden_url_for
- render inline: "<%= url_for params.merge(controller: 'url_helper_controller_test/url_helper', action: 'show_url_for') %>"
- end
-
def show_named_route
render inline: "<%= show_named_route_#{params[:kind]} %>"
end
@@ -673,11 +669,6 @@ class UrlHelperControllerTest < ActionController::TestCase
assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
end
- def test_overridden_url_for_shows_only_path
- get :show_overridden_url_for
- assert_equal '/url_helper_controller_test/url_helper/show_url_for', @response.body
- end
-
def test_named_route_url_shows_host_and_path
get :show_named_route, params: { kind: 'url' }
assert_equal 'http://test.host/url_helper_controller_test/url_helper/show_named_route',