Merge commit 'mattetti/master'

2009-07-19 00:01:07 -07:00 · 2009-07-19 00:01:07 -07:00 · 1e44302d1a
commit 1e44302d1a
parent 7bae8acc36 6c0d74717c
25 changed files with 695 additions and 135 deletions
--- a/spec/couchrest/core/database_spec.rb
+++ b/spec/couchrest/core/database_spec.rb
@ -690,7 +690,7 @@ describe CouchRest::Database do
    
    it "should recreate a db even tho it doesn't exist" do
      @cr.databases.should_not include(@db2.name)
-      @db2.recreate!
+      begin @db2.recreate! rescue nil end
      @cr.databases.should include(@db2.name)
    end