Changeset 233

Show
Ignore:
Timestamp:
05/04/07 19:08:40 (2 years ago)
Author:
e.@brainspl.at
Message:

got rspec_on_merb working with mrblog for user model specs, added rak specs task to mrblog's rakefile

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • mrblog/trunk/Rakefile

    r133 r233  
    22require 'rake/rdoctask' 
    33require 'rake/testtask' 
     4require 'spec/rake/spectask' 
    45require 'code_statistics'  
    56require 'fileutils' 
    …… 
    2627task :uninstall => [:clean] do 
    2728  sh %{sudo gem uninstall #{NAME}} 
     29end 
     30 
     31desc "Run all specs" 
     32Spec::Rake::SpecTask.new('specs') do |t| 
     33  t.spec_opts = ["--format", "specdoc"] 
     34  t.libs = ['lib', 'server/lib' ] 
     35  t.spec_files = FileList['test/spec/**/*_spec.rb'] 
    2836end 
    2937 

  • mrblog/trunk/dist/conf/merb_init.example.rb

    r218 r233  
    99  :adapter => 'mysql', 
    1010  :username => 'root', 
    11   :password => 'reversal', 
     11  :password => 'xxxxxx', 
    1212  :database => 'merb' 
    1313) 
    …… 
    2121Dir[DIST_ROOT+"/plugins/*/init.rb"].each { |m| require m }  
    2222 
    23 module Merb 
     23module MrBlog 
    2424  PER_PAGE = 10 
    2525end 

  • mrblog/trunk/dist/conf/router.rb

    r217 r233  
    1515  r.add '/', :controller => 'blog', :action =>'index' 
    1616end 
    17  
    18  
    19 puts Merb::RouteMatcher.new.compiled_statement 

  • mrblog/trunk/dist/schema/schema.rb

    r229 r233  
    33# then regenerate this schema definition. 
    44 
    5 ActiveRecord::Schema.define(:version => 4) do 
     5ActiveRecord::Schema.define(:version => 5) do 
    66 
    77  create_table "comments", :force => true do |t| 
    …… 
    3636    t.column "created_at",       :datetime 
    3737    t.column "updated_at",       :datetime 
     38    t.column "first_name",       :string 
     39    t.column "last_name",        :string 
    3840  end 
    3941