Merge branch 'master' into adequaterecord

* master: (32 commits)
  Typo fix for unscope
  Use the reference for the mime type to get the format
  Preparing for 4.1.0.beta2 release
  Correctly escape PostgreSQL arrays.
  Escape format, negative_format and units options of number helpers
  Sync 4.1 release notes with changes since 7f648bc7 [ci skip]
  Update upgrading guide regarding `render :text`
  Add `#no_content_type` attribute to `AD::Response`
  Add missing CHANGELOG entry to Action View
  Update guides for new rendering options
  Cleanup `ActionController::Rendering`
  Fix a fragile test on `action_view/render`
  Introduce `render :html` for render HTML string
  Introduce `render :plain` for render plain text
  Update hash format for render_text_test
  Introduce `render :body` for render raw content
  Don't use `# =>` when it is not the expression values
  Fix the column name [ci skip]
  Document the default scopes change on the release notes, CHANGELOG and upgrating guides
  Move changelog entry to the top, fix examples indent [ci skip]
  ...

14 files changed, 672 insertions, 33 deletions

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 342f670e78..b05aa21f95 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,39 @@
+*   Introduce `render :html` as an option to render HTML content with a content
+    type of `text/html`. This rendering option calls `ERB::Util.html_escape`
+    internally to escape unsafe HTML string, so you will have to mark your
+    string as html safe if you have any HTML tag in it.
+
+    Please see #12374 for more detail.
+
+    *Prem Sichanugrist*
+
+*   Introduce `render :plain` as an option to render content with a content type
+    of `text/plain`. This is the preferred option if you are planning to render
+    a plain text content.
+
+    Please see #12374 for more detail.
+
+    *Prem Sichanugrist*
+
+*   Introduce `render :body` as an option for sending a raw content back to
+    browser. Note that this rendering option will unset the default content type
+    and does not include "Content-Type" header back in the response.
+
+    You should only use this option if you are expecting the "Content-Type"
+    header to not be set. More information on "Content-Type" header can be found
+    on RFC 2616, section 7.2.1.
+
+    Please see #12374 for more detail.
+
+    *Prem Sichanugrist*
+
+*   Set stream status to 500 (or 400 on BadRequest) when an error is thrown
+    before commiting.
+
+    Fixes #12552.
+
+    *Kevin Casey*
+
 *   Add new config option `config.action_dispatch.cookies_serializer` for
     specifying a serializer for the signed and encrypted cookie jars.
 
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index f24b03ad16..349bbf4ee7 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -23,7 +23,7 @@ module AbstractController
     def render(*args, &block)
       options = _normalize_render(*args, &block)
       self.response_body = render_to_body(options)
-      _process_format(rendered_format) if rendered_format
+      _process_format(rendered_format, options) if rendered_format
       self.response_body
     end
 
@@ -98,7 +98,7 @@ module AbstractController
 
     # Process the rendered format.
     # :api: private
-    def _process_format(format)
+    def _process_format(format, options = {})
     end
 
     # Normalize args and options.
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index 33014b97ca..fdf4ef293d 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -205,6 +205,8 @@ module ActionController
         begin
           super(name)
         rescue => e
+          @_response.status = 500 unless @_response.committed?
+          @_response.status = 400 if e.class == ActionController::BadRequest
           begin
             @_response.stream.write(ActionView::Base.streaming_completion_on_exception) if request.format == :html
             @_response.stream.call_on_error
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index bdf6e88699..e1bee9e60c 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -5,8 +5,8 @@ module ActionController
   module RackDelegation
     extend ActiveSupport::Concern
 
-    delegate :headers, :status=, :location=, :content_type=,
-             :status, :location, :content_type, :to => "@_response"
+    delegate :headers, :status=, :location=, :content_type=, :no_content_type=,
+             :status, :location, :content_type, :no_content_type, :to => "@_response"
 
     def dispatch(action, request)
       set_response!(request)
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 5c48b4ab98..3c4ef596c7 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -2,6 +2,8 @@ module ActionController
   module Rendering
     extend ActiveSupport::Concern
 
+    RENDER_FORMATS_IN_PRIORITY = [:body, :text, :plain, :html]
+
     # Before processing, set the request formats in current controller formats.
     def process_action(*) #:nodoc:
       self.formats = request.formats.map(&:ref).compact
@@ -27,14 +29,29 @@ module ActionController
     end
 
     def render_to_body(options = {})
