Changeset 273

Show
Ignore:
Timestamp:
06/07/07 21:10:25 (1 year ago)
Author:
e.@brainspl.at
Message:

update mrblog a tad

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • mrblog/trunk/dist/app/controllers/files.rb

    r235 r273  
    2323  end 
    2424   
     25  def xml 
     26    raise "Whack!" 
     27  end 
     28   
     29  def partial 
     30    render :partial => 'part', :locals => {:yo => 'Locals!'} 
     31  end 
     32   
    2533  def file 
    2634    send_file params[:file] 
  • mrblog/trunk/dist/conf/router.rb

    r233 r273  
    1111 
    1212puts "Compiling routes.." 
    13 Merb::RouteMatcher.prepare do |r| 
     13Merb::Router.prepare do |r| 
    1414  r.default_routes 
    1515  r.add '/', :controller => 'blog', :action =>'index' 
  • mrblog/trunk/test/spec/controllers/blog_spec.rb

    r235 r273  
    66  specify "should return list of posts" do 
    77    response, controller = get('/') 
     8    puts controller.instance_variables 
    89    response.should have_text(/louie/i) 
    910    response.should have_text(/FIrst Post!!1!/) 
  • mrblog/trunk/test/spec/spec_helper.rb

    r235 r273  
    4444  :adapter => 'mysql', 
    4545  :username => 'root', 
    46   :password => 'xxxxx', 
     46  :password => 'xxxxxxx', 
    4747  :database => 'mrblog_test', 
    4848  :host => 'localhost'