mongoid 3.1.5 → 8.0.2

data/spec/mongoid/document_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Document do
@@ -10,8 +12,15 @@ describe Mongoid::Document do
     Person.new
   end
 
-  it "does not respond to _destroy" do
-    person.should_not respond_to(:_destroy)
+  it "defines a _destroy method" do
+    expect(Person.new).to respond_to(:_destroy)
+  end
+
+  describe "#_destroy" do
+
+    it "default to false" do
+      expect(Person.new._destroy).to be false
+    end
   end
 
   describe ".included" do
@@ -44,25 +53,25 @@ describe Mongoid::Document do
 
     context "when Document has been included in a model" do
       it ".models should include that model" do
-        models.should include(klass)
+        expect(models).to include(klass)
       end
     end
 
     context "before Document has been included" do
       it ".models should *not* include that model" do
-        models.should_not include(new_klass)
+        expect(models).to_not include(new_klass)
       end
     end
 
     context "after Document has been included" do
       it ".models should include that model" do
-        models.should include(new_model)
+        expect(models).to include(new_model)
       end
     end
 
     context "after Document has been included multiple times" do
       it ".models should include that model just once" do
-        models.count(twice_a_new_model).should be_eql(1)
+        expect(models.count(twice_a_new_model)).to be_eql(1)
       end
     end
   end
@@ -76,22 +85,22 @@ describe Mongoid::Document do
       end
 
       it "includes the root" do
-        types.should include("Person")
+        expect(types).to include("Person")
       end
 
       it "includes the subclasses" do
-        types.should include("Doctor")
+        expect(types).to include("Doctor")
       end
     end
 
     context "when the document is not subclassed" do
 
       let(:types) do
-        Address._types
+        Kangaroo._types
       end
 
       it "returns the document" do
-        types.should eq([ "Address" ])
+        expect(types).to eq([ "Kangaroo" ])
       end
     end
 
@@ -106,76 +115,89 @@ describe Mongoid::Document do
       end
 
       it "should clear descendants' cache" do
-        Person._types.should include(descendant.to_s)
+        expect(Person._types).to include(descendant.discriminator_value)
       end
     end
   end
 
-  describe "#attributes" do
+  describe "._mongoid_clear_types" do
 
-    let(:person) do
-      Person.new(title: "Sir")
-    end
+    context "when changing the discriminator_value" do
 
-    it "returns the attributes with indifferent access" do
-      person[:title].should eq("Sir")
-    end
-  end
+      before do
+        Kangaroo._types
+        Kangaroo.discriminator_value = "dvalue"
+      end
 
-  describe "#cache_key" do
+      after do
+        Kangaroo.discriminator_value = nil
+      end
 
-    let(:document) do
-      Dokument.new
+      it "has the correct _types" do
+        expect(Kangaroo._types).to eq(["dvalue"])
+      end
     end
 
-    context "when the document is new" do
+    context "when changing the discriminator_value in child" do
 
-      it "has a new key name" do
-        document.cache_key.should eq("dokuments/new")
+      before do
+        Shape._types
+        Circle.discriminator_value = "dvalue"
       end
-    end
 
-    context "when persisted" do
+      after do
+        Circle.discriminator_value = nil
+      end
 
-      before do
-        document.save
+      it "has the correct _types" do
+        expect(Circle._types).to eq(["dvalue"])
       end
 
-      context "with updated_at" do
+      it "has the new Circle discriminator value" do
+        expect(Shape._types).to include("dvalue")
+      end
 
-        let!(:updated_at) do
-          document.updated_at.utc.to_s(:number)
-        end
+      it "doesn't have the old Circle discriminator value" do
+        expect(Shape._types).to_not include("Cirlce")
+      end
+    end
+  end
 
-        it "has the id and updated_at key name" do
-          document.cache_key.should eq("dokuments/#{document.id}-#{updated_at}")
-        end
+  describe "#attributes" do
+
+    let!(:person) do
+      Person.create!(title: "Sir")
+    end
+
+    it "returns the attributes with indifferent access" do
+      expect(person[:title]).to eq("Sir")
+    end
+
+    context "when instantiating a new document" do
+      it "returns a Hash" do
+        expect(person.attributes.class).to eq(Hash)
       end
