Changeset 1091

Show
Ignore:
Timestamp:
12/13/07 16:29:09 (1 year ago)
Author:
dudl..@misnomer.us
Message:

Fix failing cookie store spec

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/spec/merb/cookie_store_spec.rb

    r1056 r1091  
    3131describe Merb::CookieStore do 
    3232   
    33   def cookies(*which) 
    34     @cookies.values_at(*which) 
    35   end 
    36    
    37   def cookie_value(which) 
    38     @cookies[which].first 
    39   end 
    40    
    4133  before(:each) do 
    4234    @secret = 'Keep it secret; keep it safe.' 
    …… 
    4840    } 
    4941  end 
    50    
    51    
    52    
     42 
    5343  it "should raise argument error if missing secret key" do 
    5444    lambda { Merb::CookieStore.new(nil, nil) }.should raise_error(ArgumentError) 
    …… 
    5646   
    5747  it "should restore and unmarshal good cookies" do 
    58     cookies(:empty, :a_one, :typical).each do |value, expected| 
     48    @cookies.values_at(:empty, :a_one, :typical).each do |value, expected| 
    5949      session = Merb::CookieStore.new(value, @secret) 
    6050      session['lazy loads the data hash'].should be_nil 
    …… 
    6959   
    7060  it "should raise when data overflows" do 
    71     session =  Merb::CookieStore.new(cookie_value(:empty), @secret) 
     61    session =  Merb::CookieStore.new(@cookies[:empty].first, @secret) 
    7262    session['overflow'] = 'bye!' * 1024 
    7363    lambda { session.read_cookie }.should  
    …… 
    7565  end 
    7666 
    77    
    7867  it "should delete entries in the session" do 
    79     session = Merb::CookieStore.new(@cookies[:a_one][0], @secret) 
     68    session = Merb::CookieStore.new(@cookies[:a_one].first, @secret) 
    8069    session.delete('a').should == 1 
    8170  end