deac/couchrest_model
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed the specs

Browse source
This commit is contained in:
Matt Aimonetti 2009-07-14 23:48:06 -07:00
parent b2a29d9eb7
commit 9a167cc27d
4 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/couchrest/mixins/views.rb
View file

@ -72,7 +72,7 @@ module CouchRest
# #
# To understand the capabilities of this view system more completely, # To understand the capabilities of this view system more completely,
# it is recommended that you read the RSpec file at # it is recommended that you read the RSpec file at
# <tt>spec/core/model_spec.rb</tt>. # <tt>spec/couchrest/more/extended_doc_spec.rb</tt>.
def view_by(*keys) def view_by(*keys)
opts = keys.pop if keys.last.is_a?(Hash) opts = keys.pop if keys.last.is_a?(Hash)
@ -124,14 +124,6 @@ module CouchRest
# potentially large indexes. # potentially large indexes.
def cleanup_design_docs!(db = database) def cleanup_design_docs!(db = database)
save_design_doc_on(db) save_design_doc_on(db)
# db.refresh_design_doc
# db.save_design_doc
# design_doc = model_design_doc(db)
# if design_doc
# db.delete_doc(design_doc)
# else
# false
# end
end end
private private

2
spec/couchrest/core/database_spec.rb
View file

@ -690,7 +690,7 @@ describe CouchRest::Database do
it "should recreate a db even tho it doesn't exist" do it "should recreate a db even tho it doesn't exist" do
@cr.databases.should_not include(@db2.name) @cr.databases.should_not include(@db2.name)
@db2.recreate! begin @db2.recreate! rescue nil end
@cr.databases.should include(@db2.name) @cr.databases.should include(@db2.name)
end end

9
spec/couchrest/more/extended_doc_view_spec.rb
View file

@ -121,7 +121,7 @@ describe "ExtendedDocument views" do
describe "a model class not tied to a database" do describe "a model class not tied to a database" do
before(:all) do before(:all) do
reset_test_db! reset_test_db!
@db = DB @db = DB
%w{aaa bbb ddd eee}.each do |title| %w{aaa bbb ddd eee}.each do |title|
u = Unattached.new(:title => title) u = Unattached.new(:title => title)
u.database = @db u.database = @db
@ -133,14 +133,15 @@ describe "ExtendedDocument views" do
lambda{Unattached.all}.should raise_error lambda{Unattached.all}.should raise_error
end end
it "should query all" do it "should query all" do
rs = Unattached.all :database=>@db Unattached.cleanup_design_docs!(@db)
rs = Unattached.all :database => @db
rs.length.should == 4 rs.length.should == 4
end end
it "should barf on query if no database given" do it "should barf on query if no database given" do
lambda{Unattached.view :by_title}.should raise_error lambda{Unattached.view :by_title}.should raise_error
end end
it "should make the design doc upon first query" do it "should make the design doc upon first query" do
Unattached.by_title :database=>@db Unattached.by_title :database => @db
doc = Unattached.design_doc doc = Unattached.design_doc
doc['views']['all']['map'].should include('Unattached') doc['views']['all']['map'].should include('Unattached')
end end
@ -157,7 +158,7 @@ describe "ExtendedDocument views" do
things = [] things = []
Unattached.view(:by_title, :database=>@db) do |thing| Unattached.view(:by_title, :database=>@db) do |thing|
things << thing things << thing
end end
things[0]["doc"]["title"].should =='aaa' things[0]["doc"]["title"].should =='aaa'
end end
it "should yield with by_key method" do it "should yield with by_key method" do

2
spec/spec_helper.rb
View file

@ -20,7 +20,7 @@ class Basic < CouchRest::ExtendedDocument
end end
def reset_test_db! def reset_test_db!
DB.recreate! rescue nil DB.recreate! rescue nil
DB DB
end end