Changeset 684

Show
Ignore:
Timestamp:
09/24/07 08:59:09 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

finish rename

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Rakefile

    r682 r684  
    104104Spec::Rake::SpecTask.new('specs') do |t| 
    105105  t.spec_opts = ["--format", "specdoc", "--colour"] 
    106   t.spec_files = Dir['specs/merb/*.rb'].sort 
     106  t.spec_files = Dir['spec/**/*_spec.rb'].sort 
    107107end 
    108108 
    …… 
    111111  t.spec_opts = ["--format", "specdoc", "--colour"] 
    112112  t.libs = ['lib', 'server/lib' ] 
    113   t.spec_files = ["specs/merb/#{ENV['TASK']}.rb"] 
     113  t.spec_files = ["spec/merb/#{ENV['TASK']}_spec.rb"] 
    114114end 
    115115 
    …… 
    118118  t.spec_opts = ["--format", "html"] 
    119119  t.libs = ['lib', 'server/lib' ] 
    120   t.spec_files = Dir['specs/merb/*.rb'].sort 
     120  t.spec_files = Dir['spec/**/*_spec.rb'].sort 
    121121end 
    122122 
    …… 
    124124Spec::Rake::SpecTask.new('rcov') do |t| 
    125125  t.spec_opts = ["--format", "specdoc", "--colour"] 
    126   t.spec_files = Dir['specs/merb/*.rb'].sort 
     126  t.spec_files = Dir['spec/**/*_spec.rb'].sort 
    127127  t.libs = ['lib', 'server/lib' ] 
    128128  t.rcov = true 
    …… 
    162162    spec_name = arguments[2..-1] 
    163163 
    164     if File.exist?("specs/merb/#{file_name}.rb") 
    165       run_file_name = "specs/merb/#{file_name}.rb"  
     164    if File.exist?("spec/merb/#{file_name}_spec.rb") 
     165      run_file_name = "spec/merb/#{file_name}_spec.rb"  
    166166    end 
    167167     

  • trunk/autotest/merbsource.rb

    r440 r684  
    1616    # since Ruby compares the REGEXP source, not the resulting pattern 
    1717    @test_mappings = { 
    18       %r%^specs/.*_spec\.rb$% => kernel.proc { |filename, _|  
     18      %r%^spec/.*_spec\.rb$% => kernel.proc { |filename, _|  
    1919        filename  
    2020      }, 
    2121      %r%^lib/merb/(.*)\.rb$% => kernel.proc { |_, m|  
    22         ["specs/#{m[1]}_spec.rb", "specs/merb/merb_#{m[1]}_spec.rb"]  
     22        ["spec/#{m[1]}_spec.rb", "spec/merb/#{m[1]}_spec.rb"]  
    2323      }, 
    2424      %r%^lib/merb\.rb$% => kernel.proc {  
    25         files_matching %r%^specs/.*_spec\.rb$%  
     25        files_matching %r%^spec/.*_spec\.rb$%  
    2626      }, 
    27       %r%^specs/(spec_helper|shared/.*)\.rb$% => kernel.proc {  
    28         files_matching %r%^specs/.*_spec\.rb$%  
     27      %r%^spec/(spec_helper|shared/.*)\.rb$% => kernel.proc {  
     28        files_matching %r%^spec/.*_spec\.rb$%  
    2929      } 
    3030    } 
    …… 
    5050    @tainted = true unless @files_to_test.empty? 
    5151  end 
    52  
     52   
    5353  def consolidate_failures(failed) 
    5454    filters = Hash.new { |h,k| h[k] = [] }