+    end
 
-      context "without updated_at, with Timestamps" do
+    context "when retrieving a document from the database" do
 
-        before do
-          document.updated_at = nil
-        end
+      let(:from_db) { Person.first }
+
+      context "when legacy_attributes is false" do
+        config_override :legacy_attributes, false
 
-        it "has the id key name" do
-          document.cache_key.should eq("dokuments/#{document.id}")
+        it "returns a Hash" do
+          expect(from_db.attributes.class).to eq(Hash)
         end
       end
 
-      context "without updated_at, without Timestamps" do
-        let(:artist) do
-          Artist.new
-        end
-        before do
-          artist.save
-        end
+      context "when legacy_attributes is true" do
+        config_override :legacy_attributes, true
 
-        it "should have the id key name" do
-          artist.cache_key.should eq("artists/#{artist.id}")
+        it "returns a BSON::Document" do
+          expect(from_db.attributes.class).to eq(BSON::Document)
         end
       end
-
     end
   end
 
@@ -186,7 +208,7 @@ describe Mongoid::Document do
     end
 
     it "returns a [doc.class, doc.id] array" do
-      person.identity.should eq([person.class, person.id])
+      expect(person.identity).to eq([person.class, person.id])
     end
   end
 
@@ -197,7 +219,7 @@ describe Mongoid::Document do
     end
 
     it "returns the identity hash" do
-      person.hash.should eq(person.identity.hash)
+      expect(person.hash).to eq(person.identity.hash)
     end
   end
 
@@ -208,15 +230,40 @@ describe Mongoid::Document do
     end
 
     it "sets persisted to false" do
-      person.should_not be_persisted
+      expect(person).to_not be_persisted
     end
 
     it "creates an id for the document" do
-      person.id.should be_a(Moped::BSON::ObjectId)
+      expect(person.id).to be_a(BSON::ObjectId)
     end
 
     it "sets the attributes" do
-      person.title.should eq("Sir")
+      expect(person.title).to eq("Sir")
+    end
+
+    context "when the model has a default scope" do
+
+      context "when the default scope is settable" do
+
+        let(:sound) do
+          Sound.new
+        end
+
+        it "sets the default scoping on the model" do
+          expect(sound).to be_active
+        end
+      end
+
+      context "when the default scope is not settable" do
+
+        let(:audio) do
+          Audio.new
+        end
+
+        it "does not set the default scoping" do
+          expect(audio.attributes.except('_id')).to be_empty
+        end
+      end
     end
 
     context "when accessing a relation from an overridden setter" do
@@ -226,11 +273,11 @@ describe Mongoid::Document do
       end
 
       it "allows access to the relation" do
-        doctor.users.first.should be_a(User)
+        expect(doctor.users.first).to be_a(User)
       end
 
       it "properly allows super calls" do
-        doctor.specialty.should eq("surgery")
+        expect(doctor.specialty).to eq("surgery")
       end
     end
 
@@ -249,7 +296,7 @@ describe Mongoid::Document do
         end
 
         it "runs the callbacks" do
-          person.title.should eq("Madam")
+          expect(person.title).to eq("Madam")
         end
       end
 
@@ -270,28 +317,7 @@ describe Mongoid::Document do
         end
 
         it "runs the callbacks" do
-          person.game.name.should eq("Ms. Pacman")
-        end
-      end
-
-      context "when instantiating model" do
-
-        let(:person) do
-          Person.instantiate("_id" => Moped::BSON::ObjectId.new, "title" => "Sir")
-        end
-
-        before do
-          Person.set_callback :initialize, :after do |doc|
-            doc.title = "Madam"
-          end
-        end
-
-        after do
-          Person.reset_callbacks(:initialize)
-        end
-
-        it "runs the callbacks" do
-          person.title.should eq("Madam")
+          expect(person.game.name).to eq("Ms. Pacman")
         end
       end
     end
@@ -299,7 +325,7 @@ describe Mongoid::Document do
     context "when defaults are defined" do
 
       it "sets the default values" do
-        person.age.should eq(100)
+        expect(person.age).to eq(100)
       end
     end
 
