mongoid 3.1.7 → 4.0.2

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Relations::Builders::Embedded::Many do
 
   let(:base) do
-    stub
+    double
   end
 
   let(:builder) do
@@ -15,7 +15,7 @@ describe Mongoid::Relations::Builders::Embedded::Many do
     context "when passed an array of documents" do
 
       let(:metadata) do
-        stub(klass: Address, name: :addresses)
+        double(klass: Address, name: :addresses)
       end
 
       let(:object) do
@@ -27,14 +27,14 @@ describe Mongoid::Relations::Builders::Embedded::Many do
       end
 
       it "returns an array of documents" do
-        documents.should eq(object)
+        expect(documents).to eq(object)
       end
     end
 
     context "when the array is empty" do
 
       let(:metadata) do
-        stub(klass: Address, name: :addresses)
+        double(klass: Address, name: :addresses)
       end
 
       let(:object) do
@@ -46,14 +46,14 @@ describe Mongoid::Relations::Builders::Embedded::Many do
       end
 
       it "returns an empty array" do
-        documents.should eq(object)
+        expect(documents).to eq(object)
       end
     end
 
     context "when passed nil" do
 
       let(:metadata) do
-        stub(klass: Address, name: :addresses)
+        double(klass: Address, name: :addresses)
       end
 
       let(:builder) do
@@ -65,14 +65,14 @@ describe Mongoid::Relations::Builders::Embedded::Many do
       end
 
       it "returns an empty array" do
-        documents.should be_empty
+        expect(documents).to be_empty
       end
     end
 
     context "when no type is in the object" do
 
       let(:metadata) do
-        stub(klass: Address, name: :addresses)
+        double(klass: Address, name: :addresses)
       end
 
       let(:object) do
@@ -84,23 +84,23 @@ describe Mongoid::Relations::Builders::Embedded::Many do
       end
 
       it "returns an array of documents" do
-        documents.should be_a_kind_of(Array)
+        expect(documents).to be_a_kind_of(Array)
       end
 
       it "creates the correct type of documents" do
-        documents[0].should be_a_kind_of(Address)
+        expect(documents[0]).to be_a_kind_of(Address)
       end
 
       it "sets the object on the documents" do
-        documents[0].city.should eq("London")
-        documents[1].city.should eq("Shanghai")
+        expect(documents[0].city).to eq("London")
+        expect(documents[1].city).to eq("Shanghai")
       end
     end
 
     context "when a type is in the object" do
 
       let(:metadata) do
-        stub(klass: Shape, name: :shapes)
+        double(klass: Shape, name: :shapes)
       end
 
       let(:object) do
@@ -115,17 +115,17 @@ describe Mongoid::Relations::Builders::Embedded::Many do
       end
 
       it "returns an array of documents" do
-        documents.should be_a_kind_of(Array)
+        expect(documents).to be_a_kind_of(Array)
       end
 
       it "creates the correct type of document" do
-        documents[0].should be_a_kind_of(Circle)
-        documents[1].should be_a_kind_of(Square)
+        expect(documents[0]).to be_a_kind_of(Circle)
+        expect(documents[1]).to be_a_kind_of(Square)
       end
 
       it "sets the object on the document" do
-        documents[0].radius.should eq(100)
-        documents[1].width.should eq(50)
+        expect(documents[0].radius).to eq(100)
+        expect(documents[1].width).to eq(50)
       end
     end
   end

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

@@ -3,7 +3,7 @@ require "spec_helper"
 describe Mongoid::Relations::Builders::Embedded::One do
 
   let(:base) do
-    stub
+    double
   end
 
   let(:builder) do
@@ -15,7 +15,7 @@ describe Mongoid::Relations::Builders::Embedded::One do
     context "when provided nil" do
 
       let(:metadata) do
-        stub(klass: Name, name: :name)
+        double(klass: Name, name: :name)
       end
 
       let(:builder) do
@@ -27,14 +27,14 @@ describe Mongoid::Relations::Builders::Embedded::One do
       end
 
       it "returns nil" do
-        document.should be_nil
+        expect(document).to be_nil
       end
     end
 
     context "when provided a document" do
 
       let(:metadata) do
-        stub(klass: Name, name: :name)
+        double(klass: Name, name: :name)
       end
 
       let(:object) do
@@ -46,14 +46,14 @@ describe Mongoid::Relations::Builders::Embedded::One do
       end
 
       it "returns the document" do
-        document.should eq(object)
+        expect(document).to eq(object)
       end
     end
 
     context "when no type is in the object" do
 
       let(:metadata) do
-        stub(klass: Name, name: :name)
+        double(klass: Name, name: :name)
       end
 
       let(:object) do
@@ -65,18 +65,18 @@ describe Mongoid::Relations::Builders::Embedded::One do
       end
 
       it "creates the correct type of document" do
-        document.should be_a_kind_of(Name)
+        expect(document).to be_a_kind_of(Name)
       end
 
       it "sets the object on the document" do
-        document.first_name.should eq("Corbin")
+        expect(document.first_name).to eq("Corbin")
       end
     end
 
     context "when a type is in the object" do
 
       let(:metadata) do
-        stub(klass: Writer, name: :writer)
+        double(klass: Writer, name: :writer)
       end
 
       let(:object) do
@@ -88,11 +88,11 @@ describe Mongoid::Relations::Builders::Embedded::One do
       end
 
       it "creates the correct type of document" do
-        document.should be_a_kind_of(PdfWriter)
+        expect(document).to be_a_kind_of(PdfWriter)
       end
 
       it "sets the object on the document" do
-        document.speed.should eq(100)
+        expect(document.speed).to eq(100)
       end
     end
   end

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

