From 88bc014acc82129e55a7ae7505cb62bacd0d685d Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Sat, 19 Jan 2008 06:01:57 +0000 Subject: Revert r8669 for now, breaks Action Mailer. Reopens #10800. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/test/controller/view_paths_test.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'actionpack/test/controller/view_paths_test.rb') diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb index 0516da32d8..b1ca400779 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 - prepend_view_path "#{LOAD_PATH_ROOT}/override" + self.class.view_paths.unshift "#{LOAD_PATH_ROOT}/override" end end @@ -27,6 +27,7 @@ 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 @@ -44,6 +45,7 @@ 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 @@ -97,7 +99,7 @@ class ViewLoadPathsTest < Test::Unit::TestCase end def test_view_paths_override - TestController.prepend_view_path "#{LOAD_PATH_ROOT}/override" + TestController.view_paths.unshift "#{LOAD_PATH_ROOT}/override" get :hello_world assert_response :success assert_equal "Hello overridden world!", @response.body -- cgit v1.2.3