diff options
author | Rick Olson <technoweenie@gmail.com> | 2007-02-04 20:47:05 +0000 |
---|---|---|
committer | Rick Olson <technoweenie@gmail.com> | 2007-02-04 20:47:05 +0000 |
commit | 69b0e5c44a05fddcac996c7aaaca61cb3188da5e (patch) | |
tree | 4e5da68ffe3eac5561a9101a451a2f56a701e989 /actionpack/test/template | |
parent | 8f614a80e725228c0cc0c03fd731c6cbad0ffcb7 (diff) | |
download | rails-69b0e5c44a05fddcac996c7aaaca61cb3188da5e.tar.gz rails-69b0e5c44a05fddcac996c7aaaca61cb3188da5e.tar.bz2 rails-69b0e5c44a05fddcac996c7aaaca61cb3188da5e.zip |
Allow Controllers to have multiple view_paths instead of a single template_root. Closes #2754 [John Long]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6120 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/template')
-rw-r--r-- | actionpack/test/template/deprecated_instance_variables_test.rb | 2 | ||||
-rw-r--r-- | actionpack/test/template/url_helper_test.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/template/deprecated_instance_variables_test.rb b/actionpack/test/template/deprecated_instance_variables_test.rb index 3a8d620b34..d3cffbc1e9 100644 --- a/actionpack/test/template/deprecated_instance_variables_test.rb +++ b/actionpack/test/template/deprecated_instance_variables_test.rb @@ -2,7 +2,7 @@ require "#{File.dirname(__FILE__)}/../abstract_unit" class DeprecatedViewInstanceVariablesTest < Test::Unit::TestCase class DeprecatedInstanceVariablesController < ActionController::Base - self.template_root = "#{File.dirname(__FILE__)}/../fixtures/" + self.view_paths = [ "#{File.dirname(__FILE__)}/../fixtures/" ] def self.controller_path; 'deprecated_instance_variables' end diff --git a/actionpack/test/template/url_helper_test.rb b/actionpack/test/template/url_helper_test.rb index 6080275379..8cef4ffe14 100644 --- a/actionpack/test/template/url_helper_test.rb +++ b/actionpack/test/template/url_helper_test.rb @@ -250,7 +250,7 @@ end class UrlHelperWithControllerTest < Test::Unit::TestCase class UrlHelperController < ActionController::Base - self.template_root = "#{File.dirname(__FILE__)}/../fixtures/" + self.view_paths = [ "#{File.dirname(__FILE__)}/../fixtures/" ] def self.controller_path; 'url_helper_with_controller' end @@ -305,7 +305,7 @@ end class LinkToUnlessCurrentWithControllerTest < Test::Unit::TestCase class TasksController < ActionController::Base - self.template_root = "#{File.dirname(__FILE__)}/../fixtures/" + self.view_paths = ["#{File.dirname(__FILE__)}/../fixtures/"] def self.controller_path; 'tasks' end |