@@ -66,7 +66,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t| # * filters # * integration # * test - # * view_paths t.test_files = %w( action_pack_assertions addresses_render assert_select base benchmark caching capture content_type cookie dispatcher @@ -74,7 +73,8 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t| http_digest_authentication layout logging mime_responds record_identifier redirect render render_js render_json render_other render_xml request_forgery_protection rescue - resources routing selector send_file url_rewriter verification webservice + resources routing selector send_file url_rewriter + verification view_paths webservice ).map { |name| "test/controller/#{name}_test.rb" } t.verbose = true end actionpack/Rakefile @@ -86,6 +86,10 @@ module AbstractController self.view_paths << path end + def prepend_view_path(path) + self.view_paths.unshift(path) + end + def view_paths self._view_paths end actionpack/lib/action_controller/abstract/renderer.rb @@ -116,5 +116,18 @@ module ActionController def performed? response_body end + + # ==== Request only view path switching ==== + def append_view_path(path) + view_paths.push(*path) + end + + def prepend_view_path(path) + view_paths.unshift(*path) + end + + def view_paths + _action_view.view_paths + end end end actionpack/lib/action_controller/new_base/compatibility.rb cbb0724f0d0d51a8097ba707517dcf1d09b07a31 Carl Lerche carllerche@mac.com http://github.com/technoweenie/rails/commit/09907d1b933d202333280fb2efc079f8bf969e16 09907d1b933d202333280fb2efc079f8bf969e16 2009-05-26T12:14:50-07:00 2009-05-26T12:14:50-07:00 Get controller/view_paths_test.rb to pass on new base 056d2f25b884660f7407147086a098d771ff16a6 Carl Lerche carllerche@mac.com