From d71f289fb29d7818620725346ed42ea6952708fa Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Sat, 3 Dec 2016 15:28:59 +0900
Subject: [PATCH] stop using removed `render :text`

Follow up to 79a5ea9eadb4d43b62afacedc0706cbe88c54496
---
 actionpack/test/dispatch/routing/ipv6_redirect_test.rb | 2 +-
 actionview/test/ujs/server.rb                          | 2 +-
 activesupport/lib/active_support/notifications.rb      | 4 ++--
 guides/source/action_mailer_basics.md                  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/actionpack/test/dispatch/routing/ipv6_redirect_test.rb b/actionpack/test/dispatch/routing/ipv6_redirect_test.rb
index 4987ed84e4..179aee9ba7 100644
--- a/actionpack/test/dispatch/routing/ipv6_redirect_test.rb
+++ b/actionpack/test/dispatch/routing/ipv6_redirect_test.rb
@@ -7,7 +7,7 @@ class IPv6IntegrationTest < ActionDispatch::IntegrationTest
   class ::BadRouteRequestController < ActionController::Base
     include Routes.url_helpers
     def index
-      render text: foo_path
+      render plain: foo_path
     end
 
     def foo
diff --git a/actionview/test/ujs/server.rb b/actionview/test/ujs/server.rb
index c7698c87fa..cc02cd8419 100644
--- a/actionview/test/ujs/server.rb
+++ b/actionview/test/ujs/server.rb
@@ -96,7 +96,7 @@ class TestsController < ActionController::Base
 
       render html: html.html_safe
     else
-      render text: "ERROR: #{request.path} requested without ajax", status: 404
+      render plain: "ERROR: #{request.path} requested without ajax", status: 404
     end
   end
 end
diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index bae5f067ae..2df819e554 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -13,7 +13,7 @@ module ActiveSupport
   # To instrument an event you just need to do:
   #
   #   ActiveSupport::Notifications.instrument('render', extra: :information) do
-  #     render text: 'Foo'
+  #     render plain: 'Foo'
   #   end
   #
   # That first executes the block and then notifies all subscribers once done.
@@ -48,7 +48,7 @@ module ActiveSupport
   # The block is saved and will be called whenever someone instruments "render":
   #
   #   ActiveSupport::Notifications.instrument('render', extra: :information) do
-  #     render text: 'Foo'
+  #     render plain: 'Foo'
   #   end
   #
   #   event = events.first
diff --git a/guides/source/action_mailer_basics.md b/guides/source/action_mailer_basics.md
index 34847832fd..0825d54cb7 100644
--- a/guides/source/action_mailer_basics.md
+++ b/guides/source/action_mailer_basics.md
@@ -400,7 +400,7 @@ class UserMailer < ApplicationMailer
     mail(to: @user.email,
          subject: 'Welcome to My Awesome Site') do |format|
       format.html { render 'another_template' }
-      format.text { render text: 'Render text' }
+      format.text { render plain: 'Render text' }
     end
   end
 end