Remove deprecated support to :text in render

10 files changed, 69 insertions, 69 deletions

diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index e84e01a41b..741ae543e0 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -375,7 +375,7 @@ module ApplicationTests
       class ::OmgController < ActionController::Base
         def index
           flash[:cool_story] = true
-          render text: "ok"
+          render plain: "ok"
         end
       end
 
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 5dceaae96b..b0f5b30174 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -398,7 +398,7 @@ module ApplicationTests
       class ::OmgController < ActionController::Base
         def index
           cookies.signed[:some_key] = "some_value"
-          render text: cookies[:some_key]
+          render plain: cookies[:some_key]
         end
       end
 
@@ -704,7 +704,7 @@ module ApplicationTests
         end
 
         def update
-          render text: "update"
+          render plain: "update"
         end
 
         private
@@ -978,7 +978,7 @@ module ApplicationTests
 
       class ::OmgController < ActionController::Base
         def index
-          render text: env["action_dispatch.show_exceptions"]
+          render plain: env["action_dispatch.show_exceptions"]
         end
       end
 
@@ -1008,7 +1008,7 @@ module ApplicationTests
       app_file "app/controllers/posts_controller.rb", <<-RUBY
       class PostsController < ApplicationController
         def create
-          render text: params[:post].inspect
+          render plain: params[:post].inspect
         end
       end
       RUBY
@@ -1029,7 +1029,7 @@ module ApplicationTests
       app_file "app/controllers/posts_controller.rb", <<-RUBY
       class PostsController < ActionController::Base
         def create
-          render text: params[:post].permitted? ? "permitted" : "forbidden"
+          render plain: params[:post].permitted? ? "permitted" : "forbidden"
         end
       end
       RUBY
@@ -1051,7 +1051,7 @@ module ApplicationTests
       app_file "app/controllers/posts_controller.rb", <<-RUBY
       class PostsController < ActionController::Base
         def create
-          render text: params.require(:post).permit(:name)
+          render plain: params.require(:post).permit(:name)
         end
       end
       RUBY
@@ -1090,7 +1090,7 @@ module ApplicationTests
       app_file "app/controllers/posts_controller.rb", <<-RUBY
       class PostsController < ActionController::Base
         def create
-          render text: params.permit(post: [:title])
+          render plain: params.permit(post: [:title])
         end
       end
       RUBY
@@ -1137,8 +1137,8 @@ module ApplicationTests
       class ::OmgController < ActionController::Base
         def index
           respond_to do |format|
-            format.html { render text: "HTML" }
-            format.xml { render text: "XML" }
+            format.html { render plain: "HTML" }
+            format.xml { render plain: "XML" }
           end
         end
       end
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index cd1371359a..dc1d816dc5 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -19,7 +19,7 @@ module ApplicationTests
         class ExpiresController < ApplicationController
           def expires_header
             expires_in 10, public: !params[:private]
-            render text: SecureRandom.hex(16)
+            render plain: SecureRandom.hex(16)
           end
 
           def expires_etag
@@ -32,12 +32,12 @@ module ApplicationTests
           end
 
           def keeps_if_modified_since
-            render :text => request.headers['If-Modified-Since']
+            render plain: request.headers['If-Modified-Since']
           end
         private
           def render_conditionally(headers)
             if stale?(headers.merge(public: !params[:private]))
-              render text: SecureRandom.hex(16)
+              render plain: SecureRandom.hex(16)
             end
           end
         end
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb
index a6019a9db4..0e4acfdcec 100644
--- a/railties/test/application/middleware/session_test.rb
+++ b/railties/test/application/middleware/session_test.rb
@@ -70,7 +70,7 @@ module ApplicationTests
           end
 
           def read_session
-            render text: session[:foo].inspect
+            render plain: session[:foo].inspect
           end
         end
       RUBY
@@ -111,7 +111,7 @@ module ApplicationTests
           end
 
           def read_cookie
-            render text: cookies[:foo].inspect
+            render plain: cookies[:foo].inspect
           end
         end
       RUBY
@@ -149,15 +149,15 @@ module ApplicationTests
           end
 
           def read_session
