mongoid 3.1.7 → 4.0.0.alpha1

data/spec/mongoid/relations/builders_spec.rb

@@ -17,7 +17,7 @@ describe Mongoid::Relations::Builders do
         end
 
         it "does not set a binding attribute" do
-          name[:binding].should be_nil
+          expect(name[:binding]).to be_nil
         end
       end
 
@@ -28,7 +28,7 @@ describe Mongoid::Relations::Builders do
         end
 
         it "does not set a binding attribute" do
-          game[:binding].should be_nil
+          expect(game[:binding]).to be_nil
         end
       end
 
@@ -45,15 +45,15 @@ describe Mongoid::Relations::Builders do
           end
 
           it "builds the document" do
-            post.person.should eq(person)
+            expect(post.person).to eq(person)
           end
 
           it "sets the inverse" do
-            person.posts.should eq([ post ])
+            expect(person.posts).to eq([ post ])
           end
 
           it "does not save the document" do
-            person.should_not be_persisted
+            expect(person).to_not be_persisted
           end
         end
 
@@ -68,15 +68,15 @@ describe Mongoid::Relations::Builders do
           end
 
           it "builds the document" do
-            game.person.should eq(person)
+            expect(game.person).to eq(person)
           end
 
           it "sets the inverse" do
-            person.game.should eq(game)
+            expect(person.game).to eq(game)
           end
 
           it "does not save the document" do
-            person.should_not be_persisted
+            expect(person).to_not be_persisted
           end
         end
       end
@@ -98,7 +98,7 @@ describe Mongoid::Relations::Builders do
         end
 
         it "does not set a binding attribute" do
-          name[:binding].should be_nil
+          expect(name[:binding]).to be_nil
         end
       end
 
@@ -109,7 +109,7 @@ describe Mongoid::Relations::Builders do
         end
 
         it "does not set a binding attribute" do
-          game[:binding].should be_nil
+          expect(game[:binding]).to be_nil
         end
       end
 
@@ -126,19 +126,19 @@ describe Mongoid::Relations::Builders do
           end
 
           it "builds the document" do
-            post.person.should eq(person)
+            expect(post.person).to eq(person)
           end
 
           it "sets the inverse" do
-            person.posts.should eq([ post ])
+            expect(person.posts).to eq([ post ])
           end
 
           it "saves the document" do
-            person.should be_persisted
+            expect(person).to be_persisted
           end
 
           it "saves the child" do
-            post.should be_persisted
+            expect(post).to be_persisted
           end
         end
 
@@ -153,19 +153,19 @@ describe Mongoid::Relations::Builders do
           end
 
           it "builds the document" do
-            game.person.should eq(person)
+            expect(game.person).to eq(person)
           end
 
           it "sets the inverse" do
-            person.game.should eq(game)
+            expect(person.game).to eq(game)
           end
 
           it "saves the document" do
-            person.should be_persisted
+            expect(person).to be_persisted
           end
 
           it "saves the child" do
-            game.should be_persisted
+            expect(game).to be_persisted
           end
         end
       end
@@ -190,15 +190,15 @@ describe Mongoid::Relations::Builders do
           end
 
           it "replaces the existing document" do
-            person.game.should eq(game_two)
+            expect(person.game).to eq(game_two)
           end
 
           it "persists the change" do
-            person.game(true).should eq(game_two)
+            expect(person.game(true)).to eq(game_two)
           end
 
           it "removes the old document from the database" do
-            Game.collection.find.count.should eq(1)
+            expect(Game.collection.find.count).to eq(1)
           end
         end
       end

data/spec/mongoid/relations/cascading/delete_spec.rb

@@ -21,7 +21,7 @@ describe Mongoid::Relations::Cascading::Delete do
         end
 
         it "deletes the relation" do
-          home.should be_destroyed
+          expect(home).to be_destroyed
         end
 
         it "persists the deletion" do
@@ -38,7 +38,7 @@ describe Mongoid::Relations::Cascading::Delete do
         end
 
         it "deletes the base document" do
-          person.should be_destroyed
+          expect(person).to be_destroyed
         end
       end
     end
@@ -65,23 +65,23 @@ describe Mongoid::Relations::Cascading::Delete do
         end
 
         it "deletes the first document" do
-          post_one.should be_destroyed
+          expect(post_one).to be_destroyed
         end
 
         it "deletes the second document" do
