5 files changed, 569 insertions, 18 deletions
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"