Merge branch 'master' of git://github.com/rails/rails

1 files changed, 30 insertions, 5 deletions

diff --git a/actionpack/test/abstract/render_test.rb b/actionpack/test/abstract/render_test.rb
index 4bec44c9ae..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,8 +40,16 @@ module AbstractController
         render
       end
 
-      def shortcut
-        render "template"
+      def string
+        render "string"
+      end
+
+      def string_with_path
+        render "string/with_path"
+      end
+
+      def symbol
+        render :symbol
       end
 
       def template_name
@@ -77,9 +92,19 @@ module AbstractController
         assert_equal "With Default", @controller.response_body
       end
 
-      def test_render_template_through_shortcut
-        @controller.process(:shortcut)
-        assert_equal "With Template", @controller.response_body
+      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