-          post_two.should be_destroyed
+          expect(post_two).to be_destroyed
         end
 
         it "unbinds the first document" do
-          post_one.person.should be_nil
+          expect(post_one.person).to be_nil
         end
 
         it "unbinds the second document" do
-          post_two.person.should be_nil
+          expect(post_two.person).to be_nil
         end
 
         it "removes the documents from the relation" do
-          person.posts.should be_empty
+          expect(person.posts).to be_empty
         end
 
         it "persists the first deletion" do

data/spec/mongoid/relations/cascading/destroy_spec.rb

@@ -7,7 +7,7 @@ describe Mongoid::Relations::Cascading::Destroy do
   end
 
   let(:metadata) do
-    stub(name: :posts)
+    double(name: :posts)
   end
 
   let(:strategy) do
@@ -17,7 +17,7 @@ describe Mongoid::Relations::Cascading::Destroy do
   describe "#cascade" do
 
     let(:post) do
-      stub
+      double
     end
 
     context "when the documents exist" do

data/spec/mongoid/relations/cascading/nullify_spec.rb

@@ -9,11 +9,11 @@ describe Mongoid::Relations::Cascading::Nullify do
   describe "#cascade" do
 
     let(:relation) do
-      stub
+      double
     end
 
     let(:metadata) do
-      stub(name: :posts)
+      double(name: :posts)
     end
 
     let(:strategy) do

data/spec/mongoid/relations/cascading/restrict_spec.rb

@@ -16,7 +16,7 @@ describe Mongoid::Relations::Cascading::Restrict do
   end
 
   let(:metadata) do
-    stub(name: :drugs)
+    double(name: :drugs)
   end
 
   let(:strategy) do
@@ -26,7 +26,7 @@ describe Mongoid::Relations::Cascading::Restrict do
   describe "#cascade" do
 
     let(:drug) do
-      stub
+      double
     end
 
     context "when the document exists" do
@@ -38,7 +38,7 @@ describe Mongoid::Relations::Cascading::Restrict do
         end
 
         it "deletes the person" do
-          expect { strategy.cascade }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+          expect { strategy.cascade }.to_not raise_error
         end
       end
 

data/spec/mongoid/relations/cascading_spec.rb

@@ -21,7 +21,7 @@ describe Mongoid::Relations::Cascading do
         end
 
         it "ignores the cascade" do
-          band.cascade!.should eq([ "records" ])
+          expect(band.cascade!).to eq([ "records" ])
         end
       end
     end
@@ -61,11 +61,11 @@ describe Mongoid::Relations::Cascading do
       end
 
       it "adds the action to the cascades" do
-        klass.cascades.should include("posts")
+        expect(klass.cascades).to include("posts")
       end
 
       it "returns self" do
-        cascaded.should eq(klass)
+        expect(cascaded).to eq(klass)
       end
     end
 
@@ -83,11 +83,11 @@ describe Mongoid::Relations::Cascading do
       end
 
       it "does not add an action to the cascades" do
-        klass.cascades.should_not include("posts")
+        expect(klass.cascades).to_not include("posts")
       end
 
       it "returns self" do
-        cascaded.should eq(klass)
+        expect(cascaded).to eq(klass)
       end
     end
   end
@@ -161,7 +161,7 @@ describe Mongoid::Relations::Cascading do
             end
 
             it "removes the references to the removed document" do
-              from_db.ratable_id.should be_nil
+              expect(from_db.ratable_id).to be_nil
             end
           end
 
@@ -186,7 +186,7 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "removes the references to the removed document" do
-                from_db.ratable_id.should be_nil
+                expect(from_db.ratable_id).to be_nil
               end
             end
 
@@ -197,7 +197,7 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "returns nil" do
-                book.send(method).should be_true
+                expect(book.send(method)).to be true
               end
             end
           end
@@ -221,11 +221,11 @@ describe Mongoid::Relations::Cascading do
             end
 
             it "removes the references from the removed document" do
-              person.preference_ids.should_not include(preference.id)
+              expect(person.preference_ids).to_not include(preference.id)
             end
 
             it "removes the references to the removed document" do
-              from_db.person_ids.should_not include(person.id)
+              expect(from_db.person_ids).to_not include(person.id)
             end
           end
         end
