aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/webservice_test.rb
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2015-07-18 12:42:08 +0930
committerMatthew Draper <matthew@trebex.net>2015-07-18 12:42:08 +0930
commite78746fefdd1c5528a10ca23a5f40804ef855086 (patch)
treedeae317ebeca2cb20b57e9ad9a8c0c36720c8d7f /actionpack/test/controller/webservice_test.rb
parent0db98b3ec8226042a5c3400d594d803abb5b169f (diff)
parent8cb8ce98d903929342e2ca3a54a07ab5196baf93 (diff)
downloadrails-e78746fefdd1c5528a10ca23a5f40804ef855086.tar.gz
rails-e78746fefdd1c5528a10ca23a5f40804ef855086.tar.bz2
rails-e78746fefdd1c5528a10ca23a5f40804ef855086.zip
Merge pull request #20923 from sikachu/silence-render-text-warning
Stop using deprecated `render :text` in test
Diffstat (limited to 'actionpack/test/controller/webservice_test.rb')
-rw-r--r--actionpack/test/controller/webservice_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/webservice_test.rb b/actionpack/test/controller/webservice_test.rb
index bd81846a7d..b26f037c36 100644
--- a/actionpack/test/controller/webservice_test.rb
+++ b/actionpack/test/controller/webservice_test.rb
@@ -5,9 +5,9 @@ class WebServiceTest < ActionDispatch::IntegrationTest
class TestController < ActionController::Base
def assign_parameters
if params[:full]
- render :text => dump_params_keys
+ render plain: dump_params_keys
else
- render :text => (params.keys - ['controller', 'action']).sort.join(", ")
+ render plain: (params.keys - ['controller', 'action']).sort.join(", ")
end
end