aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/new_base/render_html_test.rb
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2016-03-01 17:31:14 +0000
committerAndrew White <pixeltrix@users.noreply.github.com>2016-03-01 17:31:14 +0000
commitf2c707a64ee8683ee7bc4f1bc0254afcaa0ff676 (patch)
tree4c4680606065ff4bb7bb8e9c5ee5b9bd51b4861b /actionpack/test/controller/new_base/render_html_test.rb
parent3e43ba67209751468857a350ded6ea40aad2a2ba (diff)
parent6520ea5f7e2215a763ca74bf6cfa87be2347d5df (diff)
downloadrails-f2c707a64ee8683ee7bc4f1bc0254afcaa0ff676.tar.gz
rails-f2c707a64ee8683ee7bc4f1bc0254afcaa0ff676.tar.bz2
rails-f2c707a64ee8683ee7bc4f1bc0254afcaa0ff676.zip
Merge pull request #23980 from rails/deprecate-controller-action-segments
Deprecate :controller and :action path parameters
Diffstat (limited to 'actionpack/test/controller/new_base/render_html_test.rb')
-rw-r--r--actionpack/test/controller/new_base/render_html_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/new_base/render_html_test.rb b/actionpack/test/controller/new_base/render_html_test.rb
index e9ea57e329..bfed136496 100644
--- a/actionpack/test/controller/new_base/render_html_test.rb
+++ b/actionpack/test/controller/new_base/render_html_test.rb
@@ -88,7 +88,7 @@ module RenderHtml
test "rendering text from an action with default options renders the text with the layout" do
with_routing do |set|
- set.draw { get ':controller', action: 'index' }
+ set.draw { ActiveSupport::Deprecation.silence { get ':controller', action: 'index' } }
get "/render_html/simple"
assert_body "hello david"
@@ -98,7 +98,7 @@ module RenderHtml
test "rendering text from an action with default options renders the text without the layout" do
with_routing do |set|
- set.draw { get ':controller', action: 'index' }
+ set.draw { ActiveSupport::Deprecation.silence { get ':controller', action: 'index' } }
get "/render_html/with_layout"