-      super || options[:text].presence || ' '
+      super || _render_in_priorities(options) || ' '
     end
 
     private
 
-    def _process_format(format)
+    def _render_in_priorities(options)
+      RENDER_FORMATS_IN_PRIORITY.each do |format|
+        return options[format] if options.key?(format)
+      end
+
+      nil
+    end
+
+    def _process_format(format, options = {})
       super
-      self.content_type ||= format.to_s
+
+      if options[:body]
+        self.headers.delete "Content-Type"
+      elsif options[:plain]
+        self.content_type = Mime::TEXT
+      else
+        self.content_type ||= format.to_s
+      end
     end
 
     # Normalize arguments by catching blocks and setting them on :update.
@@ -46,12 +63,14 @@ module ActionController
 
     # Normalize both text and status options.
     def _normalize_options(options) #:nodoc:
-      if options.key?(:text) && options[:text].respond_to?(:to_text)
-        options[:text] = options[:text].to_text
+      _normalize_text(options)
+
+      if options[:html]
+        options[:html] = ERB::Util.html_escape(options[:html])
       end
 
-      if options.delete(:nothing) || (options.key?(:text) && options[:text].nil?)
-        options[:text] = " "
+      if options.delete(:nothing) || _any_render_format_is_nil?(options)
+        options[:body] = " "
       end
 
       if options[:status]
@@ -61,6 +80,18 @@ module ActionController
       super
     end
 
+    def _normalize_text(options)
+      RENDER_FORMATS_IN_PRIORITY.each do |format|
+        if options.key?(format) && options[format].respond_to?(:to_text)
+          options[format] = options[format].to_text
+        end
+      end
+    end
+
+    def _any_render_format_is_nil?(options)
+      RENDER_FORMATS_IN_PRIORITY.any? { |format| options.key?(format) && options[format].nil? }
+    end
+
     # Process controller specific options, as status, content-type and location.
     def _process_options(options) #:nodoc:
       status, content_type, location = options.values_at(:status, :content_type, :location)
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 2c6bcf7b7b..f14ca1ea44 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -63,6 +63,8 @@ module ActionDispatch # :nodoc:
     # content you're giving them, so we need to send that along.
     attr_accessor :charset
 
+    attr_accessor :no_content_type # :nodoc:
+
     CONTENT_TYPE = "Content-Type".freeze
     SET_COOKIE   = "Set-Cookie".freeze
     LOCATION     = "Location".freeze
@@ -303,8 +305,17 @@ module ActionDispatch # :nodoc:
       !@sending_file && @charset != false
     end
 
+    def remove_content_type!
+      headers.delete CONTENT_TYPE
+    end
+
     def rack_response(status, header)
-      assign_default_content_type_and_charset!(header)
+      if no_content_type
+        remove_content_type!
+      else
+        assign_default_content_type_and_charset!(header)
+      end
+
       handle_conditional_get!
 
       header[SET_COOKIE] = header[SET_COOKIE].join("\n") if header[SET_COOKIE].respond_to?(:join)
diff --git a/actionpack/lib/action_dispatch/middleware/remote_ip.rb b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
index 57bc6d5cd0..c1df518b14 100644
--- a/actionpack/lib/action_dispatch/middleware/remote_ip.rb
+++ b/actionpack/lib/action_dispatch/middleware/remote_ip.rb
@@ -47,12 +47,12 @@ module ActionDispatch
     # clients (like WAP devices), or behind proxies that set headers in an
     # incorrect or confusing way (like AWS ELB).
     #
-    # The +custom_trusted+ argument can take a regex, which will be used
+    # The +custom_proxies+ argument can take a regex, which will be used
     # instead of +TRUSTED_PROXIES+, or a string, which will be used in addition
     # to +TRUSTED_PROXIES+. Any proxy setup will put the value you want in the
     # middle (or at the beginning) of the X-Forwarded-For list, with your proxy
     # servers after it. If your proxies aren't removed, pass them in via the
-    # +custom_trusted+ parameter. That way, the middleware will ignore those
+    # +custom_proxies+ parameter. That way, the middleware will ignore those
     # IP addresses, and return the one that you want.
     def initialize(app, check_ip_spoofing = true, custom_proxies = nil)
       @app = app
diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb
index a51f6a434a..8da3069c8b 100644
--- a/actionpack/lib/action_pack/version.rb
+++ b/actionpack/lib/action_pack/version.rb
@@ -1,7 +1,7 @@
 module ActionPack
   # Returns the version of the currently loaded ActionPack as a Gem::Version
   def self.version
-    Gem::Version.new "4.1.0.beta1"
+    Gem::Version.new "4.1.0.beta2"
   end
 
   module VERSION #:nodoc:
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 0a431270b5..fb6a750089 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -156,6 +156,14 @@ module ActionController
         raise 'An exception occurred...'
       end
 
+      def exception_in_controller
+        raise 'Exception in controller'
+      end
+
+      def bad_request_error
+        raise ActionController::BadRequest
+      end
+
       def exception_in_exception_callback
         response.headers['Content-Type'] = 'text/event-stream'
         response.stream.on_error do
@@ -275,6 +283,16 @@ module ActionController
       end
     end
 
+    def test_exception_in_controller_before_streaming
+      response = get :exception_in_controller, format: 'text/event-stream'
+      assert_equal 500, response.status
+    end
+
+    def test_bad_request_in_controller_before_streaming
+      response = get :bad_request_error, format: 'text/event-stream'
+      assert_equal 400, response.status
+    end
+
     def test_exceptions_raised_handling_exceptions
       capture_log_output do |output|
         get :exception_in_exception_callback, format: 'text/event-stream'