@@ -22,7 +22,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "returns the option" do
-        builder.allow_destroy?.should be_true
+        expect(builder.allow_destroy?).to be true
       end
     end
 
@@ -33,7 +33,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "returns false" do
-        builder.allow_destroy?.should be_false
+        expect(builder.allow_destroy?).to be false
       end
     end
   end
@@ -76,7 +76,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "rejects the matching attributes" do
-        person.addresses.should be_empty
+        expect(person.addresses).to be_empty
       end
 
     end
@@ -96,7 +96,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "rejects the matching attributes" do
-        person.addresses.should be_empty
+        expect(person.addresses).to be_empty
       end
 
     end
@@ -120,7 +120,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "updates existing documents" do
-        person.addresses.first.street.should eq("Maybachufer")
+        expect(person.addresses.first.street).to eq("Maybachufer")
       end
     end
 
@@ -139,7 +139,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "adds new documents" do
-        person.addresses.first.street.should eq("Maybachufer")
+        expect(person.addresses.first.street).to eq("Maybachufer")
       end
     end
   end
@@ -159,7 +159,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
     end
 
     it "sorts the attributes" do
-      builder.attributes.map { |e| e[0] }.should eq([ "1", "2", "4" ])
+      expect(builder.attributes.map { |e| e[0] }).to eq([ "1", "2", "4" ])
     end
   end
 
@@ -178,7 +178,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
         end
 
         it "returns true" do
-          builder.reject?(builder, { last_name: "Lang" }).should be_true
+          expect(builder.reject?(builder, { last_name: "Lang" })).to be true
         end
       end
 
@@ -189,7 +189,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
         end
 
         it "returns false" do
-          builder.reject?(builder, { first_name: "Lang" }).should be_false
+          expect(builder.reject?(builder, { first_name: "Lang" })).to be false
         end
       end
     end
@@ -201,7 +201,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "returns false" do
-        builder.reject?(builder,{ first_name: "Lang" }).should be_false
+        expect(builder.reject?(builder,{ first_name: "Lang" })).to be false
       end
     end
   end
@@ -215,7 +215,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "returns the option" do
-        builder.update_only?.should be_true
+        expect(builder.update_only?).to be true
       end
     end
 
@@ -226,9 +226,8 @@ describe Mongoid::Relations::Builders::NestedAttributes::Many do
       end
 
       it "returns false" do
-        builder.update_only?.should be_false
+        expect(builder.update_only?).to be false
       end
     end
   end
 end
-

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

@@ -18,7 +18,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "returns the option" do
-        builder.allow_destroy?.should be_true
+        expect(builder.allow_destroy?).to be true
       end
     end
 
@@ -29,7 +29,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "returns false" do
-        builder.allow_destroy?.should be_false
+        expect(builder.allow_destroy?).to be false
       end
     end
   end
@@ -55,7 +55,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "does not change the relation" do
-        person.name.should be_nil
+        expect(person.name).to be_nil
       end
     end
 
@@ -74,7 +74,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "does not change the relation" do
-        person.name.should be_nil
+        expect(person.name).to be_nil
       end
     end
 
@@ -102,7 +102,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "updates the relation" do
-        person.name.last_name.should eq("Lang")
+        expect(person.name.last_name).to eq("Lang")
       end
     end
 
@@ -123,7 +123,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "updates the relation" do
-        person.name.last_name.should eq("Lang")
+        expect(person.name.last_name).to eq("Lang")
       end
     end
 
@@ -150,7 +150,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "deletes the relation" do
-        person.name.should be_nil
+        expect(person.name).to be_nil
       end
     end
   end
@@ -164,7 +164,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "returns the value" do
-        builder.destroy.should be_true
+        expect(builder.destroy).to be true
       end
     end
 
@@ -175,7 +175,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "returns nil" do
-        builder.destroy.should be_nil
+        expect(builder.destroy).to be_nil
       end
     end
   end
@@ -195,7 +195,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
         end
 
         it "returns true" do
-          builder.reject?(builder, { last_name: "Lang" }).should be_true
+          expect(builder.reject?(builder, { last_name: "Lang" })).to be true
         end
       end
 
@@ -206,7 +206,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
         end
 
         it "returns false" do
-          builder.reject?(builder, { first_name: "Lang" }).should be_false
+          expect(builder.reject?(builder, { first_name: "Lang" })).to be false
         end
       end
     end
@@ -218,7 +218,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "returns false" do
-        builder.reject?(builder, { first_name: "Lang" }).should be_false
+        expect(builder.reject?(builder, { first_name: "Lang" })).to be false
       end
     end
   end
@@ -232,7 +232,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "returns the option" do
-        builder.update_only?.should be_true
+        expect(builder.update_only?).to be true
       end
     end
 
@@ -243,7 +243,7 @@ describe Mongoid::Relations::Builders::NestedAttributes::One do
       end
 
       it "returns false" do
-        builder.update_only?.should be_false
+        expect(builder.update_only?).to be false
       end
     end
   end

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,11 +38,11 @@ describe Mongoid::Relations::Builders::Referenced::In do
         end
 
         let(:person) do
-          stub
+          double
         end
 
         before do
-          criteria.should_receive(:first).and_return(person)
+          expect(criteria).to receive(:first).and_return(person)
         end
 
         let!(:document) 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,11 +79,11 @@ describe Mongoid::Relations::Builders::Referenced::In do
         end
 
         let(:person) do
-          stub
+          double
         end
 
         before do
-          criteria.should_receive(:first).and_return(person)
+          expect(criteria).to receive(:first).and_return(person)
         end
 
         let!(:document) 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