mongo_mapper 0.14.0 → 0.15.0

data/spec/functional/accessible_spec.rb

@@ -119,7 +119,7 @@ describe "Accessible" do
         key :name, String
         key :site_id, ObjectId
       end
-      GrandParent.collection.remove
+      GrandParent.collection.drop
 
       class ::Child < ::GrandParent
         attr_accessible :position

data/spec/functional/associations/belongs_to_polymorphic_proxy_spec.rb

@@ -3,8 +3,8 @@ require 'spec_helper'
 
 describe "BelongsToPolymorphicProxy" do
   before do
-    Status.collection.remove
-    Project.collection.remove
+    Status.collection.drop
+    Project.collection.drop
   end
 
   it "should default to nil" do

data/spec/functional/associations/belongs_to_proxy_spec.rb

@@ -121,13 +121,13 @@ describe "BelongsToProxy" do
       class ::Property
         include MongoMapper::Document
       end
-      Property.collection.remove
+      Property.collection.drop
 
       class ::Thing
         include MongoMapper::Document
         key :name, String
       end
-      Thing.collection.remove
+      Thing.collection.drop
     end
 
     after do
@@ -211,7 +211,7 @@ describe "BelongsToProxy" do
       end
 
       it "should raise exception if invalid" do
-        expect { comment.create_post! }.to raise_error(MongoMapper::DocumentNotValid)
+        lambda { comment.create_post! }.should raise_error(MongoMapper::DocumentNotValid)
       end
 
       it "should work if valid" do
@@ -252,4 +252,4 @@ describe "BelongsToProxy" do
       post.reload.title.should == 'Hello, world!'
     end
   end
-end
+end

data/spec/functional/associations/in_array_proxy_spec.rb

@@ -14,8 +14,8 @@ describe "InArrayProxy" do
         key :list_ids, Array
         many :lists, :in => :list_ids
       end
-      User.collection.remove
-      List.collection.remove
+      User.collection.drop
+      List.collection.drop
     end
 
     after do
@@ -112,9 +112,9 @@ describe "InArrayProxy" do
       end
 
       it "should raise exception if invalid" do
-        expect {
+        lambda {
           @user.lists.create!
-        }.to raise_error(MongoMapper::DocumentNotValid)
+        }.should raise_error(MongoMapper::DocumentNotValid)
       end
 
       it "should reset cache" do
@@ -144,7 +144,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          expect(@user.lists).to receive(:query).never
+          @user.lists.should_receive(:query).never
           @user.lists.all.should == []
         end
       end
@@ -160,7 +160,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          expect(@user.lists).to receive(:query).never
+          @user.lists.should_receive(:query).never
           @user.lists.first.should be_nil
         end
       end
@@ -176,7 +176,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          expect(@user.lists).to receive(:query).never
+          @user.lists.should_receive(:query).never
           @user.lists.last.should be_nil
         end
       end
@@ -195,9 +195,9 @@ describe "InArrayProxy" do
         end
 
         it "should raise error when using ! and not found" do
-          expect {
+          lambda {
             @user.lists.find!(@list3.id)
-          }.to raise_error(MongoMapper::DocumentNotFound)
+          }.should raise_error(MongoMapper::DocumentNotFound)
         end
       end
 
@@ -230,7 +230,7 @@ describe "InArrayProxy" do
 
         it "should not hit the database if ids key is empty" do
           @user.list_ids = []
-          expect(@user.lists).to receive(:query).never
+          @user.lists.should_receive(:query).never
           @user.lists.paginate(:page => 1).should == []
         end
       end
@@ -249,9 +249,9 @@ describe "InArrayProxy" do
         end
 
         it "should raise error when using ! and not found" do
-          expect {
+          lambda {
             @user.lists.find_by_name!('Foo 3')
-          }.to raise_error(MongoMapper::DocumentNotFound)
+          }.should raise_error(MongoMapper::DocumentNotFound)
         end
 
         context "find_or_create_by" do
@@ -293,7 +293,7 @@ describe "InArrayProxy" do
 
       it "should not hit the database if ids key is empty" do
         @user.list_ids = []
-        expect(@user.lists).to receive(:query).never
+        @user.lists.should_receive(:query).never
         @user.lists.count(:name => 'Foo 1').should == 0
       end
     end
@@ -346,4 +346,4 @@ describe "InArrayProxy" do
       end
     end
   end
-end
+end

