Merge branch 'master' of git://github.com/jchris/couchrest

* 'master' of git://github.com/jchris/couchrest:
  dcnstrct says Timeout::Error is the constant we probably mean
  fixed db spec
This commit is contained in:
Matt Aimonetti 2009-03-02 22:37:36 -08:00
commit 0250fea373
2 changed files with 3 additions and 2 deletions

View file

@ -37,7 +37,7 @@ if RUBY_VERSION.to_f < 1.9
if IO.select([@io], nil, nil, @read_timeout) if IO.select([@io], nil, nil, @read_timeout)
@rbuf << @io.read_nonblock(65536) @rbuf << @io.read_nonblock(65536)
else else
raise Timeout::TimeoutError raise Timeout::Error
end end
end end
end end

View file

@ -312,8 +312,9 @@ describe CouchRest::Database do
} }
} }
@db.save_doc(doc) @db.save_doc(doc)
doc['_rev'].should_not be_nil
doc['field'] << 'another value' doc['field'] << 'another value'
@db.save_doc(doc).should be_true @db.save_doc(doc)["ok"].should be_true
end end
it 'should be there' do it 'should be there' do