Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8985

Show
Ignore:
Timestamp:
03/05/08 12:12:17 (2 months ago)
Author:
pratik
Message:

Remove unused ActionController::Base.template_class. Closes #10787

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r8981 r8985  
    11*SVN* 
     2 
     3* Remove unused ActionController::Base.template_class. Closes #10787 [Pratik] 
    24 
    35* Moved template handlers related code from ActionView::Base to ActionView::Template. [Pratik] 

  • trunk/actionpack/lib/action_controller.rb

    r8625 r8985  
    5959 
    6060require 'action_view' 
    61 ActionController::Base.template_class = ActionView::Base 
    6261 
    6362ActionController::Base.class_eval do 

  • trunk/actionpack/lib/action_controller/base.rb

    r8981 r8985  
    330330    cattr_accessor :logger 
    331331 
    332     # Determines which template class should be used by ActionController. 
    333     cattr_accessor :template_class 
    334  
    335332    # Turn on +ignore_missing_templates+ if you want to unit test actions without making the associated templates. 
    336333    cattr_accessor :ignore_missing_templates 
    …… 
    11231120       
    11241121      def initialize_template_class(response) 
    1125         unless @@template_class 
    1126           raise "You must assign a template class through ActionController.template_class= before processing a request" 
    1127         end 
    1128  
    11291122        response.template = ActionView::Base.new(self.class.view_paths, {}, self) 
    11301123        response.template.extend self.class.master_helper_module 
    …… 
    12261219 
    12271220      def add_class_variables_to_assigns 
    1228         %w(view_paths logger template_class ignore_missing_templates).each do |cvar| 
     1221        %w(view_paths logger ignore_missing_templates).each do |cvar| 
    12291222          @assigns[cvar] = self.send(cvar) 
    12301223        end 

  • trunk/actionpack/test/controller/helper_test.rb

    r8564 r8985  
    4747    @controller_class = self.class.const_get(controller_class_name) 
    4848 
    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_class 
    54  
    5549    # Set default test helper. 
    5650    self.test_helper = LocalAbcHelper 
    5751  end 
    58  
    59   def teardown 
    60     # Reset template class. 
    61     #ActionController::Base.template_class = ActionView::Base 
    62   end 
    63  
    64  
     52   
    6553  def test_deprecated_helper 
    6654    assert_equal expected_helper_methods, missing_methods