@@ -312,7 +338,7 @@ describe Mongoid::Document do
       end
 
       it "yields to the block" do
-        person.title.should eq("King")
+        expect(person.title).to eq("King")
       end
     end
   end
@@ -322,7 +348,7 @@ describe Mongoid::Document do
     context "when passing a block" do
 
       let(:id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let(:document) do
@@ -332,22 +358,14 @@ describe Mongoid::Document do
       end
 
       it "yields to the block" do
-        document.likes.should eq(1000)
+        expect(document.likes).to eq(1000)
       end
     end
 
     context "when an id exists" do
 
-      before do
-        Mongoid.identity_map_enabled = true
-      end
-
-      after do
-        Mongoid.identity_map_enabled = false
-      end
-
       let(:id) do
-        Moped::BSON::ObjectId.new
+        BSON::ObjectId.new
       end
 
       let!(:person) do
@@ -355,15 +373,11 @@ describe Mongoid::Document do
       end
 
       it "sets the attributes" do
-        person.title.should eq("Sir")
+        expect(person.title).to eq("Sir")
       end
 
       it "sets persisted to true" do
-        person.should be_persisted
-      end
-
-      it "puts the document in the identity map" do
-        Mongoid::IdentityMap.get(Person, id).should eq(person)
+        expect(person).to be_persisted
       end
     end
 
@@ -374,7 +388,7 @@ describe Mongoid::Document do
       end
 
       it "creates a new document" do
-        person.should be_a(Person)
+        expect(person).to be_a(Person)
       end
     end
   end
@@ -386,7 +400,7 @@ describe Mongoid::Document do
     end
 
     it "returns the class model name" do
-      person.model_name.should eq("Person")
+      expect(person.model_name).to eq("Person")
     end
   end
 
@@ -397,22 +411,141 @@ describe Mongoid::Document do
     end
 
     it "returns the internal attributes" do
-      person.raw_attributes["title"].should eq("Sir")
+      expect(person.raw_attributes["title"]).to eq("Sir")
     end
   end
 
-  describe "#to_a" do
+  describe "#as_json" do
 
-    let(:person) do
-      Person.new
+    let!(:person) do
+      Person.new(title: "Sir")
     end
 
-    let(:people) do
-      person.to_a
+    context "when no options are provided" do
+
+      it "does not apply any options" do
+        expect(person.as_json["title"]).to eq("Sir")
+        expect(person.as_json["age"]).to eq(100)
+      end
+
+      context "when options for the super method are provided" do
+
+        let(:options) do
+          { only: :title }
+        end
+
+        it "passes the options through to the super method" do
+          expect(person.as_json(options)["title"]).to eq("Sir")
+          expect(person.as_json(options).keys).not_to include("age")
+        end
+      end
     end
 
-    it "returns the document in an array" do
-      people.should eq([ person ])
+    context "when the Mongoid-specific options are provided" do
+
+      let(:options) do
+        { compact: true }
+      end
+
+      it "applies the Mongoid-specific options" do
+        expect(person.as_json(options)["title"]).to eq("Sir")
+        expect(person.as_json(options)["age"]).to eq(100)
+        expect(person.as_json(options).keys).not_to include("lunch_time")
+      end
+
+      context "when options for the super method are provided" do
+
+        let(:options) do
+          { compact: true, only: [:title, :pets, :ssn] }
+        end
+
+        it "passes the options through to the super method" do
+          expect(person.as_json(options)["title"]).to eq("Sir")
+          expect(person.as_json(options)["pets"]).to eq(false)
+        end
+
+        it "applies the Mongoid-specific options" do
+          expect(person.as_json(options).keys).not_to include("ssn")
+        end
+      end
+    end
+
+    context 'deprecated :compact option' do
+      # Since rails 6 differs in how it treats id fields,
+      # run this test on one version of rails. Currently rails 6 is in beta,
+      # when it is released this version should be changed to 6.
+      max_rails_version '5.2'
+
+      before do
+        # These tests require a specific set of defined attributes
+        # on the model
+        expect(church.as_json.keys.sort).to eq(%w(_id location name))
+      end
+
+      context 'deprecation' do
+        let(:church) do
+          Church.create!(name: 'St. Basil')
+        end
+
+        let(:message) do
+          '#as_json :compact option is deprecated. Please call #compact on the returned Hash object instead.'
+        end
+
+        it 'logs a deprecation warning when :compact is given' do
+          expect(Mongoid::Warnings).to receive(:warn_as_json_compact_deprecated)
+          church.as_json(compact: true)
+        end
+
+        it 'does not log a deprecation warning when :compact is not given' do
+          expect(Mongoid::Warnings).to_not receive(:warn_as_json_compact_deprecated)
+          church.as_json
+        end
+      end
+
+      context 'there is a nil valued attribute' do
+        let(:church) do
+          Church.create!(name: 'St. Basil')
+        end
+
+        it 'returns non-nil fields and _id only' do
+          actual = church.as_json(compact: true)
+          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
+        end
+      end
+
+      context 'all attrbutes are nil valued' do
+        let(:church) do
+          Church.create!
+        end
+
+        it 'returns a hash with _id only' do
+          actual = church.as_json(compact: true)
+          expect(actual).to eq('_id' => church.id)
+        end
+      end
+
+      context 'there are no nil valued attributes' do
+        let(:church) do
+          Church.create!(name: 'St. Basil', location: {})
+        end
+
+        it 'returns all fields and _id' do
+          actual = church.as_json(compact: true)
+          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil',
+            'location' => {})
+        end
+      end
+
+      context 'when option is specified as a truthy value' do
+        let(:church) do
+          Church.create!(name: 'St. Basil')
+        end
+
+        it 'returns non-nil fields and _id only' do
+          actual = church.as_json(compact: 1)
+          expect(actual).to eq('_id' => church.id, 'name' => 'St. Basil')
+        end
+      end
     end
   end
 