data/spec/functional/associations/many_documents_as_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "ManyDocumentsAsProxy" do
   before do
-    Post.collection.remove
-    PostComment.collection.remove
+    Post.collection.drop
+    PostComment.collection.drop
   end
 
   it "should default reader to empty array" do
@@ -155,9 +155,9 @@ describe "ManyDocumentsAsProxy" do
       end
 
       it "should not work for id not in association" do
-        expect {
+        lambda {
           @post.comments.find!(@comment5._id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
@@ -168,9 +168,9 @@ describe "ManyDocumentsAsProxy" do
       end
 
       it "should not work for ids not in association" do
-        expect {
+        lambda {
           @post.comments.find!(@comment1._id, @comment2._id, @comment4._id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 

data/spec/functional/associations/many_documents_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper.rb'
 
 describe "ManyDocumentsProxy" do
   before do
-    Project.collection.remove
-    Status.collection.remove
+    Project.collection.drop
+    Status.collection.drop
 
     @pet_class = Doc do
       key :name, String
@@ -171,9 +171,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should call destroy the existing documents" do
-          expect(@broker.properties[0]).to receive(:destroy).once
-          expect(@broker.properties[1]).to receive(:destroy).once
-          expect(@broker.properties[2]).to receive(:destroy).once
+          @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
 
@@ -184,9 +184,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should skip over documents that are the same" do
-          expect(@broker.properties[0]).to receive(:destroy).never
-          expect(@broker.properties[1]).to receive(:destroy).once
-          expect(@broker.properties[2]).to receive(:destroy).never
+          @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
@@ -205,9 +205,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should call delete the existing documents" do
-          expect(@broker.properties[0]).to receive(:delete).once
-          expect(@broker.properties[1]).to receive(:delete).once
-          expect(@broker.properties[2]).to receive(:delete).once
+          @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
 
@@ -218,9 +218,9 @@ describe "ManyDocumentsProxy" do
         end
 
         it "should skip over documents that are the same" do
-          expect(@broker.properties[0]).to receive(:delete).never
-          expect(@broker.properties[1]).to receive(:delete).once
-          expect(@broker.properties[2]).to receive(:delete).never
+          @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
@@ -430,9 +430,9 @@ describe "ManyDocumentsProxy" do
 
     it "should raise exception if not valid" do
       project = Project.create
-      expect {
+      lambda {
         project.statuses.create!(:name => nil)
-      }.to raise_error(MongoMapper::DocumentNotValid)
+      }.should raise_error(MongoMapper::DocumentNotValid)
     end
 
     it "should reset cache" do
@@ -754,9 +754,9 @@ describe "ManyDocumentsProxy" do
       end
 
       it "should not work for ids not in association" do
-        expect {
+        lambda {
           @project1.statuses.find!(@brand_new.id, @complete.id, @archived.id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 
@@ -810,13 +810,13 @@ describe "ManyDocumentsProxy" do
       class ::Property
         include MongoMapper::Document
       end
-      Property.collection.remove
+      Property.collection.drop
 
       class ::Thing
         include MongoMapper::Document
         key :name, String
       end
-      Thing.collection.remove
+      Thing.collection.drop
     end
 
     after do
@@ -997,7 +997,7 @@ describe "ManyDocumentsProxy" do
 
       lambda do
         @job_title_2.trainings.find_by_slug!('bar')
-      end.should raise_error
+      end.should raise_error(RuntimeError)
     end
 
     it "should scope with an extra where clause on the proxy (regression #2)" do
@@ -1018,7 +1018,7 @@ describe "ManyDocumentsProxy" do
 
       lambda do
         @job_title_2.trainings.find_by_slug!('bar')
-      end.should raise_error
+      end.should raise_error(RuntimeError)
     end
   end
 end

data/spec/functional/associations/many_embedded_polymorphic_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "ManyEmbeddedPolymorphicProxy" do
   before do
-    Catalog.collection.remove
-    TrModels::Fleet.collection.remove
+    Catalog.collection.drop
+    TrModels::Fleet.collection.drop
   end
 
   it "should default reader to empty array" do

data/spec/functional/associations/many_polymorphic_proxy_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe "ManyPolymorphicProxy" do
   before do
-    Room.collection.remove
-    Message.collection.remove
+    Room.collection.drop
+    Message.collection.drop
   end
 
   it "should default reader to empty array" do
@@ -247,9 +247,9 @@ describe "ManyPolymorphicProxy" do
       end
 
       it "should not work for ids not in association" do
-        expect {
+        lambda {
           @lounge.messages.find!(@lm1._id, @lm2._id, @hm2._id)
-        }.to raise_error(MongoMapper::DocumentNotFound)
+        }.should raise_error(MongoMapper::DocumentNotFound)
       end
     end
 

data/spec/functional/associations/one_as_proxy_spec.rb

@@ -132,7 +132,7 @@ describe "OneAsProxy" do
         end
 
         it "should call delete on the existing document" do
-          expect_any_instance_of(@author_class).to receive(:delete).once
+          @author_class.any_instance.should_receive(:delete).once
           @post.author = @author_class.new
         end
 
@@ -142,7 +142,7 @@ describe "OneAsProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          expect_any_instance_of(@author_class).to receive(:delete).never
+          @author_class.any_instance.should_receive(:delete).never
           @post.author = @author
         end
       end
@@ -157,7 +157,7 @@ describe "OneAsProxy" do
         end
 
         it "should call destroy the existing document" do
-          expect_any_instance_of(@author_class).to receive(:destroy).once
+          @author_class.any_instance.should_receive(:destroy).once
           @post.author = @author_class.new
         end
 
@@ -167,7 +167,7 @@ describe "OneAsProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          expect_any_instance_of(@author_class).to receive(:destroy).never
+          @author_class.any_instance.should_receive(:destroy).never
           @post.author = @author
         end
       end
@@ -302,7 +302,7 @@ describe "OneAsProxy" do
       end
 
       it "should should call destroy on the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:destroy).once
+        @author_class.any_instance.should_receive(:destroy).once
         @post.destroy
       end
 
@@ -324,7 +324,7 @@ describe "OneAsProxy" do
       end
 
       it "should should call delete the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:delete).once
+        @author_class.any_instance.should_receive(:delete).once
         @post.destroy
       end
 
@@ -445,7 +445,7 @@ describe "OneAsProxy" do
     end
 
     it "should raise exception if invalid" do
-      expect { @post.create_author! }.to raise_error(MongoMapper::DocumentNotValid)
+      lambda { @post.create_author! }.should raise_error(MongoMapper::DocumentNotValid)
     end
 
     it "should work if valid" do
@@ -486,4 +486,4 @@ describe "OneAsProxy" do
       article.articleable_id.should == @paper.id
     end
   end
-end
+end

data/spec/functional/associations/one_proxy_spec.rb

@@ -97,7 +97,7 @@ describe "OneProxy" do
         end
 
         it "should call delete on the existing document" do
-          expect_any_instance_of(@author_class).to receive(:delete).once
+          @author_class.any_instance.should_receive(:delete).once
           @post.author = @author_class.new
         end
 
@@ -107,7 +107,7 @@ describe "OneProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          expect_any_instance_of(@author_class).to receive(:delete).never
+          @author_class.any_instance.should_receive(:delete).never
           @post.author = @author
         end
       end
@@ -122,7 +122,7 @@ describe "OneProxy" do
         end
 
         it "should call destroy the existing document" do
-          expect_any_instance_of(@author_class).to receive(:destroy).once
+          @author_class.any_instance.should_receive(:destroy).once
           @post.author = @author_class.new
         end
 
@@ -132,7 +132,7 @@ describe "OneProxy" do
         end
 
         it "should do nothing if it's the same document" do
-          expect_any_instance_of(@author_class).to receive(:destroy).never
+          @author_class.any_instance.should_receive(:destroy).never
           @post.author = @author
         end
       end
@@ -246,7 +246,7 @@ describe "OneProxy" do
       end
 
       it "should should call destroy on the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:destroy).once
+        @author_class.any_instance.should_receive(:destroy).once
         @post.destroy
       end
 
@@ -268,7 +268,7 @@ describe "OneProxy" do
       end
 
       it "should should call delete the associated documents" do
-        expect_any_instance_of(@author_class).to receive(:delete).once
+        @author_class.any_instance.should_receive(:delete).once
         @post.destroy
       end
 
@@ -366,9 +366,9 @@ describe "OneProxy" do
       end
 
       it "should raise exception if invalid" do
-        expect {
+        lambda {
           post.create_author!
-        }.to raise_error(MongoMapper::DocumentNotValid)
+        }.should raise_error(MongoMapper::DocumentNotValid)
       end
 
       it "should work if valid" do