render :once should consider the current controller prefix.

2 files changed, 33 insertions, 10 deletions

diff --git a/actionpack/test/controller/new_base/render_once_test.rb b/actionpack/test/controller/new_base/render_once_test.rb
index 63de25be52..3a847ac932 100644
--- a/actionpack/test/controller/new_base/render_once_test.rb
+++ b/actionpack/test/controller/new_base/render_once_test.rb
@@ -8,29 +8,42 @@ module RenderTemplate
       "test/a.html.erb"       => "a",
       "test/b.html.erb"       => "<>",
       "test/c.html.erb"       => "c",
-      "test/one.html.erb"     => "<%= render :once => 'test/result' %>",
-      "test/two.html.erb"     => "<%= render :once => 'test/result' %>",
-      "test/three.html.erb"   => "<%= render :once => 'test/result' %>",
+      "test/one.html.erb"     => "<%= render :once => 'result' %>",
+      "test/two.html.erb"     => "<%= render :once => 'result' %>",
+      "test/three.html.erb"   => "<%= render :once => 'result' %>",
       "test/result.html.erb"  => "YES!",
+      "other/result.html.erb" => "NO!",
       "layouts/test.html.erb" => "l<%= yield %>l"
     )
 
     self.view_paths = [RESOLVER]
 
+    def _prefix
+      "test"
+    end
+
     def multiple
-      render :once => %w(test/a test/b test/c)
+      render :once => %w(a b c)
     end
 
     def once
-      render :once => %w(test/one test/two test/three)
+      render :once => %w(one two three)
     end
 
     def duplicate
-      render :once => %w(test/a test/a test/a)
+      render :once => %w(a a a)
     end
 
     def with_layout
-      render :once => %w(test/a test/b test/c), :layout => "test"
+      render :once => %w(a b c), :layout => "test"
+    end
+
+    def with_prefix
+      render :once => "result", :prefix => "other"
+    end
+
+    def with_nil_prefix
+      render :once => "test/result", :prefix => nil
     end
   end
 
@@ -54,6 +67,16 @@ module RenderTemplate
       get :with_layout
       assert_response "la\n<>\ncl"
     end
+
+    def test_with_prefix_option
+      get :with_prefix
+      assert_response "NO!"
+    end
+
+    def test_with_nil_prefix_option
+      get :with_nil_prefix
+      assert_response "YES!"
+    end
   end
 
   class TestWithResolverCache < Rack::TestCase
diff --git a/actionpack/test/template/log_subscriber_test.rb b/actionpack/test/template/log_subscriber_test.rb
index 6fb8d39818..435936b19f 100644
--- a/actionpack/test/template/log_subscriber_test.rb
+++ b/actionpack/test/template/log_subscriber_test.rb
@@ -57,7 +57,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_partial_with_implicit_path
-    @view.stubs(:controller_path).returns("test")
+    @view.stubs(:controller_prefix).returns("test")
     @view.render(Customer.new("david"), :greeting => "hi")
     wait
 
@@ -74,7 +74,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_collection_with_implicit_path
-    @view.stubs(:controller_path).returns("test")
+    @view.stubs(:controller_prefix).returns("test")
     @view.render([ Customer.new("david"), Customer.new("mary") ], :greeting => "hi")
     wait
 
@@ -83,7 +83,7 @@ class AVLogSubscriberTest < ActiveSupport::TestCase
   end
 
   def test_render_collection_template_without_path
-    @view.stubs(:controller_path).returns("test")
+    @view.stubs(:controller_prefix).returns("test")
     @view.render([ GoodCustomer.new("david"), Customer.new("mary") ], :greeting => "hi")
     wait