@@ -435,15 +568,27 @@ describe Mongoid::Document do
     end
 
     it "includes embeds one attributes" do
-      person.as_document.should have_key("name")
+      expect(person.as_document).to have_key("name")
+    end
+
+    it "includes embeds one attributes as a symbol" do
+      expect(person.as_document).to have_key(:name)
     end
 
     it "includes embeds many attributes" do
-      person.as_document.should have_key("addresses")
+      expect(person.as_document).to have_key("addresses")
+    end
+
+    it "includes embeds many attributes as a symbol" do
+      expect(person.as_document).to have_key(:addresses)
     end
 
     it "includes second level embeds many attributes" do
-      person.as_document["addresses"].first.should have_key("locations")
+      expect(person.as_document["addresses"].first).to have_key("locations")
+    end
+
+    it "includes second level embeds many attributes as a symbol" do
+      expect(person.as_document["addresses"].first).to have_key(:locations)
     end
 
     context "with relation define store_as option in embeded_many" do
@@ -453,23 +598,27 @@ describe Mongoid::Document do
       end
 
       it 'includes the store_as key association' do
-        person.as_document.should have_key("mobile_phones")
+        expect(person.as_document).to have_key("mobile_phones")
+      end
+
+      it 'includes the store_as key association as a symbol' do
+        expect(person.as_document).to have_key(:mobile_phones)
       end
 
       it 'should not include the key of association' do
-        person.as_document.should_not have_key("phones")
+        expect(person.as_document).to_not have_key("phones")
       end
     end
 
     context "when removing an embedded document" do
 
       before do
-        person.save
+        person.save!
         person.addresses.delete(address)
       end
 
       it "does not include the document in the hash" do
-        person.as_document["addresses"].should be_empty
+        expect(person.as_document).to_not have_key("addresses")
       end
     end
 
@@ -477,13 +626,13 @@ describe Mongoid::Document do
 
       before do
         # Save the doc, then set an embeds_one relation to nil
-        person.save
+        person.save!
         person.name = nil
-        person.save
+        person.save!
       end
 
       it "does not include the document in the hash" do
-        person.as_document.should_not have_key("name")
+        expect(person.as_document).to_not have_key("name")
       end
     end
   end
@@ -497,31 +646,35 @@ describe Mongoid::Document do
       end
 
       it "returns nil" do
-        person.to_key.should be_nil
+        expect(person.to_key).to be_nil
       end
     end
 
     context "when the document is not new" do
 
       let(:person) do
