aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/data_streaming.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/data_streaming.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/data_streaming.rb')
-rw-r--r--actionpack/lib/action_controller/metal/data_streaming.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 0abfd629aa..e6d7f958bb 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -130,7 +130,7 @@ module ActionController #:nodoc:
# See +send_file+ for more information on HTTP Content-* headers and caching.
def send_data(data, options = {}) #:doc:
send_file_headers! options
- render options.slice(:status, :content_type).merge(:text => data)
+ render options.slice(:status, :content_type).merge(body: data)
end
private