Show
Ignore:
Timestamp:
01/09/08 11:45:24 (11 months ago)
Author:
e.@brainspl.at
Message:

checking in server.rb refactor, split into config.rb boot_loader.rb, integrated Merb.root stuff. This will probably break a few small things and maybe some plugins but bear with me as this is a needed change. do not use Merb::Server.config[:foo] anymore, instead use Merb::Config[:foo], do not use MERB_ROOT anymore use Merb.root instead

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/rspec_generators/merb_controller_test/merb_controller_test_generator.rb

    r867 r1228  
    2828      @template_actions.each do |the_action|   
    2929        template_name = "#{the_action}.html.#{@engine}" 
    30         if File.exists?(File.join(MERB_ROOT, "app", "views", file_name, template_name)) 
     30        if File.exists?(File.join(Merb.root, "app", "views", file_name, template_name)) 
    3131          m.template "#{the_action}_spec.rb", "spec/views/#{file_name}/#{the_action}_html_spec.rb" 
    3232        end