-        Person.instantiate("_id" => Moped::BSON::ObjectId.new)
+        Person.create!
       end
 
       it "returns the id in an array" do
-        person.to_key.should eq([ person.id ])
+        expect(person.to_key).to eq([ person.id.to_s ])
+      end
+
+      it "can query using the key" do
+        expect(person.id).to eq Person.find(person.to_key).first.id
       end
     end
 
     context "when the document is destroyed" do
 
       let(:person) do
-        Person.instantiate("_id" => Moped::BSON::ObjectId.new).tap do |peep|
+        Person.instantiate("_id" => BSON::ObjectId.new).tap do |peep|
           peep.destroyed = true
         end
       end
 
       it "returns the id in an array" do
-        person.to_key.should eq([ person.id ])
+        expect(person.to_key).to eq([ person.id.to_s ])
       end
     end
   end
@@ -535,18 +688,18 @@ describe Mongoid::Document do
       end
 
       it "returns nil" do
-        person.to_param.should be_nil
+        expect(person.to_param).to be_nil
       end
     end
 
     context "when the document is not new" do
 
       let(:person) do
-        Person.instantiate("_id" => Moped::BSON::ObjectId.new)
+        Person.instantiate("_id" => BSON::ObjectId.new)
       end
 
       it "returns the id as a string" do
-        person.to_param.should eq(person.id.to_s)
+        expect(person.to_param).to eq(person.id.to_s)
       end
     end
   end
@@ -560,7 +713,7 @@ describe Mongoid::Document do
     context "when attributes are not frozen" do
 
       it "return false" do
-        person.should_not be_frozen
+        expect(person).to_not be_frozen
         expect {
           person.title = "something"
         }.to_not raise_error
@@ -573,7 +726,7 @@ describe Mongoid::Document do
       end
 
       it "return true" do
-        person.should be_frozen
+        expect(person).to be_frozen
       end
     end
   end
@@ -584,25 +737,49 @@ describe Mongoid::Document do
       Person.new
     end
 
-    context "when not frozen" do
+    context "when freezing the model" do
+
+      context "when not frozen" do
 
-      it "freezes attributes" do
-        person.freeze.should eq(person)
-        expect { person.title = "something" }.to raise_error
+        it "freezes attributes" do
+          expect(person.freeze).to eq(person)
+          expect { person.title = "something" }.to raise_error(RuntimeError)
+        end
       end
-    end
 
-    context "when frozen" do
+      context "when frozen" do
 
-      before do
-        person.raw_attributes.freeze
+        before do
+          person.raw_attributes.freeze
+        end
+
+        it "keeps things frozen" do
+          person.freeze
+          expect {
+            person.title = "something"
+          }.to raise_error(RuntimeError)
+        end
       end
+    end
 
-      it "keeps things frozen" do
-        person.freeze
-        expect {
-          person.title = "something"
-        }.to raise_error
+    context "when freezing attributes of the model" do
+
+      context "when assigning a frozen value" do
+
+        context "when the frozen value is a hash" do
+
+          let(:hash) do
+            {"foo" => {"bar" => {"baz" => [1,2,3]}}}
+          end
+
+          let(:assign_hash) do
+            person.map = hash.freeze
+          end
+
+          it "no mutation occurs during assignment" do
+            expect{ assign_hash }.not_to raise_error
+          end
+        end
       end
     end
   end
@@ -610,7 +787,7 @@ describe Mongoid::Document do
   describe ".logger" do
 
     it "returns the mongoid logger" do
-      Person.logger.should eq(Mongoid.logger)
+      expect(Person.logger).to eq(Mongoid.logger)
     end
   end
 
@@ -621,7 +798,7 @@ describe Mongoid::Document do
     end
 
     it "returns the mongoid logger" do
-      person.send(:logger).should eq(Mongoid.logger)
+      expect(person.send(:logger)).to eq(Mongoid.logger)
     end
   end
 
@@ -632,7 +809,7 @@ describe Mongoid::Document do
     end
 
     it "resets to the global scope" do
-      movie.global_set.should be_a(::Set)
+      expect(movie.global_set).to be_a(::Set)
     end
   end
   context "when a model name conflicts with a mongoid internal" do
