Changeset 274

Show
Ignore:
Timestamp:
06/07/07 22:26:02 (1 year ago)
Author:
e.@brainspl.at
Message:

fix stupid bug in viewcontext doh

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/merb/merb_view_context.rb

    r245 r274  
    99                       @body 
    1010                       @_fingerprint_before 
    11                        @pager 
    1211                       @session 
    1312                       @headers 
    14                        @page 
    1513                       @cookies 
    1614                       @request 

  • trunk/specs/merb/merb_part_controller_spec.rb

    r272 r274  
    88      memo << klass.new(self).dispatch(action) 
    99    end 
     10    p res  
    1011    res.size == 1 ? res[0] : res 
    1112  end 
    …… 
    2021   
    2122  def index3 
    22     part TodoPart => :one, TodoPart => :list 
     23    part(TodoPart => :one) + part(TodoPart => :list) 
    2324  end 
    2425   
    …… 
    5758    controller,action = request(:get, '/main/index2') 
    5859    controller.body.should == 
    59     "TODOPART\nDo this|Do that|Do the other thing\nTODOPART" 
     60      "TODOPART\nDo this|Do that|Do the other thing\nTODOPART" 
    6061  end 
    6162   
    …… 
    6364    controller,_ = request(:get, '/main/index') 
    6465    controller.body.should == 
    65     "TODOLAYOUT\nTODOPART\nDo this|Do that|Do the other thing\nTODOPART\nTODOLAYOUT" 
     66      "TODOLAYOUT\nTODOPART\nDo this|Do that|Do the other thing\nTODOPART\nTODOLAYOUT" 
    6667  end  
    6768   
    …… 
    6970    controller,_ = request(:get, '/main/index3') 
    7071    controller.body.should == 
    71     "TODOLAYOUT\nTODOPART\nDo this|Do that|Do the other thing\nTODOPART\nTODOLAYOUT" 
     72      "TODOPART\nDo this|Do that|Do the other thing\nTODOPART" + 
     73      "TODOLAYOUT\nTODOPART\nDo this|Do that|Do the other thing\nTODOPART\nTODOLAYOUT" 
    7274  end  
    7375