Changeset 956

Show
Ignore:
Timestamp:
11/11/07 21:35:20 (1 year ago)
Author:
iv..@gweezlebur.com
Message:

Merki: re-drop default route, fix 1 of 2 failing specs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • apps/merki/trunk/config/router.rb

    r953 r956  
    2525 
    2626  r.match('/').to(:controller => 'pages', :action =>'index') 
    27    
    28   r.default_routes 
    2927end 

  • apps/merki/trunk/spec/controllers/pages_spec.rb

    r953 r956  
    2626  end 
    2727   
    28   it "should return success" do 
    29     @controller.status.should == 200 
    30   end 
    31    
    32   it "should display an error" do 
    33     pending "now forwards to NewPage" 
    34     @controller.body.should match(/Home Page not found/) 
     28  it "should redirect" do 
     29    @controller.status.should == 302 
    3530  end 
    3631end 

  • apps/merki/trunk/spec/views/pages/edit_html_spec.rb

    r943 r956  
    99 
    1010  it "should mention Pages" do 
    11     @body.should match(/Pages/) 
     11    @body.should match(/Edit Page/) 
    1212  end 
    1313end