@@ -642,7 +819,7 @@ describe Mongoid::Document do
     end
 
     it "allows the model name" do
-      scheduler.strategy.should be_a(Strategy)
+      expect(scheduler.strategy).to be_a(Strategy)
     end
   end
 
@@ -652,16 +829,16 @@ describe Mongoid::Document do
 
       it "sets the defaults before yielding" do
         Person.new do |person|
-          person.age.should eq(100)
+          expect(person.age).to eq(100)
         end
       end
     end
   end
 
-  context "defining a Moped::BSON::ObjectId as a field" do
+  context "defining a BSON::ObjectId as a field" do
 
     let(:bson_id) do
-      Moped::BSON::ObjectId.new
+      BSON::ObjectId.new
     end
 
     let(:person) do
@@ -669,15 +846,15 @@ describe Mongoid::Document do
     end
 
     before do
-      person.save
+      person.save!
     end
 
     it "persists the correct type" do
-      person.reload.bson_id.should be_a(Moped::BSON::ObjectId)
+      expect(person.reload.bson_id).to be_a(BSON::ObjectId)
     end
 
     it "has the correct value" do
-      person.bson_id.should eq(bson_id)
+      expect(person.bson_id).to eq(bson_id)
     end
   end
 
@@ -692,7 +869,7 @@ describe Mongoid::Document do
     end
 
     it "converts them to nil" do
-      post.person_id.should be_nil
+      expect(post.person_id).to be_nil
     end
   end
 
@@ -736,27 +913,58 @@ describe Mongoid::Document do
       end
 
       context "when no embedded documents are present" do
+        context "when using the default discriminator key" do
+          let(:person) do
+            manager.becomes(Person)
+          end
 
-        let(:person) do
-          manager.becomes(Person)
-        end
+          it "copies attributes" do
+            expect(person.title).to eq('Sir')
+          end
 
-        it "copies attributes" do
-          person.title.should eq('Sir')
-        end
+          it "keeps the same object id" do
+            expect(person.id).to eq(manager.id)
+          end
 
-        it "keeps the same object id" do
-          person.id.should eq(manager.id)
+          it "sets the class type" do
+            expect(person._type).to eq("Person")
+          end
+
+          it "raises an error when inappropriate class is provided" do
+            expect {
+              manager.becomes(String)
+            }.to raise_error(ArgumentError, /A class which includes Mongoid::Document is expected/)
+          end
         end
 
-        it "sets the class type" do
-          person._type.should eq("Person")
+        context "when using a custom discriminator key" do
+          before do
+            Person.discriminator_key = "dkey"
+          end
+
+          after do
+            Person.discriminator_key = nil
+          end
+
+          it "sets the class type with new discriminator key" do
+            expect(person.dkey).to eq("Person")
+          end
         end
 
-        it "raises an error when inappropriate class is provided" do
-          expect {
-            manager.becomes(String)
-          }.to raise_error(ArgumentError)
+        context "when using a custom discriminator key and discriminator value" do
+          before do
+            Person.discriminator_key = "dkey"
+            Person.discriminator_value = "dvalue"
+          end
+
+          after do
+            Person.discriminator_key = nil
+            Person.discriminator_value = nil
+          end
+
+          it "sets the class type with new discriminator key" do
+            expect(person.dkey).to eq("dvalue")
+          end
         end
       end
 
@@ -773,11 +981,11 @@ describe Mongoid::Document do
           end
 
           it "copies the embedded documents" do
-            person.appointments.first.should eq(appointment)
+            expect(person.appointments.first).to eq(appointment)
           end
 
           it "returns new instances" do
-            person.appointments.first.should_not equal(appointment)
+            expect(person.appointments.first).to_not equal(appointment)
           end
         end
 
@@ -794,22 +1002,22 @@ describe Mongoid::Document do
             end
 
             it "copies the embedded documents" do
-              person.addresses.first.should eq(address)
+              expect(person.addresses.first).to eq(address)
             end
 
             it "returns new instances" do
-              person.addresses.first.should_not equal(address)
+              expect(person.addresses.first).to_not equal(address)
             end
           end
 
           context "when embedded doc is persisted" do
 
             let(:manager) do