@@ -250,12 +250,12 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "raises no error" do
-                expect{ person.send(method) }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+                expect{ person.send(method) }.to_not raise_error
               end
 
               it "deletes the parent" do
                 person.send(method)
-                person.should be_destroyed
+                expect(person).to be_destroyed
               end
             end
 
@@ -289,12 +289,12 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "raises no error" do
-                expect{ person.send(method) }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+                expect{ person.send(method) }.to_not raise_error
               end
 
               it "deletes the parent" do
                 person.send(method)
-                person.should be_destroyed
+                expect(person).to be_destroyed
               end
             end
 
@@ -328,12 +328,12 @@ describe Mongoid::Relations::Cascading do
               end
 
               it "raises no error" do
-                expect{ person.send(method) }.to_not raise_error(Mongoid::Errors::DeleteRestriction)
+                expect{ person.send(method) }.to_not raise_error
               end
 
               it "deletes the parent" do
                 person.send(method)
-                person.should be_destroyed
+                expect(person).to be_destroyed
               end
             end
 

data/spec/mongoid/relations/constraint_spec.rb

@@ -9,9 +9,10 @@ describe Mongoid::Relations::Constraint do
       before(:all) do
         Person.field(
           :_id,
-          type: Moped::BSON::ObjectId,
+          type: BSON::ObjectId,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new }
+          default: ->{ BSON::ObjectId.new },
+          overwrite: true
         )
       end
 
@@ -31,22 +32,22 @@ describe Mongoid::Relations::Constraint do
       context "when provided an object id" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         it "returns the object id" do
-          constraint.convert(object).should eq(object)
+          expect(constraint.convert(object)).to eq(object)
         end
       end
 
       context "when provided a string" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         it "returns an object id from the string" do
-          constraint.convert(object.to_s).should eq(object)
+          expect(constraint.convert(object.to_s)).to eq(object)
         end
       end
     end
@@ -67,7 +68,7 @@ describe Mongoid::Relations::Constraint do
       end
 
       it "returns the object" do
-        constraint.convert("testing").should eq("testing")
+        expect(constraint.convert("testing")).to eq("testing")
       end
     end
   end

data/spec/mongoid/relations/conversions_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Relations::Conversions do
       end
 
       let(:object) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:flagged) do
@@ -19,7 +19,7 @@ describe Mongoid::Relations::Conversions do
       end
 
       it "returns the object" do
-        flagged.should eq(object)
+        expect(flagged).to eq(object)
       end
     end
 
@@ -30,16 +30,18 @@ describe Mongoid::Relations::Conversions do
           :_id,
           type: String,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new.to_s }
+          overwrite: true,
+          default: ->{ BSON::ObjectId.new.to_s }
         )
       end
 
       after do
         Person.field(
           :_id,
-          type: Moped::BSON::ObjectId,
+          type: BSON::ObjectId,
           pre_processed: true,
-          default: ->{ Moped::BSON::ObjectId.new }
+          overwrite: true,
+          default: ->{ BSON::ObjectId.new }
         )
       end
 
@@ -50,7 +52,7 @@ describe Mongoid::Relations::Conversions do
       context "when provided an object id" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:flagged) do
@@ -58,14 +60,14 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the object id" do
-          flagged.should eq(object)
+          expect(flagged).to eq(object)
         end
       end
 
       context "when provided a string" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new.to_s
+          BSON::ObjectId.new.to_s
         end
 
         let(:flagged) do
@@ -73,11 +75,11 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the string" do
-          flagged.should eq(object)
+          expect(flagged).to eq(object)
         end
 
         it "marks the string as unconvertable" do
-          flagged.should be_unconvertable_to_bson
+          expect(flagged).to be_unconvertable_to_bson
         end
       end
     end
@@ -91,7 +93,7 @@ describe Mongoid::Relations::Conversions do
       context "when provided an object id" do
 
         let(:object) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:flagged) do
@@ -99,7 +101,7 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the object id" do
-          flagged.should eq(object)
+          expect(flagged).to eq(object)
         end
       end
 
@@ -114,11 +116,11 @@ describe Mongoid::Relations::Conversions do
         end
 
         it "returns the integer" do
-          flagged.should eq(15)
+          expect(flagged).to eq(15)
         end
 
         it "marks the integer as unconvertable" do
-          flagged.should be_unconvertable_to_bson
+          expect(flagged).to be_unconvertable_to_bson
         end
       end
     end