diff options
author | Matthew Draper <matthew@trebex.net> | 2015-07-18 12:42:08 +0930 |
---|---|---|
committer | Matthew Draper <matthew@trebex.net> | 2015-07-18 12:42:08 +0930 |
commit | e78746fefdd1c5528a10ca23a5f40804ef855086 (patch) | |
tree | deae317ebeca2cb20b57e9ad9a8c0c36720c8d7f /actionpack/test/controller/force_ssl_test.rb | |
parent | 0db98b3ec8226042a5c3400d594d803abb5b169f (diff) | |
parent | 8cb8ce98d903929342e2ca3a54a07ab5196baf93 (diff) | |
download | rails-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/force_ssl_test.rb')
-rw-r--r-- | actionpack/test/controller/force_ssl_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/test/controller/force_ssl_test.rb b/actionpack/test/controller/force_ssl_test.rb index 72ae30eb39..22f1cc7c22 100644 --- a/actionpack/test/controller/force_ssl_test.rb +++ b/actionpack/test/controller/force_ssl_test.rb @@ -2,11 +2,11 @@ require 'abstract_unit' 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 @@ class ForceSSLCustomOptions < ForceSSLController 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 @@ end 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 |