Merge remote branch 'mainstream/master'

1 files changed, 34 insertions, 0 deletions

diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index be0478b638..ffd430fa86 100644
--- a/actionpack/test/abstract/render_test.rb
+++ b/actionpack/test/abstract/render_test.rb
@@ -6,9 +6,16 @@ module AbstractController
     class ControllerRenderer < AbstractController::Base
       include AbstractController::Rendering
 
+      def _prefix
+        "renderer"
+      end
+
       self.view_paths = [ActionView::FixtureResolver.new(
         "default.erb" => "With Default",
         "template.erb" => "With Template",
+        "renderer/string.erb" => "With String",
+        "renderer/symbol.erb" => "With Symbol",
+        "string/with_path.erb" => "With String With Path",
         "some/file.erb" => "With File",
         "template_name.erb" => "With Template Name"
       )]
@@ -33,6 +40,18 @@ module AbstractController
         render
       end
 
+      def string
+        render "string"
+      end
+
+      def string_with_path
+        render "string/with_path"
+      end
+
+      def symbol
+        render :symbol
+      end
+
       def template_name
         render :_template_name => :template_name
       end
@@ -73,6 +92,21 @@ module AbstractController
         assert_equal "With Default", @controller.response_body
       end
 
+      def test_render_string
+        @controller.process(:string)
+        assert_equal "With String", @controller.response_body
+      end
+
+      def test_render_symbol
+        @controller.process(:symbol)
+        assert_equal "With Symbol", @controller.response_body
+      end
+
+      def test_render_string_with_path
+        @controller.process(:string_with_path)
+        assert_equal "With String With Path", @controller.response_body
+      end
+
       def test_render_template_name
         @controller.process(:template_name)
         assert_equal "With Template Name", @controller.response_body