mongo_mapper 0.12.0 → 0.13.0.beta1

data/{test/functional/associations/test_many_documents_proxy.rb → spec/functional/associations/many_documents_proxy_spec.rb}

@@ -1,8 +1,7 @@
-require 'test_helper.rb'
-require 'models'
+require 'spec_helper.rb'
 
-class ManyDocumentsProxyTest < Test::Unit::TestCase
-  def setup
+describe "ManyDocumentsProxy" do
+  before do
     Project.collection.remove
     Status.collection.remove
 
@@ -17,12 +16,39 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     @owner_class.many :pets, :class => @pet_class, :foreign_key => :owner_id, :order => 'name'
   end
 
-  should "default reader to empty array" do
+  it "should return results if found via method_missing" do
+    @pet_class.class_eval do
+      def self.from_param(name)
+        find_by_name(name)
+      end
+
+      def self.all_from_param(names)
+        where(:name => names).all
+      end
+    end
+
+    instance = @owner_class.new
+    instance.pets.build(:name => "Foo")
+    instance.pets.build(:name => "Bar")
+    instance.save
+
+    instance.reload.pets.from_param("Foo").tap do |pet|
+      pet.should be_a @pet_class
+      pet.name.should == "Foo"
+    end
+
+    instance.reload.pets.all_from_param(["Foo", "Bar"]).tap do |pet|
+      pet.should be_a Array
+      pet.map(&:name).should =~ %w(Foo Bar)
+    end
+  end
+
+  it "should default reader to empty array" do
     project = Project.new
     project.statuses.should == []
   end
 
-  should "allow overriding association methods" do
+  it "should allow overriding association methods" do
     @owner_class.class_eval do
       def pets
         super
@@ -35,7 +61,35 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     instance.pets.should_not be_empty
   end
 
