Permalink
Browse files

Remove deprecated support to :nothing in render

  • Loading branch information...
rafaelfranca committed May 21, 2016
1 parent 333bfd8 commit 57e1c99a280bdc1b324936a690350320a1cd8111
View
@@ -1,3 +1,7 @@
* Remove deprecated support to `:nothing` in `render`.
*Rafael Mendonça França*
* Remove deprecated support to `:back` in `redirect_to`.
*Rafael Mendonça França*
@@ -98,11 +98,6 @@ def _normalize_options(options) #:nodoc:
options[:html] = ERB::Util.html_escape(options[:html])
end
if options.delete(:nothing)
ActiveSupport::Deprecation.warn("`:nothing` option is deprecated and will be removed in Rails 5.1. Use `head` method to respond with empty response body.")
options[:body] = nil
end
if options[:status]
options[:status] = Rack::Utils.status_code(options[:status])
end
@@ -160,10 +160,6 @@ def conditional_hello_with_cache_control_headers
render action: "hello_world"
end
def respond_with_empty_body
render nothing: true
end
def conditional_hello_with_bangs
render action: "hello_world"
end
@@ -371,12 +367,6 @@ def test_expires_now_with_cache_control_headers
assert_match(/no-transform/, @response.headers["Cache-Control"])
end
def test_render_nothing_deprecated
assert_deprecated do
get :respond_with_empty_body
end
end
def test_date_header_when_expires_in
time = Time.mktime(2011,10,30)
Time.stub :now, time do

0 comments on commit 57e1c99

Please sign in to comment.