aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/view_paths_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-01-19 03:20:39 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-01-19 03:20:39 +0000
commit84b0f9c739ffb82f3b8e0571c400014c34d0e369 (patch)
treecae7ff7cf03695f0ad9483a933a097e5c898d5b2 /actionpack/test/controller/view_paths_test.rb
parent4a644575c83d78e751f49cb6ba47e1c98af693a8 (diff)
downloadrails-84b0f9c739ffb82f3b8e0571c400014c34d0e369.tar.gz
rails-84b0f9c739ffb82f3b8e0571c400014c34d0e369.tar.bz2
rails-84b0f9c739ffb82f3b8e0571c400014c34d0e369.zip
Introduce TemplateFinder to handle view paths and lookups. Closes #10800.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/controller/view_paths_test.rb')
-rw-r--r--actionpack/test/controller/view_paths_test.rb6
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