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

Changeset 8372

Show
Ignore:
Timestamp:
12/10/07 20:41:59 (2 years ago)
Author:
bitsweat
Message:

Fix up template handler tests. Closes #10437.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r8341 r8372  
    253253    end 
    254254 
     255    def self.template_handler_extensions 
     256      @@template_handler_extensions ||= @@template_handlers.keys.map(&:to_s).sort 
     257    end 
     258 
    255259    register_default_template_handler :erb, TemplateHandlers::ERB 
    256260    register_template_handler :rjs, TemplateHandlers::RJS 
    …… 
    501505        checked_template_path = formatted ? "#{template_path}.#{template_format}" : template_path 
    502506 
    503         @@template_handlers.each do |extension,| 
     507        self.class.template_handler_extensions.each do |extension| 
    504508          if template_exists?(checked_template_path, extension) 
    505509            return formatted ? "#{template_format}.#{extension}" : extension.to_s 

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

    r8018 r8372  
    242242 
    243243  def hello_world_from_rxml_using_action 
    244     render :action => "hello_world.builder" 
     244    render :action => "hello_world_from_rxml.builder" 
    245245  end 
    246246 
    247247  def hello_world_from_rxml_using_template 
    248     render :template => "test/hello_world.builder" 
     248    render :template => "test/hello_world_from_rxml.builder" 
    249249  end 
    250250