Reapply the TemplateFinder first applied in [8669] then reverted in [8676]. Closes #10800 [lifofifo]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8683 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 2 insertions, 4 deletions

diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index b1ca400779..0516da32d8 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -16,7 +16,7 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     def hello_world_at_request_time() render(:action => 'hello_world') end
     private
     def add_view_path
-      self.class.view_paths.unshift "#{LOAD_PATH_ROOT}/override"
+      prepend_view_path "#{LOAD_PATH_ROOT}/override"
     end
   end
   
@@ -27,7 +27,6 @@ class ViewLoadPathsTest < Test::Unit::TestCase
   
   def setup
     TestController.view_paths = nil
-    ActionView::Base.cache_template_extensions = false
 
     @request  = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
@@ -45,7 +44,6 @@ class ViewLoadPathsTest < Test::Unit::TestCase
   
   def teardown
     ActiveSupport::Deprecation.behavior = @old_behavior
-    ActionView::Base.cache_template_extensions = true
   end
   
   def test_template_load_path_was_set_correctly
@@ -99,7 +97,7 @@ class ViewLoadPathsTest < Test::Unit::TestCase
   end
   
   def test_view_paths_override
-    TestController.view_paths.unshift "#{LOAD_PATH_ROOT}/override"
+    TestController.prepend_view_path "#{LOAD_PATH_ROOT}/override"
     get :hello_world
     assert_response :success
     assert_equal "Hello overridden world!", @response.body