From 65ceccb0ba13dc845e6c73ada09b354583c1557a Mon Sep 17 00:00:00 2001 From: Nick Sutterer Date: Tue, 3 May 2011 23:41:38 +0200 Subject: controller's prefixes are now added to LookupContext. --- actionpack/lib/abstract_controller/view_paths.rb | 7 +++++-- actionpack/test/controller/view_paths_test.rb | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/abstract_controller/view_paths.rb b/actionpack/lib/abstract_controller/view_paths.rb index cea0f5ad1e..4fdca2cc5c 100644 --- a/actionpack/lib/abstract_controller/view_paths.rb +++ b/actionpack/lib/abstract_controller/view_paths.rb @@ -15,7 +15,10 @@ module AbstractController # templates, i.e. view paths and details. Check ActionView::LookupContext for more # information. def lookup_context - @lookup_context ||= ActionView::LookupContext.new(self.class._view_paths, details_for_lookup) + @lookup_context ||= + ActionView::LookupContext.new(self.class._view_paths, details_for_lookup).tap do |ctx| + ctx.prefixes = _prefixes + end end def details_for_lookup @@ -67,4 +70,4 @@ module AbstractController end end end -end \ No newline at end of file +end diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb index 42356be1ea..3de1849db8 100644 --- a/actionpack/test/controller/view_paths_test.rb +++ b/actionpack/test/controller/view_paths_test.rb @@ -179,4 +179,8 @@ class ViewLoadPathsTest < ActionController::TestCase assert_nothing_raised { C.append_view_path 'c/path' } assert_paths C, "c/path" end + + def test_lookup_context_accessor + assert_equal ["test"], TestController.new.lookup_context.prefixes + end end -- cgit v1.2.3