diff --git a/actionpack/test/controller/new_base/render_body_test.rb b/actionpack/test/controller/new_base/render_body_test.rb
new file mode 100644
index 0000000000..a7e4f87bd9
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_body_test.rb
@@ -0,0 +1,175 @@
+require 'abstract_unit'
+
+module RenderBody
+  class MinimalController < ActionController::Metal
+    include AbstractController::Rendering
+    include ActionController::Rendering
+
+    def index
+      render body: "Hello World!"
+    end
+  end
+
+  class SimpleController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new]
+
+    def index
+      render body: "hello david"
+    end
+  end
+
+  class WithLayoutController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.erb" => "<%= yield %>, I'm here!",
+      "layouts/greetings.erb"   => "<%= yield %>, I wish thee well.",
+      "layouts/ivar.erb"        => "<%= yield %>, <%= @ivar %>"
+    )]
+
+    def index
+      render body: "hello david"
+    end
+
+    def custom_code
+      render body: "hello world", status: 404
+    end
+
+    def with_custom_code_as_string
+      render body: "hello world", status: "404 Not Found"
+    end
+
+    def with_nil
+      render body: nil
+    end
+
+    def with_nil_and_status
+      render body: nil, status: 403
+    end
+
+    def with_false
+      render body: false
+    end
+
+    def with_layout_true
+      render body: "hello world", layout: true
+    end
+
+    def with_layout_false
+      render body: "hello world", layout: false
+    end
+
+    def with_layout_nil
+      render body: "hello world", layout: nil
+    end
+
+    def with_custom_layout
+      render body: "hello world", layout: "greetings"
+    end
+
+    def with_ivar_in_layout
+      @ivar = "hello world"
+      render body: "hello world", layout: "ivar"
+    end
+  end
+
+  class RenderBodyTest < Rack::TestCase
+    test "rendering body from a minimal controller" do
+      get "/render_body/minimal/index"
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering body from an action with default options renders the body with the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_body/simple"
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering body from an action with default options renders the body without the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_body/with_layout"
+
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering body, while also providing a custom status code" do
+      get "/render_body/with_layout/custom_code"
+
+      assert_body "hello world"
+      assert_status 404
+    end
+
+    test "rendering body with nil returns an empty body padded for Safari" do
+      get "/render_body/with_layout/with_nil"
+
+      assert_body " "
+      assert_status 200
+    end
+
+    test "Rendering body with nil and custom status code returns an empty body padded for Safari and the status" do
+      get "/render_body/with_layout/with_nil_and_status"
+
+      assert_body " "
+      assert_status 403
+    end
+
+    test "rendering body with false returns the string 'false'" do
+      get "/render_body/with_layout/with_false"
+
+      assert_body "false"
+      assert_status 200
+    end
+
+    test "rendering body with layout: true" do
+      get "/render_body/with_layout/with_layout_true"
+
+      assert_body "hello world, I'm here!"
+      assert_status 200
+    end
+
+    test "rendering body with layout: 'greetings'" do
+      get "/render_body/with_layout/with_custom_layout"
+
+      assert_body "hello world, I wish thee well."
+      assert_status 200
+    end
+
+    test "rendering body with layout: false" do
+      get "/render_body/with_layout/with_layout_false"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering body with layout: nil" do
+      get "/render_body/with_layout/with_layout_nil"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering from minimal controller returns response with no content type" do
+      get "/render_body/minimal/index"
+
+      assert_header_no_content_type
+    end
+
+    test "rendering from normal controller returns response with no content type" do
+      get "/render_body/simple/index"
+
+      assert_header_no_content_type
+    end
+
+    def assert_header_no_content_type
+      assert_not response.headers.has_key?("Content-Type"),
+        %(Expect response not to have Content-Type header, got "#{response.headers["Content-Type"]}")
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_html_test.rb b/actionpack/test/controller/new_base/render_html_test.rb
new file mode 100644
index 0000000000..bfe0271df7
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_html_test.rb
@@ -0,0 +1,190 @@
+require 'abstract_unit'
+
+module RenderHtml
+  class MinimalController < ActionController::Metal
+    include AbstractController::Rendering
+    include ActionController::Rendering
+
+    def index
+      render html: "Hello World!"
+    end
+  end
+
+  class SimpleController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new]
+
+    def index
+      render html: "hello david"
+    end
+  end
+
+  class WithLayoutController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.html.erb" => "<%= yield %>, I'm here!",
+      "layouts/greetings.html.erb"   => "<%= yield %>, I wish thee well.",
+      "layouts/ivar.html.erb"        => "<%= yield %>, <%= @ivar %>"
+    )]
+
+    def index
+      render html: "hello david"
+    end
+
+    def custom_code
+      render html: "hello world", status: 404
+    end
+
+    def with_custom_code_as_string
+      render html: "hello world", status: "404 Not Found"
+    end
+
+    def with_nil
+      render html: nil
+    end
+
+    def with_nil_and_status
+      render html: nil, status: 403
+    end
+
+    def with_false
+      render html: false
+    end
+
+    def with_layout_true
+      render html: "hello world", layout: true
+    end
+
+    def with_layout_false
+      render html: "hello world", layout: false
+    end
+
+    def with_layout_nil
+      render html: "hello world", layout: nil
+    end
+
+    def with_custom_layout
+      render html: "hello world", layout: "greetings"
+    end
+
+    def with_ivar_in_layout
+      @ivar = "hello world"
+      render html: "hello world", layout: "ivar"
+    end
+
+    def with_unsafe_html_tag
+      render html: "<p>hello world</p>", layout: nil
+    end
+
+    def with_safe_html_tag
+      render html: "<p>hello world</p>".html_safe, layout: nil
+    end
+  end
+
+  class RenderHtmlTest < Rack::TestCase
+    test "rendering text from a minimal controller" do
+      get "/render_html/minimal/index"
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering text from an action with default options renders the text with the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_html/simple"
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering text from an action with default options renders the text without the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_html/with_layout"
+
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering text, while also providing a custom status code" do
+      get "/render_html/with_layout/custom_code"
+
+      assert_body "hello world"
+      assert_status 404
+    end
+
+    test "rendering text with nil returns an empty body padded for Safari" do
+      get "/render_html/with_layout/with_nil"
+
+      assert_body " "
+      assert_status 200
+    end
+
+    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+      get "/render_html/with_layout/with_nil_and_status"
+
+      assert_body " "
+      assert_status 403
+    end
+
+    test "rendering text with false returns the string 'false'" do
+      get "/render_html/with_layout/with_false"
+
+      assert_body "false"
+      assert_status 200
+    end
+
+    test "rendering text with layout: true" do
+      get "/render_html/with_layout/with_layout_true"
+
+      assert_body "hello world, I'm here!"
+      assert_status 200
+    end
+
+    test "rendering text with layout: 'greetings'" do
+      get "/render_html/with_layout/with_custom_layout"
+
+      assert_body "hello world, I wish thee well."
+      assert_status 200
+    end
+
+    test "rendering text with layout: false" do
+      get "/render_html/with_layout/with_layout_false"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering text with layout: nil" do
+      get "/render_html/with_layout/with_layout_nil"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering html should escape the string if it is not html safe" do
+      get "/render_html/with_layout/with_unsafe_html_tag"
+
+      assert_body "&lt;p&gt;hello world&lt;/p&gt;"
+      assert_status 200
+    end
+
+    test "rendering html should not escape the string if it is html safe" do
+      get "/render_html/with_layout/with_safe_html_tag"
+
+      assert_body "<p>hello world</p>"
+      assert_status 200
+    end
+
+    test "rendering from minimal controller returns response with text/html content type" do
+      get "/render_html/minimal/index"
+      assert_content_type "text/html"
+    end
+
+    test "rendering from normal controller returns response with text/html content type" do
+      get "/render_html/simple/index"
+      assert_content_type "text/html; charset=utf-8"
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_plain_test.rb b/actionpack/test/controller/new_base/render_plain_test.rb
new file mode 100644
index 0000000000..dba2e9f13e
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_plain_test.rb
@@ -0,0 +1,168 @@
+require 'abstract_unit'
+
+module RenderPlain
+  class MinimalController < ActionController::Metal
+    include AbstractController::Rendering
+    include ActionController::Rendering
+
+    def index
+      render plain: "Hello World!"
+    end
+  end
+
+  class SimpleController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new]
+
+    def index
+      render plain: "hello david"
+    end
+  end
+
+  class WithLayoutController < ::ApplicationController
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "layouts/application.text.erb" => "<%= yield %>, I'm here!",
+      "layouts/greetings.text.erb"   => "<%= yield %>, I wish thee well.",
+      "layouts/ivar.text.erb"        => "<%= yield %>, <%= @ivar %>"
+    )]
+
+    def index
+      render plain: "hello david"
+    end
+
+    def custom_code
+      render plain: "hello world", status: 404
+    end
+
+    def with_custom_code_as_string
+      render plain: "hello world", status: "404 Not Found"
+    end
+
+    def with_nil
+      render plain: nil
+    end
+
+    def with_nil_and_status
+      render plain: nil, status: 403
+    end
+
+    def with_false
+      render plain: false
+    end
+
+    def with_layout_true
+      render plain: "hello world", layout: true
+    end
+
+    def with_layout_false
+      render plain: "hello world", layout: false
+    end
+
+    def with_layout_nil
+      render plain: "hello world", layout: nil
+    end
+
+    def with_custom_layout
+      render plain: "hello world", layout: "greetings"
+    end
+
+    def with_ivar_in_layout
+      @ivar = "hello world"
+      render plain: "hello world", layout: "ivar"
+    end
+  end
+
+  class RenderPlainTest < Rack::TestCase
+    test "rendering text from a minimal controller" do
+      get "/render_plain/minimal/index"
+      assert_body "Hello World!"
+      assert_status 200
+    end
+
+    test "rendering text from an action with default options renders the text with the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_plain/simple"
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering text from an action with default options renders the text without the layout" do
+      with_routing do |set|
+        set.draw { get ':controller', action: 'index' }
+
+        get "/render_plain/with_layout"
+
+        assert_body "hello david"
+        assert_status 200
+      end
+    end
+
+    test "rendering text, while also providing a custom status code" do
+      get "/render_plain/with_layout/custom_code"
+
+      assert_body "hello world"
+      assert_status 404
+    end
+
+    test "rendering text with nil returns an empty body padded for Safari" do
+      get "/render_plain/with_layout/with_nil"
+
+      assert_body " "
+      assert_status 200
+    end
+
+    test "Rendering text with nil and custom status code returns an empty body padded for Safari and the status" do
+      get "/render_plain/with_layout/with_nil_and_status"
+
+      assert_body " "
+      assert_status 403
+    end
+
+    test "rendering text with false returns the string 'false'" do
+      get "/render_plain/with_layout/with_false"
+
+      assert_body "false"
+      assert_status 200
+    end
+
+    test "rendering text with layout: true" do
+      get "/render_plain/with_layout/with_layout_true"
+
+      assert_body "hello world, I'm here!"
+      assert_status 200
+    end
+
+    test "rendering text with layout: 'greetings'" do
+      get "/render_plain/with_layout/with_custom_layout"
+
+      assert_body "hello world, I wish thee well."
+      assert_status 200
+    end
+
+    test "rendering text with layout: false" do
+      get "/render_plain/with_layout/with_layout_false"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering text with layout: nil" do
+      get "/render_plain/with_layout/with_layout_nil"
+
+      assert_body "hello world"
+      assert_status 200
+    end
+
+    test "rendering from minimal controller returns response with text/plain content type" do
+      get "/render_plain/minimal/index"
+      assert_content_type "text/plain"
+    end
+
+    test "rendering from normal controller returns response with text/plain content type" do
+      get "/render_plain/simple/index"
+      assert_content_type "text/plain; charset=utf-8"
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_text_test.rb b/actionpack/test/controller/new_base/render_text_test.rb
index 2a253799f3..abb81d7e71 100644
--- a/actionpack/test/controller/new_base/render_text_test.rb
+++ b/actionpack/test/controller/new_base/render_text_test.rb
@@ -14,7 +14,7 @@ module RenderText
     self.view_paths = [ActionView::FixtureResolver.new]
 
     def index
