aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/base_test.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-05-28 09:23:51 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2015-05-28 09:23:51 -0300
commit172e452e0a0147701d08b85573fbabe22f2d9274 (patch)
treedf1d43df102bb584ac8a10891cb546862516b403 /actionpack/test/controller/base_test.rb
parent207f8fc7debec1e9173f797e5208527e97235af3 (diff)
parent44781b6e9790d90b4f8b9a41d2b2c114b1a582ee (diff)
downloadrails-172e452e0a0147701d08b85573fbabe22f2d9274.tar.gz
rails-172e452e0a0147701d08b85573fbabe22f2d9274.tar.bz2
rails-172e452e0a0147701d08b85573fbabe22f2d9274.zip
Merge pull request #20336 from vngrs/deprecate_nothing_option_for_render_method
Deprecate `:nothing` option for render method
Diffstat (limited to 'actionpack/test/controller/base_test.rb')
-rw-r--r--actionpack/test/controller/base_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/base_test.rb b/actionpack/test/controller/base_test.rb
index f7ad8e5158..3240185414 100644
--- a/actionpack/test/controller/base_test.rb
+++ b/actionpack/test/controller/base_test.rb
@@ -13,7 +13,7 @@ end
class NonEmptyController < ActionController::Base
def public_action
- render :nothing => true
+ head :ok
end
end
@@ -29,7 +29,7 @@ end
class OptionalDefaultUrlOptionsController < ActionController::Base
def show
- render nothing: true
+ head :ok
end
def default_url_options