2 files changed, 40 insertions, 8 deletions
diff --git a/actionview/test/actionpack/abstract/abstract_controller_test.rb b/actionview/test/actionpack/abstract/abstract_controller_test.rb
index 40d3b17131..490932fef0 100644
--- a/actionview/test/actionpack/abstract/abstract_controller_test.rb
+++ b/actionview/test/actionpack/abstract/abstract_controller_test.rb
@@ -150,6 +150,38 @@ module AbstractController
       end
     end
 
+    class OverridingLocalPrefixes < AbstractController::Base
+      include AbstractController::Rendering
+      include ActionView::Rendering
+      append_view_path File.expand_path(File.join(File.dirname(__FILE__), "views"))
+
+      def index
+        render
+      end
+
+      def self.local_prefixes
+        # this would usually return "abstract_controller/testing/overriding_local_prefixes"
+        super + ["abstract_controller/testing/me3"]
+      end
+
+      class Inheriting < self
+      end
+    end
+
+    class OverridingLocalPrefixesTest < ActiveSupport::TestCase
+      test "overriding .local_prefixes adds prefix" do
+        @controller = OverridingLocalPrefixes.new
+        @controller.process(:index)
+        assert_equal "Hello from me3/index.erb", @controller.response_body
+      end
+
+      test ".local_prefixes is inherited" do
+        @controller = OverridingLocalPrefixes::Inheriting.new
+        @controller.process(:index)
+        assert_equal "Hello from me3/index.erb", @controller.response_body
+      end
+    end
+
     # Test rendering with layouts
     # ====
     # self._layout is used when defined
diff --git a/actionview/test/actionpack/abstract/render_test.rb b/actionview/test/actionpack/abstract/render_test.rb
index f9d8c916d9..d09f91c1e2 100644
--- a/actionview/test/actionpack/abstract/render_test.rb
+++ b/actionview/test/actionpack/abstract/render_test.rb
@@ -60,42 +60,42 @@ module AbstractController
       end
 
       def test_render_template
-        @controller.process(:template)
+        assert_equal "With Template", @controller.process(:template)
         assert_equal "With Template", @controller.response_body
       end
 
       def test_render_file
-        @controller.process(:file)
+        assert_equal "With File", @controller.process(:file)
         assert_equal "With File", @controller.response_body
       end
 
       def test_render_inline
-        @controller.process(:inline)
+        assert_equal "With Inline", @controller.process(:inline)
         assert_equal "With Inline", @controller.response_body
       end
 
       def test_render_text
-        @controller.process(:text)
+        assert_equal "With Text", @controller.process(:text)
         assert_equal "With Text", @controller.response_body
       end
 
       def test_render_default
-        @controller.process(:default)
+        assert_equal "With Default", @controller.process(:default)
         assert_equal "With Default", @controller.response_body
       end
 
       def test_render_string
-        @controller.process(:string)
+        assert_equal "With String", @controller.process(:string)
         assert_equal "With String", @controller.response_body
       end
 
       def test_render_symbol
-        @controller.process(:symbol)
+        assert_equal "With 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.process(:string_with_path)
         assert_equal "With String With Path", @controller.response_body
       end
     end