-      render :text => "hello david"
+      render text: "hello david"
     end
   end
 
@@ -26,48 +26,48 @@ module RenderText
     )]
 
     def index
-      render :text => "hello david"
+      render text: "hello david"
     end
 
     def custom_code
-      render :text => "hello world", :status => 404
+      render text: "hello world", status: 404
     end
 
     def with_custom_code_as_string
-      render :text => "hello world", :status => "404 Not Found"
+      render text: "hello world", status: "404 Not Found"
     end
 
     def with_nil
-      render :text => nil
+      render text: nil
     end
 
     def with_nil_and_status
-      render :text => nil, :status => 403
+      render text: nil, status: 403
     end
 
     def with_false
-      render :text => false
+      render text: false
     end
 
     def with_layout_true
-      render :text => "hello world", :layout => true
+      render text: "hello world", layout: true
     end
 
     def with_layout_false
-      render :text => "hello world", :layout => false
+      render text: "hello world", layout: false
     end
 
     def with_layout_nil
-      render :text => "hello world", :layout => nil
+      render text: "hello world", layout: nil
     end
 
     def with_custom_layout
-      render :text => "hello world", :layout => "greetings"
+      render text: "hello world", layout: "greetings"
     end
 
     def with_ivar_in_layout
       @ivar = "hello world"
