Changeset 682

Show
Ignore:
Timestamp:
09/24/07 07:50:16 (1 year ago)
Author:
r.@tinyclouds.org
Message:

Rename verbosely named spec files

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Rakefile

    r611 r682  
    104104Spec::Rake::SpecTask.new('specs') do |t| 
    105105  t.spec_opts = ["--format", "specdoc", "--colour"] 
    106   t.spec_files = Dir['specs/**/*_spec.rb'].sort 
     106  t.spec_files = Dir['specs/merb/*.rb'].sort 
    107107end 
    108108 
    …… 
    111111  t.spec_opts = ["--format", "specdoc", "--colour"] 
    112112  t.libs = ['lib', 'server/lib' ] 
    113   t.spec_files = ["specs/merb/merb_#{ENV['TASK']}_spec.rb"] 
     113  t.spec_files = ["specs/merb/#{ENV['TASK']}.rb"] 
    114114end 
    115115 
    …… 
    118118  t.spec_opts = ["--format", "html"] 
    119119  t.libs = ['lib', 'server/lib' ] 
    120   t.spec_files = Dir['specs/**/*_spec.rb'].sort 
     120  t.spec_files = Dir['specs/merb/*.rb'].sort 
    121121end 
    122122 
    …… 
    124124Spec::Rake::SpecTask.new('rcov') do |t| 
    125125  t.spec_opts = ["--format", "specdoc", "--colour"] 
    126   t.spec_files = Dir['specs/**/*_spec.rb'].sort 
     126  t.spec_files = Dir['specs/merb/*.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}_spec.rb") 
    165       run_file_name = "specs/merb/#{file_name}_spec.rb"  
    166     elsif File.exist?("specs/merb/merb_#{file_name}_spec.rb") 
    167       run_file_name = "specs/merb/merb_#{file_name}_spec.rb"  
     164    if File.exist?("specs/merb/#{file_name}.rb") 
     165      run_file_name = "specs/merb/#{file_name}.rb"  
    168166    end 
    169167     

  • trunk/app_generators/merb/templates/config/router.rb

    r453 r682  
    1818# 
    1919# You can also use regular expressions, deferred routes, and many other options. 
    20 # See merb/specs/merb/merb_router_spec.rb for a fairly complete usage sample. 
     20# See merb/specs/merb/router.rb for a fairly complete usage sample. 
    2121 
    2222puts "Compiling routes.." 

  • trunk/specs/merb/router.rb

    r494 r682  
    5050  end 
    5151   
     52  it "should be able to prepend routes to the @@routes list" do 
     53    r1, r2 = nil, nil 
     54    Merb::Router.prepare do |r| 
     55      r1 = r.match('/:controller/:action').to(:controller => '/admin/:controller') 
     56    end 
     57    Merb::Router.prepend do |r| 
     58      r2 = r.match('/:controller/:action').to(:controller => '/admin/:controller') 
     59    end 
     60    Merb::Router.routes[0].should == r2 
     61    Merb::Router.routes[1].should == r1 
     62  end 
     63   
     64  it "should be able to append routes to the @@routes list" do 
     65    r1, r2 = nil, nil 
     66    Merb::Router.prepare do |r| 
     67      r1 = r.match('/:controller/:action').to(:controller => '/admin/:controller') 
     68    end 
     69    Merb::Router.append do |r| 
     70      r2 = r.match('/:controller/:action').to(:controller => '/admin/:controller') 
     71    end 
     72    Merb::Router.routes[0].should == r1 
     73    Merb::Router.routes[1].should == r2 
     74  end 
     75 
    5276  # it "should be fast" do 
    5377  #   Merb::Router.prepare do |r|