3 files changed, 71 insertions, 4 deletions
diff --git a/actionpack/test/controller/new_base/render_context_test.rb b/actionpack/test/controller/new_base/render_context_test.rb
new file mode 100644
index 0000000000..f41b14d5d6
--- /dev/null
+++ b/actionpack/test/controller/new_base/render_context_test.rb
@@ -0,0 +1,54 @@
+require 'abstract_unit'
+
+# This is testing the decoupling of view renderer and view context
+# by allowing the controller to be used as view context. This is
+# similar to the way sinatra renders templates.
+module RenderContext
+  class BasicController < ActionController::Base
+    self.view_paths = [ActionView::FixtureResolver.new(
+      "render_context/basic/hello_world.html.erb" => "<%= @value %> from <%= self.__controller_method__ %>",
+      "layouts/basic.html.erb" => "?<%= yield %>?"
+    )]
+
+    # 1) Include ActionView::Context to bring the required dependencies
+    include ActionView::Context
+
+    # 2) Call _prepare_context that will do the required initialization
+    before_filter :_prepare_context
+
+    def hello_world
+      @value = "Hello"
+      render :action => "hello_world", :layout => false
+    end
+
+    def with_layout
+      @value = "Hello"
+      render :action => "hello_world", :layout => "basic"
+    end
+
+    protected
+
+    # 3) Set view_context to self
+    def view_context
+      self
+    end
+
+    def __controller_method__
+      "controller context!"
+    end
+  end
+
+  class RenderContextTest < Rack::TestCase
+    test "rendering using the controller as context" do
+      get "/render_context/basic/hello_world"
+      assert_body "Hello from controller context!"
+      assert_status 200
+    end
+
+    test "rendering using the controller as context with layout" do
+      get "/render_context/basic/with_layout"
+      assert_body "?Hello from controller context!?"
+      assert_status 200
+    end
+  end
+end
diff --git a/actionpack/test/controller/new_base/render_implicit_action_test.rb b/actionpack/test/controller/new_base/render_implicit_action_test.rb
index 3bb3016fdb..1e2191d417 100644
--- a/actionpack/test/controller/new_base/render_implicit_action_test.rb
+++ b/actionpack/test/controller/new_base/render_implicit_action_test.rb
@@ -33,10 +33,10 @@ module RenderImplicitAction
       assert_status 200
     end
 
-    test "action_method? returns true for implicit actions" do
-      assert SimpleController.new.action_method?(:hello_world)
-      assert SimpleController.new.action_method?(:"hyphen-ated")
-      assert SimpleController.new.action_method?(:not_implemented)
+    test "available_action? returns true for implicit actions" do
+      assert SimpleController.new.available_action?(:hello_world)
+      assert SimpleController.new.available_action?(:"hyphen-ated")
+      assert SimpleController.new.available_action?(:not_implemented)
     end
   end
 end
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb
index fed8d40b47..48cf0ab9cb 100644
--- a/actionpack/test/controller/new_base/render_streaming_test.rb
+++ b/actionpack/test/controller/new_base/render_streaming_test.rb
@@ -83,6 +83,19 @@ module RenderStreaming
       assert_streaming!
     end
 
+    test "rendering with template exception logs the exception" do
+      io = StringIO.new
+      _old, ActionController::Base.logger = ActionController::Base.logger, Logger.new(io)
+
+      begin
+        get "/render_streaming/basic/template_exception"
+        io.rewind
+        assert_match "(undefined method `invalid!' for nil:NilClass)", io.read
+      ensure
+        ActionController::Base.logger = _old
+      end
+    end
+
     test "do not stream on HTTP/1.0" do
       get "/render_streaming/basic/hello_world", nil, "HTTP_VERSION" => "HTTP/1.0"
       assert_body "Hello world, I'm here!"