-            render text: session[:foo]
+            render plain: session[:foo]
           end
 
           def read_encrypted_cookie
-            render text: cookies.encrypted[:_myapp_session]['foo']
+            render plain: cookies.encrypted[:_myapp_session]['foo']
           end
 
           def read_raw_cookie
-            render text: cookies[:_myapp_session]
+            render plain: cookies[:_myapp_session]
           end
         end
       RUBY
@@ -194,15 +194,15 @@ module ApplicationTests
           end
 
           def read_session
-            render text: session[:foo]
+            render plain: session[:foo]
           end
 
           def read_encrypted_cookie
-            render text: cookies.encrypted[:_myapp_session]['foo']
+            render plain: cookies.encrypted[:_myapp_session]['foo']
           end
 
           def read_raw_cookie
-            render text: cookies[:_myapp_session]
+            render plain: cookies[:_myapp_session]
           end
         end
       RUBY
@@ -249,15 +249,15 @@ module ApplicationTests
           end
 
           def read_session
-            render text: session[:foo]
+            render plain: session[:foo]
           end
 
           def read_encrypted_cookie
-            render text: cookies.encrypted[:_myapp_session]['foo']
+            render plain: cookies.encrypted[:_myapp_session]['foo']
           end
 
           def read_raw_cookie
-            render text: cookies[:_myapp_session]
+            render plain: cookies[:_myapp_session]
           end
         end
       RUBY
@@ -308,15 +308,15 @@ module ApplicationTests
           end
 
           def read_session
-            render text: session[:foo]
+            render plain: session[:foo]
           end
 
           def read_signed_cookie
-            render text: cookies.signed[:_myapp_session]['foo']
+            render plain: cookies.signed[:_myapp_session]['foo']
           end
 
           def read_raw_cookie
-            render text: cookies[:_myapp_session]
+            render plain: cookies[:_myapp_session]
           end
         end
       RUBY
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 45481dc1b6..f53c93290c 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -227,9 +227,9 @@ module ApplicationTests
       class ::OmgController < ActionController::Base
         def index
           if params[:nothing]
-            render text: ""
+            render plain: ""
           else
-            render text: "OMG"
+            render plain: "OMG"
           end
         end
       end
@@ -239,7 +239,7 @@ module ApplicationTests
       get "/"
       assert_equal 200, last_response.status
       assert_equal "OMG", last_response.body
-      assert_equal "text/html; charset=utf-8", last_response.headers["Content-Type"]
+      assert_equal "text/plain; charset=utf-8", last_response.headers["Content-Type"]
       assert_equal "max-age=0, private, must-revalidate", last_response.headers["Cache-Control"]
       assert_equal etag, last_response.headers["Etag"]
 
@@ -253,7 +253,7 @@ module ApplicationTests
       get "/?nothing=true"
       assert_equal 200, last_response.status
       assert_equal "", last_response.body
-      assert_equal "text/html; charset=utf-8", last_response.headers["Content-Type"]
+      assert_equal "text/plain; charset=utf-8", last_response.headers["Content-Type"]
       assert_equal "no-cache", last_response.headers["Cache-Control"]
       assert_equal nil, last_response.headers["Etag"]
     end
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index c86759de5a..c515e2b270 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -65,7 +65,7 @@ module ApplicationTests
       controller :foo, <<-RUBY
         class FooController < ApplicationController
           def index
-            render text: "foo"
+            render plain: "foo"
           end
         end
       RUBY
@@ -156,7 +156,7 @@ module ApplicationTests
       controller :foo, <<-RUBY
         class FooController < ApplicationController
           def index
-            render text: my_blog_path
+            render plain: my_blog_path
           end
         end
       RUBY
@@ -176,7 +176,7 @@ module ApplicationTests
       controller :foo, <<-RUBY
         class FooController < ApplicationController
           def index
-            render text: "foo"
+            render plain: "foo"
           end
         end
       RUBY
@@ -184,7 +184,7 @@ module ApplicationTests
       controller :bar, <<-RUBY
         class BarController < ActionController::Base
           def index
-            render text: "bar"
+            render plain: "bar"
           end
         end
       RUBY