-  should "allow assignment of many associated documents using a hash" do
+  it "should be able to iterate associated documents in a callback" do
+    @owner_class.class_eval do
+      before_save :search_pets
+
+      def search_pets
+        pets.each { |p| p.name = "Animal" }
+      end
+    end
+
+    owner  = @owner_class.new
+    sophie = owner.pets.build(:name => "Sophie")
+    pippa  = owner.pets.build(:name => "Pippa")
+
+    owner.save
+    owner.reload
+    owner.pets.reload
+
+    pets = []
+    owner.pets.each { |p| pets << p }
+
+    pets.size.should == 2
+    pets.should include(sophie)
+    pets.should include(pippa)
+
+    sophie.reload.name.should == "Animal"
+    pippa.reload.name.should == "Animal"
+  end
+
+  it "should allow assignment of many associated documents using a hash" do
     person_attributes = {
       'name' => 'Mr. Pet Lover',
       'pets' => [
@@ -61,7 +115,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     owner.pets[1].species.should == 'Siberian Husky'
   end
 
-  should "allow adding to association like it was an array" do
+  it "should allow adding to association like it was an array" do
     project = Project.new
     project.statuses <<     Status.new(:name => 'Foo1!')
     project.statuses.push   Status.new(:name => 'Foo2!')
@@ -71,7 +125,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
 
   context "replacing the association" do
     context "with objects of the class" do
-      should "work" do
+      it "should work" do
         project = Project.new
         project.statuses = [Status.new(:name => "ready")]
         project.save.should be_true
@@ -83,7 +137,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "with Hashes" do
-      should "convert to objects of the class and work" do
+      it "should convert to objects of the class and work" do
         project = Project.new
         project.statuses = [{ 'name' => 'ready' }]
         project.save.should be_true
@@ -93,20 +147,20 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
         project.statuses[0].name.should == "ready"
       end
     end
-    
+
     context "with :dependent" do
-      setup do
+      before do
         @broker_class = Doc('Broker')
         @property_class = Doc('Property') do
           key :broker_id, ObjectId
           belongs_to :broker
         end
       end
-      
+
       context "=> destroy" do
-        setup do
+        before do
           @broker_class.many :properties, :class => @property_class, :dependent => :destroy
-    
+
           @broker = @broker_class.create(:name => "Bob")
           @property1 = @property_class.create
           @property2 = @property_class.create
@@ -115,32 +169,32 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
           @broker.properties << @property2
           @broker.properties << @property3
         end
-            
-        should "call destroy the existing documents" do
-          @broker.properties[0].expects(:destroy).once
-          @broker.properties[1].expects(:destroy).once
-          @broker.properties[2].expects(:destroy).once
+
+        it "should call destroy the existing documents" do
+          @broker.properties[0].should_receive(:destroy).once
+          @broker.properties[1].should_receive(:destroy).once
+          @broker.properties[2].should_receive(:destroy).once
           @broker.properties = [@property_class.new]
         end
-        
-        should "remove the existing document from the database" do
+
+        it "should remove the existing document from the database" do
           @property_class.count.should == 3
           @broker.properties = []
           @property_class.count.should == 0
         end
-        
-        should "skip over documents that are the same" do
-          @broker.properties[0].expects(:destroy).never
-          @broker.properties[1].expects(:destroy).once
-          @broker.properties[2].expects(:destroy).never
+
+        it "should skip over documents that are the same" do
+          @broker.properties[0].should_receive(:destroy).never
+          @broker.properties[1].should_receive(:destroy).once
+          @broker.properties[2].should_receive(:destroy).never
           @broker.properties = [@property3, @property1]
         end
       end
-      
+
       context "=> delete_all" do
-        setup do
+        before do
           @broker_class.many :properties, :class => @property_class, :dependent => :delete_all
-    
+
           @broker = @broker_class.create(:name => "Bob")
           @property1 = @property_class.create
           @property2 = @property_class.create
@@ -149,32 +203,32 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
           @broker.properties << @property2
           @broker.properties << @property3
         end
-            
-        should "call delete the existing documents" do
-          @broker.properties[0].expects(:delete).once
-          @broker.properties[1].expects(:delete).once
-          @broker.properties[2].expects(:delete).once
+
+        it "should call delete the existing documents" do
+          @broker.properties[0].should_receive(:delete).once
+          @broker.properties[1].should_receive(:delete).once
+          @broker.properties[2].should_receive(:delete).once
           @broker.properties = [@property_class.new]
         end
-        
-        should "remove the existing document from the database" do
+
+        it "should remove the existing document from the database" do
           @property_class.count.should == 3
           @broker.properties = []
           @property_class.count.should == 0
         end
-        
-        should "skip over documents that are the same" do
-          @broker.properties[0].expects(:delete).never
-          @broker.properties[1].expects(:delete).once
-          @broker.properties[2].expects(:delete).never
+
+        it "should skip over documents that are the same" do
+          @broker.properties[0].should_receive(:delete).never
+          @broker.properties[1].should_receive(:delete).once
+          @broker.properties[2].should_receive(:delete).never
           @broker.properties = [@property3, @property1]
         end
       end
-      
+
       context "=> nullify" do
-        setup do
+        before do
           @broker_class.many :properties, :class => @property_class, :dependent => :nullify
-    
+
           @broker = @broker_class.create(:name => "Bob")
           @property1 = @property_class.create
           @property2 = @property_class.create
@@ -183,38 +237,38 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
           @broker.properties << @property2
           @broker.properties << @property3
         end
-            
-        should "nullify the existing documents" do
+
+        it "should nullify the existing documents" do
           @property1.reload.broker_id.should == @broker.id
           @property2.reload.broker_id.should == @broker.id
           @property3.reload.broker_id.should == @broker.id
 
           @broker.properties = [@property_class.new]
-          
+
           @property1.reload.broker_id.should be_nil
           @property2.reload.broker_id.should be_nil
           @property3.reload.broker_id.should be_nil
         end
-        
-        should "skip over documents that are the same" do
+
+        it "should skip over documents that are the same" do
           @broker.properties = [@property3, @property1]
 
           @property1.reload.broker_id.should == @broker.id
           @property2.reload.broker_id.should be_nil
           @property3.reload.broker_id.should == @broker.id
         end
-        
-        should "work" do
+
+        it "should work" do
           old_properties = @broker.properties
           @broker.properties = [@property1, @property2, @property3]
           old_properties.should == @broker.properties
         end
       end
-      
+
       context "unspecified" do
-        should "nullify the existing documents" do
+        it "should nullify the existing documents" do
           @broker_class.many :properties, :class => @property_class
-    
+
           @broker = @broker_class.create(:name => "Bob")
           @property1 = @property_class.create
           @property2 = @property_class.create
@@ -224,7 +278,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
           @broker.properties << @property3
 
           @broker.properties = [@property_class.new]
-          
+
           @property1.reload.broker_id.should be_nil
           @property2.reload.broker_id.should be_nil
           @property3.reload.broker_id.should be_nil
@@ -235,7 +289,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
 
   context "using <<, push and concat" do
     context "with objects of the class" do
-      should "correctly assign foreign key" do
+      it "should correctly assign foreign key" do
         project = Project.new
         project.statuses <<     Status.new(:name => '<<')
         project.statuses.push   Status.new(:name => 'push')
@@ -249,7 +303,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "with Hashes" do
-      should "correctly convert to objects and assign foreign key" do
+      it "should correctly convert to objects and assign foreign key" do
         project = Project.new
         project.statuses <<     { 'name' => '<<' }
         project.statuses.push(  { 'name' => 'push' })
@@ -263,20 +317,20 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
   end
 
-  context "build" do
-    should "assign foreign key" do
+  context "#build" do
+    it "should assign foreign key" do
       project = Project.create
       status = project.statuses.build
       status.project_id.should == project.id
     end
 
-    should "allow assigning attributes" do
+    it "should allow assigning attributes" do
       project = Project.create
       status = project.statuses.build(:name => 'Foo')
       status.name.should == 'Foo'
     end
 
-    should "reset cache" do
+    it "should reset cache" do
       project = Project.create
       project.statuses.size.should == 0
       status = project.statuses.build(:name => 'Foo')
@@ -284,97 +338,121 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       project.statuses.size.should == 1
     end
 
-    should "update collection without save" do
+    it "should update collection without save" do
       project = Project.create
       project.statuses.build(:name => 'Foo')
       project.statuses.size.should == 1
     end
 
-    should "save built document when saving parent" do
+    it "should save built document when saving parent" do
       project = Project.create
       status = project.statuses.build(:name => 'Foo')
       project.save!
       status.should_not be_new
     end
 
-    should "not save the parent when building associations" do
+    it "should not save the parent when building associations" do
       project = Project.new
       status = project.statuses.build(:name => 'Foo')
       project.should be_new
     end
 
-    should "not save the built object" do
+    it "should not save the built object" do
       project = Project.new
       status = project.statuses.build(:name => 'Foo')
       status.should be_new
     end
+
+    it "should accept a block" do
+      project = Project.new
+      status = project.statuses.build do |doc|
+        doc.name = "Foo"
+      end
+      project.statuses[0].name.should == "Foo"
+    end
   end
 
-  context "create" do
-    should "assign foreign key" do
+  context "#create" do
+    it "should assign foreign key" do
       project = Project.create
       status = project.statuses.create(:name => 'Foo!')
       status.project_id.should == project.id
     end
 
-    should "save record" do
+    it "should save record" do
       project = Project.create
       lambda {
         project.statuses.create(:name => 'Foo!')
       }.should change { Status.count }
     end
 
-    should "allow passing attributes" do
+    it "should allow passing attributes" do
       project = Project.create
       status = project.statuses.create(:name => 'Foo!')
       status.name.should == 'Foo!'
     end
 
-    should "reset cache" do
+    it "should reset cache" do
       project = Project.create
       project.statuses.size.should == 0
       project.statuses.create(:name => 'Foo!')
       project.statuses.size.should == 1
     end
+
+    it "should accept a block" do
+      project = Project.new
+      status = project.statuses.create do |doc|
+        doc.name = "Foo"
+      end
+      project.statuses.first.name.should == "Foo"
+    end
   end
 
-  context "create!" do
-    should "assign foreign key" do
+  context "#create!" do
+    it "should assign foreign key" do
       project = Project.create
       status = project.statuses.create!(:name => 'Foo!')
       status.project_id.should == project.id
     end
 
-    should "save record" do
+    it "should save record" do
       project = Project.create
       lambda {
         project.statuses.create!(:name => 'Foo!')
       }.should change { Status.count }
     end
 
-    should "allow passing attributes" do
+    it "should allow passing attributes" do
       project = Project.create
       status = project.statuses.create!(:name => 'Foo!')
       status.name.should == 'Foo!'
     end
 
-    should "raise exception if not valid" do
+    it "should raise exception if not valid" do
       project = Project.create
-      lambda {
+      expect {
         project.statuses.create!(:name => nil)
-      }.should raise_error(MongoMapper::DocumentNotValid)
+      }.to raise_error(MongoMapper::DocumentNotValid)
     end
 
-    should "reset cache" do
+    it "should reset cache" do
       project = Project.create
       project.statuses.size.should == 0
       project.statuses.create!(:name => 'Foo!')
       project.statuses.size.should == 1
     end
+
+    it "should accept a block" do
+      project = Project.new
+      status = project.statuses.create! do |doc|
+        doc.name = "Foo"
+      end
+      status.name.should == "Foo"
+    end
   end
 
   context "count" do
-    should "work scoped to association" do
+    it "should work scoped to association" do
       project = Project.create
       3.times { project.statuses.create(:name => 'Foo!') }
 
@@ -385,7 +463,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       other_project.statuses.count.should == 2
     end
 
-    should "work with conditions" do
+    it "should work with conditions" do
       project = Project.create
       project.statuses.create(:name => 'Foo')
       project.statuses.create(:name => 'Other 1')
@@ -394,7 +472,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       project.statuses.count(:name => 'Foo').should == 1
     end
 
-    should "ignore unpersisted documents" do
+    it "should ignore unpersisted documents" do
       project = Project.create
       project.statuses.build(:name => 'Foo')
       project.statuses.count.should == 0
@@ -402,7 +480,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context "size" do
-    should "reflect both persisted and new documents" do
+    it "should reflect both persisted and new documents" do
       project = Project.create
       3.times { project.statuses.create(:name => 'Foo!') }
       2.times { project.statuses.build(:name => 'Foo!') }
@@ -411,26 +489,26 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context "empty?" do
-    should "be true with no associated docs" do
+    it "should be true with no associated docs" do
       project = Project.create
       project.statuses.empty?.should be_true
     end
 
-    should "be false if a document is built" do
+    it "should be false if a document is built" do
       project = Project.create
       project.statuses.build(:name => 'Foo!')
       project.statuses.empty?.should be_false
     end
 
-    should "be false if a document is created" do
+    it "should be false if a document is created" do
       project = Project.create
       project.statuses.create(:name => 'Foo!')
       project.statuses.empty?.should be_false
     end
   end
 
-  context "to_a" do
-    should "include persisted and new documents" do
+  context "#to_a" do
+    it "should include persisted and new documents" do
       project = Project.create
       3.times { project.statuses.create(:name => 'Foo!') }
       2.times { project.statuses.build(:name => 'Foo!') }
@@ -438,8 +516,17 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
   end
 
+  context "#map" do
+    it "should include persisted and new documents" do
+      project = Project.create
+      3.times { project.statuses.create(:name => 'Foo!') }
+      2.times { project.statuses.build(:name => 'Foo!') }
+      project.statuses.map(&:name).size.should == 5
+    end
+  end
+
   context "to_json" do
-    should "work on association" do
+    it "should work on association" do
       project = Project.create
       3.times { |i| project.statuses.create(:name => i.to_s) }
 
@@ -448,7 +535,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context "as_json" do
-    should "work on association" do
+    it "should work on association" do
       project = Project.create
       3.times { |i| project.statuses.create(:name => i.to_s) }
 
@@ -457,7 +544,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context "Unassociating documents" do
-    setup do
+    before do
       @project = Project.create
       @project.statuses << Status.create(:name => '1')
       @project.statuses << Status.create(:name => '2')
@@ -467,7 +554,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       @project2.statuses << Status.create(:name => '2')
     end
 
-    should "work with destroy all" do
+    it "should work with destroy all" do
       @project.statuses.count.should == 2
       @project.statuses.destroy_all
       @project.statuses.count.should == 0
@@ -476,7 +563,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       Status.count.should == 2
     end
 
-    should "work with destroy all and conditions" do
+    it "should work with destroy all and conditions" do
       @project.statuses.count.should == 2
       @project.statuses.destroy_all(:name => '1')
       @project.statuses.count.should == 1
@@ -485,7 +572,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       Status.count.should == 3
     end
 
-    should "work with delete all" do
+    it "should work with delete all" do
       @project.statuses.count.should == 2
       @project.statuses.delete_all
       @project.statuses.count.should == 0
@@ -494,7 +581,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       Status.count.should == 2
     end
 
-    should "work with delete all and conditions" do
+    it "should work with delete all and conditions" do
       @project.statuses.count.should == 2
       @project.statuses.delete_all(:name => '1')
       @project.statuses.count.should == 1
@@ -503,7 +590,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       Status.count.should == 3
     end
 
-    should "work with nullify" do
+    it "should work with nullify" do
       @project.statuses.count.should == 2
       @project.statuses.nullify
       @project.statuses.count.should == 0
@@ -516,7 +603,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context "Finding scoped to association" do
-    setup do
+    before do
       @project1          = Project.new(:name => 'Project 1')
       @brand_new         = Status.create(:name => 'New', :position => 1 )
       @complete          = Status.create(:name => 'Complete', :position => 2)
@@ -532,37 +619,37 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "include?" do
-      should "return true if in association" do
+      it "should return true if in association" do
         @project1.statuses.should include(@brand_new)
       end
 
-      should "return false if not in association" do
+      it "should return false if not in association" do
         @project1.statuses.should_not include(@in_progress)
       end
     end
 
     context "dynamic finders" do
-      should "work with single key" do
+      it "should work with single key" do
         @project1.statuses.find_by_name('New').should == @brand_new
         @project1.statuses.find_by_name!('New').should == @brand_new
         @project2.statuses.find_by_name('In Progress').should == @in_progress
         @project2.statuses.find_by_name!('In Progress').should == @in_progress
       end
 
-      should "work with multiple keys" do
+      it "should work with multiple keys" do
         @project1.statuses.find_by_name_and_position('New', 1).should == @brand_new
         @project1.statuses.find_by_name_and_position!('New', 1).should == @brand_new
         @project1.statuses.find_by_name_and_position('New', 2).should be_nil
       end
 
-      should "raise error when using !" do
+      it "should raise error when using !" do
         lambda {
           @project1.statuses.find_by_name!('Fake')
         }.should raise_error(MongoMapper::DocumentNotFound)
       end
 
       context "find_or_create_by" do
-        should "not create document if found" do
+        it "should not create document if found" do
           lambda {
             status = @project1.statuses.find_or_create_by_name('New')
             status.project.should == @project1
@@ -570,7 +657,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
           }.should_not change { Status.count }
         end
 
-        should "create document if not found" do
+        it "should create document if not found" do
           lambda {
             status = @project1.statuses.find_or_create_by_name('Delivered')
             status.project.should == @project1
@@ -580,38 +667,38 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "sexy querying" do
-      should "work with where" do
+      it "should work with where" do
         @project1.statuses.where(:name => 'New').all.should == [@brand_new]
       end
 
-      should "work with sort" do
+      it "should work with sort" do
         @project1.statuses.sort(:name).all.should == [@complete, @brand_new]
       end
 
-      should "work with limit" do
+      it "should work with limit" do
         @project1.statuses.sort(:name).limit(1).all.should == [@complete]
       end
 
-      should "work with skip" do
+      it "should work with skip" do
         @project1.statuses.sort(:name).skip(1).all.should == [@brand_new]
       end
 
-      should "work with fields" do
+      it "should work with fields" do
         @project1.statuses.fields(:position).all.each do |status|
           status.position.should_not be_nil
           status.name.should be_nil
         end
       end
 
-      should "work with scopes" do
+      it "should work with scopes" do
         @project1.statuses.complete.all.should == [@complete]
       end
 
-      should "work with methods on class that return query" do
+      it "should work with methods on class that return query" do
         @project1.statuses.by_position(1).first.should == @brand_new
       end
 
-      should "not work with methods on class that do not return query" do
+      it "should not work with methods on class that do not return query" do
         Status.class_eval { def self.foo; 'foo' end }
         lambda { @project1.statuses.foo }.
           should raise_error(NoMethodError)
@@ -619,41 +706,41 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "all" do
-      should "work" do
+      it "should work" do
         @project1.statuses.all(:order => "position asc").should == [@brand_new, @complete]
       end
 
-      should "work with conditions" do
+      it "should work with conditions" do
         @project1.statuses.all(:name => 'Complete').should == [@complete]
       end
     end
 
     context "first" do
-      should "work" do
+      it "should work" do
         @project1.statuses.first(:order => 'name').should == @complete
       end
 
-      should "work with conditions" do
+      it "should work with conditions" do
         @project1.statuses.first(:name => 'Complete').should == @complete
       end
     end
 
     context "last" do
-      should "work" do
+      it "should work" do
         @project1.statuses.last(:order => "position asc").should == @complete
       end
 
-      should "work with conditions" do
+      it "should work with conditions" do
         @project1.statuses.last(:order => 'position', :name => 'New').should == @brand_new
       end
     end
 
     context "with one id" do
-      should "work for id in association" do
+      it "should work for id in association" do
         @project1.statuses.find(@complete.id).should == @complete
       end
 
-      should "not work for id not in association" do
+      it "should not work for id not in association" do
         lambda {
           @project1.statuses.find!(@archived.id)
         }.should raise_error(MongoMapper::DocumentNotFound)
@@ -661,39 +748,39 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "with multiple ids" do
-      should "work for ids in association" do
+      it "should work for ids in association" do
         statuses = @project1.statuses.find(@brand_new.id, @complete.id)
         statuses.should == [@brand_new, @complete]
       end
 
-      should "not work for ids not in association" do
-        assert_raises(MongoMapper::DocumentNotFound) do
+      it "should not work for ids not in association" do
+        expect {
           @project1.statuses.find!(@brand_new.id, @complete.id, @archived.id)
-        end
+        }.to raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
     context "with #paginate" do
-      setup do
+      before do
         @statuses = @project2.statuses.paginate(:per_page => 2, :page => 1, :order => 'name asc')
       end
 
-      should "return total pages" do
+      it "should return total pages" do
         @statuses.total_pages.should == 2
       end
 
-      should "return total entries" do
+      it "should return total entries" do
         @statuses.total_entries.should == 3
       end
 
-      should "return the subject" do
+      it "should return the subject" do
         @statuses.collect(&:name).should == %w(Archived Complete)
       end
     end
   end
 
   context "extending the association" do
-    should "work using a block passed to many" do
+    it "should work using a block passed to many" do
       project = Project.new(:name => "Some Project")
       status1 = Status.new(:name => "New")
       status2 = Status.new(:name => "Assigned")
@@ -707,7 +794,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       open_statuses.should_not include(status3)
     end
 
-    should "work using many's :extend option" do
+    it "should work using many's :extend option" do
       project = Project.new(:name => "Some Project")
       collaborator1 = Collaborator.new(:name => "zing")
       collaborator2 = Collaborator.new(:name => "zang")
@@ -718,7 +805,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context ":dependent" do
-    setup do
+    before do
       # FIXME: make use of already defined models
       class ::Property
         include MongoMapper::Document
@@ -732,13 +819,13 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
       Thing.collection.remove
     end
 
-    teardown do
+    after do
       Object.send :remove_const, 'Property' if defined?(::Property)
       Object.send :remove_const, 'Thing' if defined?(::Thing)
     end
 
     context "=> destroy" do
-      setup do
+      before do
         Property.key :thing_id, ObjectId
         Property.belongs_to :thing, :dependent => :destroy
         Thing.many :properties, :dependent => :destroy
@@ -752,7 +839,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
         @thing.properties << @property3
       end
 
-      should "should destroy the associated documents" do
+      it "should should destroy the associated documents" do
         @thing.properties.count.should == 3
         @thing.destroy
         @thing.properties.count.should == 0
@@ -761,7 +848,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "=> delete_all" do
-      setup do
+      before do
         Property.key :thing_id, ObjectId
         Property.belongs_to :thing
         Thing.has_many :properties, :dependent => :delete_all
@@ -775,7 +862,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
         @thing.properties << @property3
       end
 
-      should "should delete associated documents" do
+      it "should should delete associated documents" do
         @thing.properties.count.should == 3
         @thing.destroy
         @thing.properties.count.should == 0
@@ -784,7 +871,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
     end
 
     context "=> nullify" do
-      setup do
+      before do
         Property.key :thing_id, ObjectId
         Property.belongs_to :thing
         Thing.has_many :properties, :dependent => :nullify
@@ -798,16 +885,16 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
         @thing.properties << @property3
       end
 
-      should "should nullify relationship but not destroy associated documents" do
+      it "should should nullify relationship but not destroy associated documents" do
         @thing.properties.count.should == 3
         @thing.destroy
         @thing.properties.count.should == 0
         Property.count.should == 3
       end
     end
-    
+
     context "unspecified" do
-      setup do
+      before do
         Property.key :thing_id, ObjectId
         Property.belongs_to :thing
         Thing.has_many :properties, :dependent => :nullify
@@ -821,7 +908,7 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
         @thing.properties << @property3
       end
 
-      should "should nullify relationship but not destroy associated documents" do
+      it "should should nullify relationship but not destroy associated documents" do
         @thing.properties.count.should == 3
         @thing.destroy
         @thing.properties.count.should == 0
@@ -831,14 +918,14 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context "namespaced foreign keys" do
-    setup do
+    before do
       News::Paper.many :articles, :class_name => 'News::Article'
       News::Article.belongs_to :paper, :class_name => 'News::Paper'
 
       @paper = News::Paper.create
     end
 
-    should "properly infer the foreign key" do
+    it "should properly infer the foreign key" do
       article = @paper.articles.create
       article.should respond_to(:paper_id)
       article.paper_id.should == @paper.id
@@ -846,19 +933,19 @@ class ManyDocumentsProxyTest < Test::Unit::TestCase
   end
 
   context "criteria" do
-    setup do
+    before do
       News::Paper.many :articles, :class_name => 'News::Article'
       News::Article.belongs_to :paper, :class_name => 'News::Paper'
 
       @paper = News::Paper.create
     end
 
-    should "should find associated instances by an object ID" do
+    it "should should find associated instances by an object ID" do
       article = News::Article.create(:paper_id => @paper.id)
       @paper.articles.should include(article)
     end
 
-    should "should find associated instances by a string" do
+    it "should should find associated instances by a string" do
       article = News::Article.create(:paper_id => @paper.id.to_s)
       @paper.articles.should include(article)
     end