mongoid 3.1.7 → 4.0.2

data/spec/mongoid/relations/builders/referenced/many_spec.rb

@@ -3,17 +3,17 @@ require "spec_helper"
 describe Mongoid::Relations::Builders::Referenced::Many do
 
   let(:base) do
-    stub
+    double
   end
 
   describe "#build" do
 
     let(:criteria) do
-      stub(klass: Post, selector: { "person_id" => "" }, selector_with_type_selection: { "person_id" => "" })
+      double(klass: Post, selector: { "person_id" => "" }, selector_with_type_selection: { "person_id" => "" })
     end
 
     let(:metadata) do
-      stub(
+      double(
         klass: Post,
         name: :posts,
         foreign_key: "person_id",
@@ -29,7 +29,7 @@ describe Mongoid::Relations::Builders::Referenced::Many do
     context "when provided an id" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:object) do
@@ -37,7 +37,7 @@ describe Mongoid::Relations::Builders::Referenced::Many do
       end
 
       let(:post) do
-        stub
+        double
       end
 
       let(:documents) do
@@ -45,14 +45,14 @@ describe Mongoid::Relations::Builders::Referenced::Many do
       end
 
       it "sets the documents" do
-        documents.should eq(criteria)
+        expect(documents).to eq(criteria)
       end
     end
 
     context "when order specified" do
 
       let(:metadata) do
-        stub(
+        double(
           klass: Post,
           name: :posts,
           foreign_key: "person_id",
@@ -63,7 +63,7 @@ describe Mongoid::Relations::Builders::Referenced::Many do
       end
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:object) do
@@ -71,7 +71,7 @@ describe Mongoid::Relations::Builders::Referenced::Many do
       end
 
       let(:post) do
-        stub
+        double
       end
 
       let(:documents) do
@@ -79,14 +79,14 @@ describe Mongoid::Relations::Builders::Referenced::Many do
       end
 
       it "ordered by specified filed" do
-        documents.should eq(criteria)
+        expect(documents).to eq(criteria)
       end
     end
 
     context "when provided a object" do
 
       let(:metadata) do
-        stub(
+        double(
           klass: Post,
           name: :posts,
           foreign_key: "person_id",
@@ -103,7 +103,7 @@ describe Mongoid::Relations::Builders::Referenced::Many do
       end
 
       it "returns the object" do
-        documents.should eq(object)
+        expect(documents).to eq(object)
       end
     end
   end
@@ -119,15 +119,15 @@ describe Mongoid::Relations::Builders::Referenced::Many do
       context "when the ids are empty" do
 
         it "returns an empty array" do
-          person.posts.should be_empty
+          expect(person.posts).to be_empty
         end
 
         context "during initialization" do
 
           it "returns an empty array" do
             Person.new do |p|
-              p.posts.should be_empty
-              p.posts.metadata.should_not be_nil
+              expect(p.posts).to be_empty
+              expect(p.posts.__metadata).to_not be_nil
             end
           end
         end

data/spec/mongoid/relations/builders/referenced/many_to_many_spec.rb

@@ -7,17 +7,17 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
   end
 
   let(:base) do
-    stub
+    double
   end
 
   describe "#build" do
 
     let(:criteria) do
-      stub(klass: Preference, selector: { "_id" => { "$in" => [] }})
+      double(klass: Preference, selector: { "_id" => { "$in" => [] }})
     end
 
     let(:metadata) do
-      stub(
+      double(
         klass: Preference,
         name: :preferences,
         foreign_key: "preference_ids",
@@ -32,7 +32,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
     context "when provided ids" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:object) do
@@ -40,7 +40,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
       end
 
       let(:preference) do
-        stub
+        double
       end
 
       let(:documents) do
@@ -48,14 +48,14 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
       end
 
       it "sets the documents" do
-        documents.should eq(criteria)
+        expect(documents).to eq(criteria)
       end
     end
 
     context "when order specified" do
 
       let(:metadata) do
-        stub(
+        double(
           klass: Post,
           name: :preferences,
           foreign_key: "person_id",
@@ -66,7 +66,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
       end
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:object) do
@@ -74,7 +74,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
       end
 
       let(:preference) do
-        stub
+        double
       end
 
       let(:documents) do
@@ -82,7 +82,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
       end
 
       it "ordered by specified filed" do
-        documents.should eq(criteria)
+        expect(documents).to eq(criteria)
       end
     end
 
@@ -95,7 +95,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
         end
 
         let(:preference) do
-          stub
+          double
         end
 
         let!(:documents) do
@@ -103,14 +103,14 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
         end
 
         it "returns the objects" do
-          documents.should eq(object)
+          expect(documents).to eq(object)
         end
       end
 
       context "when the object is nil" do
 
         let(:metadata) do
-          stub(
+          double(
             klass: Post,
             name: :preferences,
             foreign_key: "preference_ids",
@@ -127,7 +127,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
         end
 
         it "returns the object" do
-          documents.should eq(criteria)
+          expect(documents).to eq(criteria)
         end
       end
     end
@@ -144,18 +144,18 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
       context "when the ids are empty" do
 
         it "returns an empty array" do
-          person.preferences.should be_empty
+          expect(person.preferences).to be_empty
         end
       end
 
       context "when the ids are incorrect" do
 
         before do
-          person.preference_ids = [ Moped::BSON::ObjectId.new ]
+          person.preference_ids = [ BSON::ObjectId.new ]
         end
 
         it "returns an empty array" do
-          person.preferences.should be_empty
+          expect(person.preferences).to be_empty
         end
       end
     end
@@ -172,7 +172,7 @@ describe Mongoid::Relations::Builders::Referenced::ManyToMany do
     end
 
     it "returns the criteria" do
-      criteria.should be_empty
+      expect(criteria).to be_empty
     end
   end
 end

data/spec/mongoid/relations/builders/referenced/one_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Relations::Builders::Referenced::One do
 
   let(:base) do
-    stub(new_record?: false)
+    double(new_record?: false)
   end
 
   describe "#build" do
@@ -13,7 +13,7 @@ describe Mongoid::Relations::Builders::Referenced::One do
     end
 
     let(:metadata) do
-      stub(
+      double(
         klass: Post,
         name: :post,
         foreign_key: "person_id",
@@ -29,7 +29,7 @@ describe Mongoid::Relations::Builders::Referenced::One do
     context "when provided an id" do
 
       let(:object_id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:object) do
@@ -37,11 +37,11 @@ describe Mongoid::Relations::Builders::Referenced::One do
       end
 
       let(:post) do
-        stub
+        double
       end
 
       before do
-        criteria.should_receive(:first).and_return(post)
+        expect(criteria).to receive(:first).and_return(post)
       end
 
       let!(:documents) do
@@ -49,7 +49,7 @@ describe Mongoid::Relations::Builders::Referenced::One do
       end
 
       it "sets the document" do
-        documents.should eq(post)
+        expect(documents).to eq(post)
       end
     end
 
@@ -64,7 +64,7 @@ describe Mongoid::Relations::Builders::Referenced::One do
       end
 
       it "returns the object" do
-        document.should eq(object)
+        expect(document).to eq(object)
       end
     end
   end
@@ -78,31 +78,18 @@ describe Mongoid::Relations::Builders::Referenced::One do
     context "when the document is not found" do
 
       it "returns nil" do
-        person.game.should be_nil
+        expect(person.game).to be_nil
       end
     end
 
     context "when the document is persisted" do
 
-      before do
-        Mongoid.identity_map_enabled = true
-        person.save
-      end
-
-      after do
-        Mongoid.identity_map_enabled = false
-      end
-
       let!(:game) do
-        Game.create(person_id: person.id)
+        Game.create(person: person)
       end
 
       it "returns the document" do
-        person.game.should eq(game)
-      end
-
-      it "pulls the document from the identity map" do
-        person.game.should equal(game)
+        expect(person.game).to eq(game)
       end
     end
 
@@ -113,11 +100,11 @@ describe Mongoid::Relations::Builders::Referenced::One do
       end
 
       let!(:cat) do
-        Cat.create(person_id: person.username)
+        Cat.create(person: person)
       end
 
       it "returns the document" do
-        person.cat.should eq(cat)
+        expect(person.cat).to eq(cat)
       end
     end
   end

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
@@ -59,29 +59,29 @@ describe Mongoid::Relations::Cascading::Delete do
       context "when the documents are in memory" do
 
         before do
-          post_one.should_receive(:delete).never
-          post_two.should_receive(:delete).never
+          expect(post_one).to receive(:delete).never
+          expect(post_two).to receive(:delete).never
           person.delete
         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,17 +17,17 @@ describe Mongoid::Relations::Cascading::Destroy do
   describe "#cascade" do
 
     let(:post) do
-      stub
+      double
     end
 
     context "when the documents exist" do
 
       before do
-        person.should_receive(:posts).and_return([ post ])
+        expect(person).to receive(:posts).and_return([ post ])
       end
 
       it "destroys all documents in the relation" do
-        post.should_receive(:destroy)
+        expect(post).to receive(:destroy)
         strategy.cascade
       end
     end
@@ -35,11 +35,11 @@ describe Mongoid::Relations::Cascading::Destroy do
     context "when no documents exist" do
 
       before do
-        person.should_receive(:posts).and_return([])
+        expect(person).to receive(:posts).and_return([])
       end
 
       it "does not destroy anything" do
-        post.should_receive(:destroy).never
+        expect(post).to receive(:destroy).never
         strategy.cascade
       end
     end

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
@@ -21,11 +21,11 @@ describe Mongoid::Relations::Cascading::Nullify do
     end
 
     before do
-      person.should_receive(:posts).and_return(relation)
+      expect(person).to receive(:posts).and_return(relation)
     end
 
     it "nullifies the relation" do
-      relation.should_receive(:nullify)
+      expect(relation).to receive(:nullify)
       strategy.cascade
     end
   end

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
@@ -34,18 +34,18 @@ describe Mongoid::Relations::Cascading::Restrict do
       context "when person has no drugs" do
 
         before do
-          person.should_receive(:drugs).and_return([ ])
+          expect(person).to receive(:drugs).and_return([ ])
         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
 
       context "when person has drugs" do
 
         before do
-          person.should_receive(:drugs).and_return([ drug ])
+          expect(person).to receive(:drugs).and_return([ drug ])
         end
 
         it "it raises an error" do
@@ -56,11 +56,11 @@ describe Mongoid::Relations::Cascading::Restrict do
 
     context "when no document exists" do
       before do
-        person.should_receive(:drugs).and_return([])
+        expect(person).to receive(:drugs).and_return([])
       end
 
       it "doesn't delete anything" do
-        drug.should_receive(:delete).never
+        expect(drug).to receive(:delete).never
         strategy.cascade
       end
     end