@@ -206,7 +206,7 @@ module ApplicationTests
       controller "foo", <<-RUBY
         class FooController < ApplicationController
           def index
-            render text: "foo"
+            render plain: "foo"
           end
         end
       RUBY
@@ -215,7 +215,7 @@ module ApplicationTests
         module Admin
           class FooController < ApplicationController
             def index
-              render text: "admin::foo"
+              render plain: "admin::foo"
             end
           end
         end
@@ -268,11 +268,11 @@ module ApplicationTests
         controller :foo, <<-RUBY
           class FooController < ApplicationController
             def bar
-              render text: "bar"
+              render plain: "bar"
             end
 
             def baz
-              render text: "baz"
+              render plain: "baz"
             end
           end
         RUBY
@@ -332,7 +332,7 @@ module ApplicationTests
       controller :foo, <<-RUBY
         class FooController < ApplicationController
           def index
-            render :text => "foo"
+            render plain: "foo"
           end
         end
       RUBY
@@ -356,7 +356,7 @@ module ApplicationTests
       controller :foo, <<-RUBY
         class FooController < ApplicationController
           def index
-            render text: "foo"
+            render plain: "foo"
           end
         end
       RUBY
@@ -364,7 +364,7 @@ module ApplicationTests
       controller :bar, <<-RUBY
         class BarController < ApplicationController
           def index
-            render text: "bar"
+            render plain: "bar"
           end
         end
       RUBY
@@ -427,7 +427,7 @@ module ApplicationTests
       controller :foo, <<-RUBY
         class FooController < ApplicationController
           def index
-            render text: "foo"
+            render plain: "foo"
           end
         end
       RUBY
@@ -435,7 +435,7 @@ module ApplicationTests
       controller :bar, <<-RUBY
         class BarController < ApplicationController
           def index
-            render text: "bar"
+            render plain: "bar"
           end
         end
       RUBY
@@ -482,7 +482,7 @@ module ApplicationTests
       controller "yazilar", <<-RUBY
         class YazilarController < ApplicationController
           def index
-            render text: 'yazilar#index'
+            render plain: 'yazilar#index'
           end
         end
       RUBY
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index ced6c6b0a6..37f129475c 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -27,7 +27,7 @@ module ApplicationTests
 
       class ::OmgController < ::ApplicationController
         def index
-          render text: omg_path
+          render plain: omg_path
         end
       end
 
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 8c1fe43a10..6880cf306a 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -187,7 +187,7 @@ module TestHelpers
       controller :foo, <<-RUBY
         class FooController < ApplicationController
           def index
-            render text: "foo"
+            render plain: "foo"
           end
         end
       RUBY
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index 0c8896a715..397037a394 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -327,7 +327,7 @@ module RailtiesTest
       controller "foo", <<-RUBY
         class FooController < ActionController::Base
           def index
-            render :text => "foo"
+            render plain: "foo"
           end
         end
       RUBY
@@ -341,7 +341,7 @@ module RailtiesTest
       @plugin.write "app/controllers/bar_controller.rb", <<-RUBY
         class BarController < ActionController::Base
           def index
-            render :text => "bar"
+            render plain: "bar"
           end
         end
       RUBY
@@ -436,7 +436,7 @@ YAML
       @plugin.write "app/controllers/admin/foo/bar_controller.rb", <<-RUBY
         class Admin::Foo::BarController < ApplicationController
           def index
-            render text: "Rendered from namespace"
+            render plain: "Rendered from namespace"
           end
         end
       RUBY
@@ -536,7 +536,7 @@ YAML
       controller "foo", <<-RUBY
         class FooController < ActionController::Base
           def index
-            render text: params[:username]
+            render plain: params[:username]
           end
         end
       RUBY
@@ -700,7 +700,7 @@ YAML
           end
 
           def show
-            render text: foo_path
+            render plain: foo_path
           end
 
           def from_app
@@ -712,7 +712,7 @@ YAML
           end
 
           def polymorphic_path_without_namespace
-            render text: polymorphic_path(Post.new)
+            render plain: polymorphic_path(Post.new)
           end
         end
       RUBY
