aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/mime_responds.rb
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 /actionpack/lib/action_controller/metal/mime_responds.rb
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 'actionpack/lib/action_controller/metal/mime_responds.rb')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index fab1be3459..1db68db20f 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -156,16 +156,16 @@ module ActionController #:nodoc:
# It works for both inline:
#
# respond_to do |format|
- # format.html.any { render text: "any" }
- # format.html.phone { render text: "phone" }
+ # format.html.any { render html: "any" }
+ # format.html.phone { render html: "phone" }
# end
#
# and block syntax:
#
# respond_to do |format|
# format.html do |variant|
- # variant.any(:tablet, :phablet){ render text: "any" }
- # variant.phone { render text: "phone" }
+ # variant.any(:tablet, :phablet){ render html: "any" }
+ # variant.phone { render html: "phone" }
# end
# end
#