aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikac.hu>2015-07-17 21:48:00 -0400
committerPrem Sichanugrist <s@sikac.hu>2015-07-17 22:27:33 -0400
commit8cb8ce98d903929342e2ca3a54a07ab5196baf93 (patch)
treedeae317ebeca2cb20b57e9ad9a8c0c36720c8d7f /actionview/lib
parent0db98b3ec8226042a5c3400d594d803abb5b169f (diff)
downloadrails-8cb8ce98d903929342e2ca3a54a07ab5196baf93.tar.gz
rails-8cb8ce98d903929342e2ca3a54a07ab5196baf93.tar.bz2
rails-8cb8ce98d903929342e2ca3a54a07ab5196baf93.zip
Stop using deprecated `render :text` in test
This will silence deprecation warnings. Most of the test can be changed from `render :text` to render `:plain` or `render :body` right away. However, there are some tests that needed to be fixed by hand as they actually assert the default Content-Type returned from `render :body`.
Diffstat (limited to 'actionview/lib')
-rw-r--r--actionview/lib/action_view/helpers/rendering_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/rendering_helper.rb b/actionview/lib/action_view/helpers/rendering_helper.rb
index 827932d8e2..c98f2d74a8 100644
--- a/actionview/lib/action_view/helpers/rendering_helper.rb
+++ b/actionview/lib/action_view/helpers/rendering_helper.rb
@@ -18,7 +18,7 @@ module ActionView
# performs HTML escape on the string first. Setting the content type as
# <tt>text/html</tt>.
# * <tt>:body</tt> - Renders the text passed in, and inherits the content
- # type of <tt>text/html</tt> from <tt>ActionDispatch::Response</tt>
+ # type of <tt>text/plain</tt> from <tt>ActionDispatch::Response</tt>
# object.
#
# If no options hash is passed or :update specified, the default is to render a partial and use the second parameter