-              Manager.create(title: "Sir")
+              Manager.create!(title: "Sir")
             end
 
             let!(:address) do
-              manager.addresses.create(street: "hobrecht")
+              manager.addresses.create!(street: "hobrecht")
             end
 
             let(:person) do
@@ -821,11 +1029,11 @@ describe Mongoid::Document do
             end
 
             it "copies the embedded documents" do
-              person.addresses.first.should eq(address)
+              expect(person.addresses.first).to eq(address)
             end
 
             it "copies the embedded documents only once" do
-              person.reload.addresses.length.should eq(1)
+              expect(person.reload.addresses.length).to eq(1)
             end
           end
         end
@@ -842,7 +1050,7 @@ describe Mongoid::Document do
         end
 
         it "copies the localize attribute" do
-          person.desc.should eq("description")
+          expect(person.desc).to eq("description")
         end
       end
 
@@ -853,14 +1061,14 @@ describe Mongoid::Document do
         end
 
         it "copies the state" do
-          person.should be_a_new_record
+          expect(person).to be_a_new_record
         end
       end
 
       context "when the document is persisted" do
 
         before do
-          manager.save
+          manager.save!
         end
 
         let(:person) do
@@ -868,7 +1076,7 @@ describe Mongoid::Document do
         end
 
         it "copies the state" do
-          person.should be_persisted
+          expect(person).to be_persisted
         end
       end
 
@@ -883,14 +1091,14 @@ describe Mongoid::Document do
         end
 
         it "copies the state" do
-          person.should be_destroyed
+          expect(person).to be_destroyed
         end
       end
 
       context "when the document is dirty" do
 
         before do
-          manager.save
+          manager.save!
           manager.ssn = "123-22-1234"
         end
 
@@ -899,11 +1107,11 @@ describe Mongoid::Document do
         end
 
         it "copies over the dirty changes" do
-          person.changes["ssn"].should eq([ nil, "123-22-1234" ])
+          expect(person.changes["ssn"]).to eq([ nil, "123-22-1234" ])
         end
 
         it "adds the _type change" do
-          person.changes["_type"].should eq([ "Manager", "Person" ])
+          expect(person.changes["_type"]).to eq([ "Manager", "Person" ])
         end
       end
 
@@ -919,7 +1127,7 @@ describe Mongoid::Document do
         end
 
         it "copies the errors" do
-          person.errors.should include(:ssn)
+          expect(person.errors).to include(:ssn)
         end
       end
     end
@@ -937,15 +1145,15 @@ describe Mongoid::Document do
         end
 
         it "copies attributes" do
-          manager.title.should eq('Sir')
+          expect(manager.title).to eq('Sir')
         end
 
         it "keeps the same object id" do
-          manager.id.should eq(person.id)
+          expect(manager.id).to eq(person.id)
         end
 
         it "sets the class type" do
-          manager._type.should eq("Manager")
+          expect(manager._type).to eq("Manager")
         end
 
         it "raises an error when inappropriate class is provided" do
@@ -966,11 +1174,11 @@ describe Mongoid::Document do
         end
 
         it "copies the embedded documents" do
-          manager.addresses.first.should eq(address)
+          expect(manager.addresses.first).to eq(address)
         end
 
         it "returns new instances" do
-          manager.addresses.first.should_not equal(address)
+          expect(manager.addresses.first).to_not equal(address)
         end
       end
 
@@ -981,14 +1189,14 @@ describe Mongoid::Document do
         end
 
         it "copies the state" do
-          manager.should be_a_new_record
+          expect(manager).to be_a_new_record
         end
       end
 
       context "when the document is persisted" do
 
         before do
-          person.save
+          person.save!
         end
 
         let(:manager) do
@@ -996,25 +1204,29 @@ describe Mongoid::Document do
         end
 
         it "copies the state" do
-          manager.should be_persisted
+          expect(manager).to be_persisted
         end
 
         context "when downcasted document is saved" do
 
           before do
-            manager.save
+            manager.save!
           end
 
           it "keeps the type" do
-            manager.should be_an_instance_of(Manager)
+            expect(manager).to be_an_instance_of(Manager)
+          end
+
+          it "copies over the dirty changes" do
+            expect(manager.changes["ssn"]).to eq(person.changes["ssn"])
           end
 
           it "can by queried by the parent class" do
