Changeset 804

Show
Ignore:
Timestamp:
10/31/07 00:53:28 (1 year ago)
Author:
has.s..@gmail.com
Message:

Adds a test_unit helper for running tests.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app_generators/merb/merb_generator.rb

    r778 r804  
    3636      m.file_copy_each %w( development.rb production.rb test.rb ), "config/environments" 
    3737      m.file_copy_each %w( spec_helper.rb ), "spec" 
     38      m.file_copy_each %w( test_helper.rb), "test" 
    3839 
    3940      # build default config 

  • trunk/lib/merb.rb

    r802 r804  
    8080            "#{MERB_ROOT}/log/merb.#{Merb::Server.config[:port]}.log" 
    8181          end 
    82 FileUtils.mkdir_p(File.dirname(logpath)) 
     82FileUtils.mkdir_p(File.dirname(logpath)) if logpath.is_a?(String) 
    8383MERB_LOGGER = Merb::Logger.new(logpath) 
    8484MERB_LOGGER.level = Merb::Logger.const_get(Merb::Server.config[:log_level].upcase) rescue Merb::Logger::INFO 

  • trunk/lib/merb/generators/merb_generator_helpers.rb

    r737 r804  
    6868 
    6969Example: 
    70   #{$0} #{spec.name} project 
    71  
    72   If you already have 3 migrations, this will create the AddPeople migration in 
    73   schema/migration/004_add_people.rb 
     70  #{$0} #{spec.name} person 
     71 
     72  If you already have 3 migrations, this will create the AddModelPeople migration in 
     73  schema/migration/004_add_model_people.rb 
    7474 
    7575Options:  

  • trunk/lib/merb/test/rspec.rb

    r741 r804  
    11require 'hpricot' 
     2require 'spec' 
    23module MerbRspecMatchers 
    34  class HaveSelector