mongoid 3.1.7 → 4.0.0.alpha1

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Relations::Builders::Referenced::In do
 
   let(:base) do
-    stub
+    double
   end
 
   describe "#build" do
@@ -13,7 +13,7 @@ describe Mongoid::Relations::Builders::Referenced::In do
     end
 
     let(:metadata) do
-      stub(
+      double(
         klass: Person,
         name: :person,
         foreign_key: "person_id",
@@ -30,7 +30,7 @@ describe Mongoid::Relations::Builders::Referenced::In do
       context "when the object is an object id" do
 
         let(:object_id) do
-          Moped::BSON::ObjectId.new
+          BSON::ObjectId.new
         end
 
         let(:object) do
@@ -38,7 +38,7 @@ describe Mongoid::Relations::Builders::Referenced::In do
         end
 
         let(:person) do
-          stub
+          double
         end
 
         before do
@@ -50,22 +50,23 @@ describe Mongoid::Relations::Builders::Referenced::In do
         end
 
         it "sets the document" do
-          document.should eq(person)
+          expect(document).to eq(person)
         end
       end
 
       context "when the object is an integer" do
 
         before do
-          Person.field :_id, type: Integer
+          Person.field :_id, overwrite: true, type: Integer
         end
 
         after do
           Person.field(
             :_id,
-            type: Moped::BSON::ObjectId,
+            overwrite: true,
+            type: BSON::ObjectId,
             pre_processed: true,
-            default: ->{ Moped::BSON::ObjectId.new }
+            default: ->{ BSON::ObjectId.new }
           )
         end
 
@@ -78,7 +79,7 @@ describe Mongoid::Relations::Builders::Referenced::In do
         end
 
         let(:person) do
-          stub
+          double
         end
 
         before do
@@ -90,7 +91,7 @@ describe Mongoid::Relations::Builders::Referenced::In do
         end
 
         it "sets the document" do
-          document.should eq(person)
+          expect(document).to eq(person)
         end
       end
     end
@@ -110,7 +111,7 @@ describe Mongoid::Relations::Builders::Referenced::In do
       end
 
       it "returns the object" do
-        document.should eq(object)
+        expect(document).to eq(object)
       end
     end
   end
@@ -126,28 +127,24 @@ describe Mongoid::Relations::Builders::Referenced::In do
       context "when the id is nil" do
 
         it "returns nil" do
-          game.person.should be_nil
+          expect(game.person).to be_nil
         end
       end
 
       context "when the id is incorrect" do
 
         before do
-          game.person_id = Moped::BSON::ObjectId.new
+          game.person_id = BSON::ObjectId.new
         end
 
         it "returns nil" do
-          game.person.should be_nil
+          expect(game.person).to be_nil
         end
       end
     end
 
     context "when the document is persisted" do
 
-      before do
-        Mongoid.identity_map_enabled = true
-      end
-
       let!(:person) do
         Person.create
       end
@@ -156,16 +153,8 @@ describe Mongoid::Relations::Builders::Referenced::In do
         Game.new(person_id: person.id)
       end
 
-      after do
-        Mongoid.identity_map_enabled = false
-      end
-
       it "returns the document" do
-        game.person.should eq(person)
-      end
-
-      it "gets the document from the identity map" do
-        game.person.should equal(person)
+        expect(game.person).to eq(person)
       end
     end
 
@@ -185,11 +174,11 @@ describe Mongoid::Relations::Builders::Referenced::In do
       end
 
       it 'sets the person_id to nil' do
-        game.person_id.should be_nil
+        expect(game.person_id).to be_nil
       end
 
       it 'does not delete the person' do
-        Person.find(person.id).should eq(person)
+        expect(Person.find(person.id)).to eq(person)
       end
     end
   end
@@ -211,11 +200,11 @@ describe Mongoid::Relations::Builders::Referenced::In do
       end
 
       it 'sets the person_id to nil' do
-        game.person_id.should be_nil
+        expect(game.person_id).to be_nil
       end
 
       it 'does not delete the person' do
-        Person.find(person.id).should eq(person)
+        expect(Person.find(person.id)).to eq(person)
       end
     end
 
@@ -230,11 +219,11 @@ describe Mongoid::Relations::Builders::Referenced::In do
       end
 
       it 'sets the person_id' do
-        game.person_id.should eq(other_person.id)
+        expect(game.person_id).to eq(other_person.id)
       end
 
       it 'does not delete the person' do
-        Person.find(person.id).should eq(person)
+        expect(Person.find(person.id)).to eq(person)
       end
     end
   end

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,7 +37,7 @@ describe Mongoid::Relations::Builders::Referenced::One do
       end
 
       let(:post) do
-        stub
+        double
       end
 
       before 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