Fix for ActionView::Template#refresh in rails 3.1.0.beta

Signed-off-by: José Valim <jose.valim@gmail.com>
rails · Oct 15, 2010 · c42ea21 · c42ea21
1 parent 69789c3
commit c42ea21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb
@@ -163,7 +163,7 @@ def refresh(view)
       name    = pieces.pop
       partial = !!name.sub!(/^_/, "")
       lookup.disable_cache do
-        lookup.find_template(name, pieces.join, partial, @locals)
+        lookup.find_template(name, pieces.join('/'), partial, @locals)
       end
     end
 

diff --git a/actionpack/test/template/template_test.rb b/actionpack/test/template/template_test.rb
@@ -93,9 +93,9 @@ def test_virtual_path
   end
 
   def test_refresh_with_templates
-    @template = new_template("Hello", :virtual_path => "test/foo")
+    @template = new_template("Hello", :virtual_path => "test/foo/bar")
     @template.locals = [:key]
-    @context.lookup_context.expects(:find_template).with("foo", "test", false, [:key]).returns("template")
+    @context.lookup_context.expects(:find_template).with("bar", "test/foo", false, [:key]).returns("template")
     assert_equal "template", @template.refresh(@context)
   end