Merge pull request rails#20923 from sikachu/silence-render-text-warning

Stop using deprecated `render :text` in test

Author: matthewd

actionpack/lib/action_controller/metal/data_streaming.rb

@@ -130,7 +130,7 @@ def each
       # 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

actionpack/lib/action_controller/metal/http_authentication.rb

@@ -502,7 +502,7 @@ def encode_credentials(token, options = {})
       def authentication_request(controller, realm, message = nil)
         message ||= "HTTP Token: Access denied.\n"
         controller.headers["WWW-Authenticate"] = %(Token realm="#{realm.tr('"'.freeze, "".freeze)}")
-        controller.__send__ :render, :text => message, :status => :unauthorized
+        controller.__send__ :render, plain: message, status: :unauthorized
       end
     end
   end

actionpack/lib/action_controller/metal/mime_responds.rb

@@ -156,16 +156,16 @@ module MimeResponds
     # 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
     #

actionpack/lib/action_dispatch/http/mime_type.rb

@@ -45,7 +45,7 @@ def fetch(type)
   #
   #       respond_to do |format|
   #         format.html
-  #         format.ics { render text: @post.to_ics, mime_type: Mime::Type.lookup("text/calendar")  }
+  #         format.ics { render body: @post.to_ics, mime_type: Mime::Type.lookup("text/calendar")  }
   #         format.xml { render xml: @post }
   #       end
   #     end

actionpack/test/controller/action_pack_assertions_test.rb

@@ -43,12 +43,12 @@ def response599() head '599 Whoah!' end
 
   def flash_me
     flash['hello'] = 'my name is inigo montoya...'
-    render :text => "Inconceivable!"
+    render plain: "Inconceivable!"
   end
 
   def flash_me_naked
     flash.clear
-    render :text => "wow!"
+    render plain: "wow!"
   end
 
   def assign_this
@@ -57,30 +57,30 @@ def assign_this
   end
 
   def render_based_on_parameters
-    render :text => "Mr. #{params[:name]}"
+    render plain: "Mr. #{params[:name]}"
   end
 
   def render_url
-    render :text => "<div>#{url_for(:action => 'flash_me', :only_path => true)}</div>"
+    render html: "<div>#{url_for(action: 'flash_me', only_path: true)}</div>"
   end
 
   def render_text_with_custom_content_type
-    render :text => "Hello!", :content_type => Mime::RSS
+    render body: "Hello!", content_type: Mime::RSS
   end
 
   def session_stuffing
     session['xmas'] = 'turkey'
-    render :text => "ho ho ho"
+    render plain: "ho ho ho"
   end
 
   def raise_exception_on_get
     raise "get" if request.get?
-    render :text => "request method: #{request.env['REQUEST_METHOD']}"
+    render plain: "request method: #{request.env['REQUEST_METHOD']}"
   end
 
   def raise_exception_on_post
     raise "post" if request.post?
-    render :text => "request method: #{request.env['REQUEST_METHOD']}"
+    render plain: "request method: #{request.env['REQUEST_METHOD']}"
   end
 
   def render_file_absolute_path
@@ -101,7 +101,7 @@ def index
   end
 
   def show
-    render :text => "Boom", :status => 500
+    render plain: "Boom", status: 500
   end
 end
 

actionpack/test/controller/api/conditional_get_test.rb

@@ -7,12 +7,12 @@ class ConditionalGetApiController < ActionController::API
 
   def one
     if stale?(last_modified: Time.now.utc.beginning_of_day, etag: [:foo, 123])
-      render text: "Hi!"
+      render plain: "Hi!"
     end
   end
 
   def two
-    render text: "Hi!"
+    render plain: "Hi!"
   end
 
   private

actionpack/test/controller/base_test.rb

@@ -53,7 +53,7 @@ class RecordIdentifierIncludedController < ActionController::Base
 
 class ActionMissingController < ActionController::Base
   def action_missing(action)
-    render :text => "Response for #{action}"
+    render plain: "Response for #{action}"
   end
 end
 

actionpack/test/controller/content_type_test.rb

@@ -4,29 +4,29 @@ class OldContentTypeController < ActionController::Base
   # :ported:
   def render_content_type_from_body
     response.content_type = Mime::RSS
-    render :text => "hello world!"
+    render body: "hello world!"
   end
 
   # :ported:
   def render_defaults
-    render :text => "hello world!"
+    render body: "hello world!"
   end
 
   # :ported:
   def render_content_type_from_render
-    render :text => "hello world!", :content_type => Mime::RSS
+    render body: "hello world!", :content_type => Mime::RSS
   end
 
   # :ported:
   def render_charset_from_body
     response.charset = "utf-16"
-    render :text => "hello world!"
+    render body: "hello world!"
   end
 
   # :ported:
   def render_nil_charset_from_body
     response.charset = nil
-    render :text => "hello world!"
+    render body: "hello world!"
   end
 
   def render_default_for_erb
@@ -42,10 +42,10 @@ def render_change_for_builder
 
   def render_default_content_types_for_respond_to
     respond_to do |format|
-      format.html { render :text   => "hello world!" }
-      format.xml  { render :action => "render_default_content_types_for_respond_to" }
-      format.js   { render :text   => "hello world!" }
-      format.rss  { render :text   => "hello world!", :content_type => Mime::XML }
+      format.html { render body: "hello world!" }
+      format.xml  { render action: "render_default_content_types_for_respond_to" }
+      format.js   { render body: "hello world!" }
+      format.rss  { render body: "hello world!", content_type: Mime::XML }
     end
   end
 end
@@ -64,14 +64,14 @@ def setup
   def test_render_defaults
     get :render_defaults
     assert_equal "utf-8", @response.charset
-    assert_equal Mime::HTML, @response.content_type
+    assert_equal Mime::TEXT, @response.content_type
   end
 
   def test_render_changed_charset_default
     with_default_charset "utf-16" do
       get :render_defaults
       assert_equal "utf-16", @response.charset
-      assert_equal Mime::HTML, @response.content_type
+      assert_equal Mime::TEXT, @response.content_type
     end
   end
 
@@ -92,14 +92,14 @@ def test_content_type_from_render
   # :ported:
   def test_charset_from_body
     get :render_charset_from_body
-    assert_equal Mime::HTML, @response.content_type
+    assert_equal Mime::TEXT, @response.content_type
     assert_equal "utf-16", @response.charset
   end
 
   # :ported:
   def test_nil_charset_from_body
     get :render_nil_charset_from_body
-    assert_equal Mime::HTML, @response.content_type
+    assert_equal Mime::TEXT, @response.content_type
     assert_equal "utf-8", @response.charset, @response.headers.inspect
   end
 

actionpack/test/controller/default_url_options_with_before_action_test.rb

@@ -6,7 +6,7 @@ class ControllerWithBeforeActionAndDefaultUrlOptions < ActionController::Base
   after_action { I18n.locale = "en" }
 
   def target
-    render :text => "final response"
+    render plain: "final response"
   end
 
   def redirect

actionpack/test/controller/filters_test.rb

@@ -40,7 +40,7 @@ class ChangingTheRequirementsController < TestController
     before_action :ensure_login, :except => [:go_wild]
 
     def go_wild
-      render :text => "gobble"
+      render plain: "gobble"
     end
   end
 
@@ -51,7 +51,7 @@ class TestMultipleFiltersController < ActionController::Base
 
     (1..3).each do |i|
       define_method "fail_#{i}" do
-        render :text => i.to_s
+        render plain: i.to_s
       end
     end
 
@@ -222,7 +222,7 @@ class SkipFilterUsingOnlyAndIf < ConditionalFilterController
     skip_before_action :clean_up_tmp, only: :login, if: -> { true }
 
     def login
-      render text: 'ok'
+      render plain: 'ok'
     end
   end
 
@@ -234,7 +234,7 @@ class SkipFilterUsingIfAndExcept < ConditionalFilterController
     skip_before_action :clean_up_tmp, if: -> { true }, except: :login
 
     def login
-      render text: 'ok'
+      render plain: 'ok'
     end
   end
 
@@ -258,11 +258,11 @@ class SkippingAndLimitedController < TestController
     before_action :ensure_login, :only => :index
 
     def index
-      render :text => 'ok'
+      render plain: 'ok'
     end
 
     def public
-      render :text => 'ok'
+      render plain: 'ok'
     end
   end
 
@@ -272,7 +272,7 @@ class SkippingAndReorderingController < TestController
     before_action :ensure_login
 
     def index
-      render :text => 'ok'
+      render plain: 'ok'
     end
 
     private
@@ -383,7 +383,7 @@ class AuditController < ActionController::Base
     before_action(AuditFilter)
 
     def show
-      render :text => "hello"
+      render plain: "hello"
     end
   end
 
@@ -421,11 +421,11 @@ class OutOfOrder < StandardError; end
     before_action :second, :only => :foo
 
     def foo
-      render :text => 'foo'
+      render plain: 'foo'
     end
 
     def bar
-      render :text => 'bar'
+      render plain: 'bar'
     end
 
     protected
@@ -442,7 +442,7 @@ class DynamicDispatchController < ActionController::Base
     before_action :choose
 
     %w(foo bar baz).each do |action|
-      define_method(action) { render :text => action }
+      define_method(action) { render plain: action }
     end
 
     private
@@ -471,7 +471,7 @@ def between_before_all_and_after_all
       @ran_filter << 'between_before_all_and_after_all'
     end
     def show
-      render :text => 'hello'
+      render plain: 'hello'
     end
   end
 
@@ -481,7 +481,7 @@ class RescuingAroundFilterWithBlock
     def around(controller)
       yield
     rescue ErrorToRescue => ex
-      controller.__send__ :render, :text => "I rescued this: #{ex.inspect}"
+      controller.__send__ :render, plain: "I rescued this: #{ex.inspect}"
     end
   end
 

actionpack/test/controller/force_ssl_test.rb

@@ -2,11 +2,11 @@
 
 class ForceSSLController < ActionController::Base
   def banana
-    render :text => "monkey"
+    render plain: "monkey"
   end
 
   def cheeseburger
-    render :text => "sikachu"
+    render plain: "sikachu"
   end
 end
 
@@ -26,7 +26,7 @@ class ForceSSLCustomOptions < ForceSSLController
   force_ssl :notice => 'Foo, Bar!', :only => :redirect_notice
 
   def force_ssl_action
-    render :text => action_name
+    render plain: action_name
   end
 
   alias_method :redirect_host, :force_ssl_action
@@ -40,15 +40,15 @@ def force_ssl_action
   alias_method :redirect_notice, :force_ssl_action
 
   def use_flash
-    render :text => flash[:message]
+    render plain: flash[:message]
   end
 
   def use_alert
-    render :text => flash[:alert]
+    render plain: flash[:alert]
   end
 
   def use_notice
-    render :text => flash[:notice]
+    render plain: flash[:notice]
   end
 end
 
@@ -85,10 +85,10 @@ def use_flash
 
 class RedirectToSSL < ForceSSLController
   def banana
-    force_ssl_redirect || render(:text => 'monkey')
+    force_ssl_redirect || render(plain: 'monkey')
   end
   def cheeseburger
-    force_ssl_redirect('secure.cheeseburger.host') || render(:text => 'ihaz')
+    force_ssl_redirect('secure.cheeseburger.host') || render(plain: 'ihaz')
   end
 end