-            Person.find(manager.id).should be_an_instance_of(Manager)
+            expect(Person.find(manager.id)).to be_an_instance_of(Manager)
           end
 
           it "can by queried by the main class" do
-            Manager.find(manager.id).should be_an_instance_of(Manager)
+            expect(Manager.find(manager.id)).to be_an_instance_of(Manager)
           end
         end
       end
@@ -1030,14 +1242,14 @@ describe Mongoid::Document do
         end
 
         it "copies the state" do
-          manager.should be_destroyed
+          expect(manager).to be_destroyed
         end
       end
 
       context "when the document is dirty" do
 
         before do
-          person.save
+          person.save!
           person.ssn = "123-22-1234"
         end
 
@@ -1046,11 +1258,11 @@ describe Mongoid::Document do
         end
 
         it "copies over the dirty changes" do
-          manager.changes["ssn"].should eq([ nil, "123-22-1234" ])
+          expect(manager.changes["ssn"]).to eq([ nil, "123-22-1234" ])
         end
 
         it "adds the _type change" do
-          manager.changes["_type"].should eq([ "Person", "Manager" ])
+          expect(manager.changes["_type"]).to eq([ "Person", "Manager" ])
         end
       end
 
@@ -1066,7 +1278,24 @@ describe Mongoid::Document do
         end
 
         it "copies the errors" do
-          manager.errors.should include(:ssn)
+          expect(manager.errors).to include(:ssn)
+        end
+
+      end
+
+      context "when the subclass validates attributes not present on the parent class" do
+
+        before do
+          Manager.validates_inclusion_of(:level, in: [1, 2])
+        end
+
+        let(:manager) do
+          person.becomes(Manager)
+        end
+
+        it "validates the instance of the subclass" do
+          manager.level = 3
+          expect(manager.valid?).to be false
         end
       end
 
@@ -1077,7 +1306,7 @@ describe Mongoid::Document do
         end
 
         it "applies default attributes" do
-          manager.level.should eq(1)
+          expect(manager.level).to eq(1)
         end
       end
     end
@@ -1085,22 +1314,20 @@ describe Mongoid::Document do
 
   context "when marshalling the document" do
 
-    let(:person) do
-      Person.new.tap do |person|
-        person.addresses.extension
-      end
+    let(:agency) do
+      Agency.new
     end
 
-    let!(:account) do
-      person.create_account(name: "savings")
+    let!(:agent) do
+      agency.agents.build(title: "VIP")
     end
 
     describe Marshal, ".dump" do
 
       it "successfully dumps the document" do
         expect {
-          Marshal.dump(person)
-          Marshal.dump(account)
+          Marshal.dump(agency)
+          Marshal.dump(agent)
         }.not_to raise_error
       end
     end
@@ -1108,7 +1335,7 @@ describe Mongoid::Document do
     describe Marshal, ".load" do
 
       it "successfully loads the document" do
-        expect { Marshal.load(Marshal.dump(person)) }.not_to raise_error
+        expect(Marshal.load(Marshal.dump(agency))).to eq(agency)
       end
     end
   end
@@ -1123,22 +1350,26 @@ describe Mongoid::Document do
 
       describe "#fetch" do
 
-        let!(:person) do
-          Person.new
+        let(:agency) do
+          Agency.new
+        end
+
+        let(:agent) do
+          agency.agents.build(title: "VIP", address: address)
         end
 
-        let!(:account) do
-          person.create_account(name: "savings")
+        let(:address) do
+          Address.new(city: 'Berlin')
         end
 
         it "stores the parent object" do
-          cache.fetch("key") { person }.should eq(person)
-          cache.fetch("key").should eq(person)
+          expect(cache.fetch("key") { agency }).to eq(agency)
+          expect(cache.fetch("key")).to eq(agency)
         end
 
         it "stores the embedded object" do
-          cache.fetch("key") { account }.should eq(account)
-          cache.fetch("key").should eq(account)
+          expect(cache.fetch("key") { agent }).to eq(agent)
+          expect(cache.fetch("key").address).to eq(agent.address)
         end
       end
     end