Ticket #10787: remove_template_class.patch
| File remove_template_class.patch, 2.8 kB (added by lifofifo, 8 months ago) |
|---|
-
actionpack/test/controller/helper_test.rb
old new 46 46 eval("class #{controller_class_name} < TestController; end") 47 47 @controller_class = self.class.const_get(controller_class_name) 48 48 49 # Generate new template class and assign to controller.50 template_class_name = "Test#{@symbol}View"51 eval("class #{template_class_name} < ActionView::Base; end")52 @template_class = self.class.const_get(template_class_name)53 @controller_class.template_class = @template_class54 55 49 # Set default test helper. 56 50 self.test_helper = LocalAbcHelper 57 51 end 58 59 def teardown 60 # Reset template class. 61 #ActionController::Base.template_class = ActionView::Base 62 end 63 64 52 65 53 def test_deprecated_helper 66 54 assert_equal expected_helper_methods, missing_methods 67 55 assert_nothing_raised { @controller_class.helper TestHelper } -
actionpack/lib/action_controller/base.rb
old new 328 328 # Can be set to nil for no logging. Compatible with both Ruby's own Logger and Log4r loggers. 329 329 cattr_accessor :logger 330 330 331 # Determines which template class should be used by ActionController.332 cattr_accessor :template_class333 334 331 # Turn on +ignore_missing_templates+ if you want to unit test actions without making the associated templates. 335 332 cattr_accessor :ignore_missing_templates 336 333 … … 1115 1112 end 1116 1113 1117 1114 def initialize_template_class(response) 1118 unless @@template_class1119 raise "You must assign a template class through ActionController.template_class= before processing a request"1120 end1121 1122 1115 response.template = ActionView::Base.new(view_paths, {}, self) 1123 1116 response.template.extend self.class.master_helper_module 1124 1117 response.redirected_to = nil … … 1218 1211 end 1219 1212 1220 1213 def add_class_variables_to_assigns 1221 %w(view_paths logger template_classignore_missing_templates).each do |cvar|1214 %w(view_paths logger ignore_missing_templates).each do |cvar| 1222 1215 @assigns[cvar] = self.send(cvar) 1223 1216 end 1224 1217 end -
actionpack/lib/action_controller.rb
old new 58 58 require 'action_controller/headers' 59 59 60 60 require 'action_view' 61 ActionController::Base.template_class = ActionView::Base62 61 63 62 ActionController::Base.class_eval do 64 63 include ActionController::Flash