-      render :text => "hello world", :layout => "ivar"
+      render text: "hello world", layout: "ivar"
     end
   end
 
@@ -80,7 +80,7 @@ module RenderText
 
     test "rendering text from an action with default options renders the text with the layout" do
       with_routing do |set|
-        set.draw { get ':controller', :action => 'index' }
+        set.draw { get ':controller', action: 'index' }
 
         get "/render_text/simple"
         assert_body "hello david"
@@ -90,7 +90,7 @@ module RenderText
 
     test "rendering text from an action with default options renders the text without the layout" do
       with_routing do |set|
-        set.draw { get ':controller', :action => 'index' }
+        set.draw { get ':controller', action: 'index' }
 
         get "/render_text/with_layout"
 
@@ -127,28 +127,28 @@ module RenderText
       assert_status 200
     end
 
-    test "rendering text with :layout => true" do
+    test "rendering text with layout: true" do
       get "/render_text/with_layout/with_layout_true"
 
       assert_body "hello world, I'm here!"
       assert_status 200
     end
 
-    test "rendering text with :layout => 'greetings'" do
+    test "rendering text with layout: 'greetings'" do
       get "/render_text/with_layout/with_custom_layout"
 
       assert_body "hello world, I wish thee well."
       assert_status 200
     end
 
-    test "rendering text with :layout => false" do
+    test "rendering text with layout: false" do
       get "/render_text/with_layout/with_layout_false"
 
       assert_body "hello world"
       assert_status 200
     end
 
-    test "rendering text with :layout => nil" do
+    test "rendering text with layout: nil" do
       get "/render_text/with_layout/with_layout_nil"
 
       assert_body "hello world"
diff --git a/actionpack/test/dispatch/response_test.rb b/actionpack/test/dispatch/response_test.rb
index 959a3bc5cd..1360ede3f8 100644
--- a/actionpack/test/dispatch/response_test.rb
+++ b/actionpack/test/dispatch/response_test.rb
@@ -235,6 +235,14 @@ class ResponseTest < ActiveSupport::TestCase
       assert_equal @response.body, body.each.to_a.join
     end
   end
+
+  test "does not add default content-type if Content-Type is none" do
+    resp = ActionDispatch::Response.new.tap { |response|
+      response.no_content_type = true
+    }
+
+    assert_not resp.headers.has_key?('Content-Type')
+  end
 end
 
 class ResponseIntegrationTest < ActionDispatch::IntegrationTest