From 8b3ee83e8da868a246122e41c450df95c11d5fb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Camargo?= Date: Fri, 15 Oct 2010 00:11:40 -0300 Subject: [PATCH] Fix for ActionView::Template#refresh in rails 3.1.0.beta --- actionpack/lib/action_view/template.rb | 2 +- actionpack/test/template/template_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actionpack/lib/action_view/template.rb b/actionpack/lib/action_view/template.rb index 7dd8acf..dbb1532 100644 --- a/actionpack/lib/action_view/template.rb +++ b/actionpack/lib/action_view/template.rb @@ -163,7 +163,7 @@ module ActionView 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 index 63f792d..2ec640c 100644 --- a/actionpack/test/template/template_test.rb +++ b/actionpack/test/template/template_test.rb @@ -93,9 +93,9 @@ class TestERBTemplate < ActiveSupport::TestCase 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 -- 1.7.1