@@ -835,7 +835,7 @@ YAML
       @plugin.write "app/controllers/bukkits/awesome/foo_controller.rb", <<-RUBY
         class Bukkits::Awesome::FooController < ActionController::Base
           def index
-            render :text => "ok"
+            render plain: "ok"
           end
         end
       RUBY
@@ -1220,7 +1220,7 @@ YAML
                 fullpath: \#{request.fullpath}
                 path: \#{request.path}
               TEXT
-              render text: text
+              render plain: text
             end
           end
         end
@@ -1257,7 +1257,7 @@ YAML
       app_file "app/controllers/bar_controller.rb", <<-RUBY
         class BarController < ApplicationController
           def index
-            render text: bukkits.bukkit_path
+            render plain: bukkits.bukkit_path
           end
         end
       RUBY
@@ -1278,7 +1278,7 @@ YAML
       @plugin.write "app/controllers/bukkits/bukkit_controller.rb", <<-RUBY
         class Bukkits::BukkitController < ActionController::Base
           def index
-            render text: main_app.bar_path
+            render plain: main_app.bar_path
           end
         end
       RUBY
@@ -1306,7 +1306,7 @@ YAML
       app_file "app/controllers/bar_controller.rb", <<-RUBY
         class BarController < ApplicationController
           def index
-            render text: bukkits.bukkit_path
+            render plain: bukkits.bukkit_path
           end
         end
       RUBY
@@ -1327,7 +1327,7 @@ YAML
       @plugin.write "app/controllers/bukkits/bukkit_controller.rb", <<-RUBY
         class Bukkits::BukkitController < ActionController::Base
           def index
-            render text: main_app.bar_path
+            render plain: main_app.bar_path
           end
         end
       RUBY
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index 9db42c0c38..5838d0d7e7 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -50,7 +50,7 @@ module ApplicationTests
       @simple_plugin.write "app/controllers/weblogs_controller.rb", <<-RUBY
         class WeblogsController < ActionController::Base
           def index
-            render text: request.url
+            render plain: request.url
           end
         end
       RUBY
@@ -74,7 +74,7 @@ module ApplicationTests
         module Metrics
           class GeneratingController < ActionController::Base
             def generate_blog_route
-              render text: blog.post_path(1)
+              render plain: blog.post_path(1)
             end
 
             def generate_blog_route_in_view
@@ -122,14 +122,14 @@ module ApplicationTests
         module Blog
           class PostsController < ActionController::Base
             def index
-              render text: blog.post_path(1)
+              render plain: blog.post_path(1)
             end
 
             def generate_application_route
               path = main_app.url_for(controller: "/main",
                                  action: "index",
                                  only_path: true)
-              render text: path
+              render plain: path
             end
 
             def application_route_in_view
@@ -137,7 +137,7 @@ module ApplicationTests
             end
 
             def engine_polymorphic_path
-              render text: polymorphic_path(Post.new)
+              render plain: polymorphic_path(Post.new)
             end
 
             def engine_asset_path
@@ -150,7 +150,7 @@ module ApplicationTests
       app_file "app/controllers/application_generating_controller.rb", <<-RUBY
         class ApplicationGeneratingController < ActionController::Base
           def engine_route
-            render text: blog.posts_path
+            render plain: blog.posts_path
           end
 
           def engine_route_in_view
@@ -158,7 +158,7 @@ module ApplicationTests
           end
 
           def weblog_engine_route
-            render text: weblog.weblogs_path
+            render plain: weblog.weblogs_path
           end
 
           def weblog_engine_route_in_view
@@ -166,15 +166,15 @@ module ApplicationTests
           end
 
           def url_for_engine_route
-            render text: blog.url_for(controller: "blog/posts", action: "index", user: "john", only_path: true)
+            render plain: blog.url_for(controller: "blog/posts", action: "index", user: "john", only_path: true)
           end
 
           def polymorphic_route
-            render text: polymorphic_url([blog, Blog::Post.new])
+            render plain: polymorphic_url([blog, Blog::Post.new])
           end
 
           def application_polymorphic_path
-            render text: polymorphic_path(Blog::Post.new)
+            render plain: polymorphic_path(Blog::Post.new)
           end
         end
       RUBY