mongoid 7.1.7 → 7.2.0.rc1

data/spec/mongoid/reloadable_spec.rb

@@ -353,5 +353,77 @@ describe Mongoid::Reloadable do
         expect(reloaded.readonly?).to be(false)
       end
     end
+
+    context 'on sharded cluster' do
+      require_topology :sharded
+
+      before(:all) do
+        CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
+        CONFIG[:clients][:other][:database] = 'other'
+        Mongoid::Clients.clients.values.each(&:close)
+        Mongoid::Config.send(:clients=, CONFIG[:clients])
+        Mongoid::Clients.with_name(:other).subscribe(Mongo::Monitoring::COMMAND, EventSubscriber.new)
+      end
+
+      let(:subscriber) do
+        client = Mongoid::Clients.with_name(:other)
+        monitoring = client.send(:monitoring)
+        subscriber = monitoring.subscribers['Command'].find do |s|
+          s.is_a?(EventSubscriber)
+        end
+      end
+
+      let(:find_events) do
+        find_events = subscriber.started_events.select { |event| event.command_name.to_s == 'find' }
+      end
+
+      before do
+        subscriber.clear_events!
+      end
+
+      context 'without embedded document' do
+        let(:profile) do
+          Profile.with(client: :other) do |klass|
+            klass.create
+          end
+        end
+
+        before do
+          Profile.with(client: :other) do
+            profile.reload
+          end
+        end
+
+        it 'uses the shard key to reload the document' do
+          expect(find_events.length). to eq(1)
+
+          event = find_events.first
+          expect(event.command['filter'].keys).to include('name')
+        end
+      end
+
+
+      context 'with embedded document' do
+        let(:profile_image) do
+          Profile.with(client: :other) do |klass|
+            profile = klass.create
+            ProfileImage.create(profile: profile)
+          end
+        end
+
+        before do
+          Profile.with(client: :other) do
+            profile_image.reload
+          end
+        end
+
+        it 'uses the shard key to reload the embedded document' do
+          expect(find_events.length). to eq(1)
+
+          event = find_events.first
+          expect(event.command['filter'].keys).to include('name')
+        end
+      end
+    end
   end
 end

data/spec/mongoid/serializable_spec.rb

@@ -7,12 +7,30 @@ describe Mongoid::Serializable do
 
   describe "#field_names" do
 
-    let(:band) do
-      Band.new
+    let(:guitar) do
+      Guitar.new
     end
 
     it "does not duplicate fields" do
-      expect(band.send(:field_names, {})).to eq(band.fields.except("_type").keys.sort)
+      expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("_type").keys.sort)
+    end
+
+    context "when using a custom discriminator_key" do 
+      before do 
+        Instrument.discriminator_key = "dkey"
+      end
+
+      after do 
+        Instrument.discriminator_key = nil
+      end
+
+      let(:guitar) do
+        Guitar.new
+      end
+  
+      it "includes _type but does not include the new discriminator key" do
+        expect(guitar.send(:field_names, {})).to eq(guitar.fields.except("dkey").keys.sort)
+      end
     end
   end
 

data/spec/mongoid/traversable_spec.rb

@@ -251,4 +251,1104 @@ describe Mongoid::Traversable do
       end
     end
   end
+
+  describe "#discriminator_key" do
+
+    context "when the discriminator key is not set on a class" do
+      it "sets the global discriminator key to _type" do
+        expect(Mongoid.discriminator_key).to eq("_type")
+      end
+
+      it "sets the parent discriminator key to _type" do
+        expect(Instrument.discriminator_key).to eq("_type")
+      end
+
+      it "sets the child discriminator key to _type: Piano" do
+        expect(Piano.discriminator_key).to eq("_type")
+      end
+
+      it "sets the child discriminator key to _type: Guitar" do
+        expect(Guitar.discriminator_key).to eq("_type")
+      end
+    end
+
+    context "when the discriminator key is changed at the global level" do
+      before do
+        Mongoid.discriminator_key = "hello"
+      end
+
+      after do
+        Mongoid.discriminator_key = "_type"
+      end
+
+      it "sets the correct value globally" do
+        expect(Mongoid.discriminator_key).to eq("hello")
+      end
+
+      it "is changed in the parent" do
+        expect(Instrument.discriminator_key).to eq("hello")
+      end
+
+      it "is changed in the child: Piano" do
+        expect(Piano.discriminator_key).to eq("hello")
+      end
+
+      it "is changed in the child: Guitar" do
+        expect(Guitar.discriminator_key).to eq("hello")
+      end
+    end
+
+    context "when the discriminator key is changed in the parent" do
+      before do
+        Instrument.discriminator_key = "hello2"
+      end
+
+      after do
+        Instrument.discriminator_key = nil
+      end
+
+      it "doesn't change the global setting" do
+        expect(Mongoid.discriminator_key).to eq("_type")
+      end
+
+      it "changes in the parent" do
+        expect(Instrument.discriminator_key).to eq("hello2")
+      end
+
+      it "changes in the child class: Piano" do
+        expect(Piano.discriminator_key).to eq("hello2")
+      end
+
+      it "changes in the child class: Guitar" do
+        expect(Guitar.discriminator_key).to eq("hello2")
+      end
+
+      context 'when discriminator key is set to nil in parent' do
+        before do
+          Instrument.discriminator_key = nil
+        end
+
+        it "doesn't change the global setting" do
+          expect(Mongoid.discriminator_key).to eq("_type")
+        end
+
+        it 'uses global setting' do
+          expect(Instrument.discriminator_key).to eq("_type")
+        end
+
+        it "changes in the child class: Piano" do
+          expect(Piano.discriminator_key).to eq("_type")
+        end
+
+        it "changes in the child class: Guitar" do
+          expect(Guitar.discriminator_key).to eq("_type")
+        end
+      end
+
+      context "when resetting the discriminator key after nil" do
+        before do
+          Instrument.discriminator_key = nil
+          Instrument.discriminator_key = "hello4"
+        end
+
+        it "doesn't change the global setting" do
+          expect(Mongoid.discriminator_key).to eq("_type")
+        end
+
+        it 'has the correct value' do
+          expect(Instrument.discriminator_key).to eq("hello4")
+        end
+
+        it "changes in the child class: Piano" do
+          expect(Piano.discriminator_key).to eq("hello4")
+        end
+
+        it "changes in the child class: Guitar" do
+          expect(Guitar.discriminator_key).to eq("hello4")
+        end
+      end
+    end
+
+    context "when the discriminator key is changed in the child" do
+      let(:set_discriminator_key) do
+        Guitar.discriminator_key = "hello3"
+      end
+
+      before :each do
+        begin
+          set_discriminator_key
+        rescue
+        end
+      end
+
+      it "raises an error" do
+        expect do
+          set_discriminator_key
+        end.to raise_error(Mongoid::Errors::InvalidDiscriminatorKeyTarget)
+      end
+
+      it "doesn't change in that class" do
+        expect(Guitar.discriminator_key).to eq("_type")
+      end
+
+      it "doesn't change the global setting" do
+        expect(Mongoid.discriminator_key).to eq("_type")
+      end
+
+      it "doesn't change in the sibling" do
+        expect(Piano.discriminator_key).to eq("_type")
+      end
+
+      it "doesn't change in the parent" do
+        expect(Instrument.discriminator_key).to eq("_type")
+      end
+    end
+
+    context "when discriminator key is called on an instance" do
+
+      let(:guitar) do
+        Guitar.new
+      end
+
+      it "raises an error on setter" do
+        expect do
+          guitar.discriminator_key = "hello3"
+        end.to raise_error(NoMethodError)
+      end
+
+      it "raises an error on getter" do
+        expect do
+          guitar.discriminator_key
+        end.to raise_error(NoMethodError)
+      end
+    end
+
+    context ".fields" do
+      context "when the discriminator key is not changed" do
+        it "creates a _type field in the parent" do
+          expect(Instrument.fields.keys).to include("_type")
+        end
+
+        it "creates a _type field in the child: Guitar" do
+          expect(Guitar.fields.keys).to include("_type")
+        end
+
+        it "creates a _type field in the child: Piano" do
+          expect(Piano.fields.keys).to include("_type")
+        end
+      end
+
+      context "when the discriminator key is changed at the base level" do
+        context "after class creation" do
+          before do
+            class GlobalDiscriminatorParent
+              include Mongoid::Document
+            end
+
+            class GlobalDiscriminatorChild < GlobalDiscriminatorParent
+            end
+
+            Mongoid.discriminator_key = "test"
+          end
+
+          after do
+            Mongoid.discriminator_key = "_type"
+          end
+
+          it "creates a field with the old global value in the parent" do
+            expect(GlobalDiscriminatorParent.fields.keys).to include("_type")
+          end
+
+          it "creates a field with the old global value in the child" do
+            expect(GlobalDiscriminatorChild.fields.keys).to include("_type")
+          end
+
+          it "does not have the new global value in the parent" do
+            expect(GlobalDiscriminatorParent.fields.keys).to_not include("test")
+          end
+
+          it "does not have the new global value in the child" do
+            expect(GlobalDiscriminatorChild.fields.keys).to_not include("test")
+          end
+
+        end
+
+        context "before class creation" do
+          before do
+            Mongoid.discriminator_key = "test"
+
+            class PreGlobalDiscriminatorParent
+              include Mongoid::Document
+            end
+
+            class PreGlobalDiscriminatorChild < PreGlobalDiscriminatorParent
+            end
+          end
+
+          after do
+            Mongoid.discriminator_key = "_type"
+          end
+
+          it "creates a field with new discriminator key in the parent" do
+            expect(PreGlobalDiscriminatorParent.fields.keys).to include("test")
+          end
+
+          it "creates a field with new discriminator key in the child" do
+            expect(PreGlobalDiscriminatorChild.fields.keys).to include("test")
+          end
+
+          it "does not have the original discriminator key in the parent" do
+            expect(PreGlobalDiscriminatorParent.fields.keys).to_not include("_type")
+          end
+
+          it "does not have the original discriminator key in the child" do
+            expect(PreGlobalDiscriminatorChild.fields.keys).to_not include("_type")
+          end
+        end
+      end
+
+      context "when the discriminator key is changed in the parent" do
+        context "after child class creation" do
+          before do
+            class LocalDiscriminatorParent
+              include Mongoid::Document
+            end
+
+            class LocalDiscriminatorChild < LocalDiscriminatorParent
+            end
+
+            LocalDiscriminatorParent.discriminator_key = "test2"
+          end
+
+          it "creates a new field in the parent" do
+            expect(LocalDiscriminatorParent.fields.keys).to include("test2")
+          end
+
+          it "does not remove the original field in the parent" do
+            expect(LocalDiscriminatorParent.fields.keys).to include("_type")
+          end
+
+          it "still has _type field in the child" do
+            expect(LocalDiscriminatorChild.fields.keys).to include("_type")
+          end
+
+          it "has the new field in the child" do
+            expect(LocalDiscriminatorChild.fields.keys).to include("test2")
+          end
+        end
+
+        context "before child class creation" do
+          before do
+            class PreLocalDiscriminatorParent
+              include Mongoid::Document
+              self.discriminator_key = "test2"
+            end
+
+            class PreLocalDiscriminatorChild < PreLocalDiscriminatorParent
+            end
+          end
+
+          it "creates a new field in the parent" do
+            expect(PreLocalDiscriminatorParent.fields.keys).to include("test2")
+          end
+
+          it "does not create the _type field in the parent" do
+            expect(PreLocalDiscriminatorParent.fields.keys).to_not include("_type")
+          end
+
+          it "creates a new field in the child" do
+            expect(PreLocalDiscriminatorChild.fields.keys).to include("test2")
+          end
+        end
+
+        context "when there's no child class" do
+          before do
+            class LocalDiscriminatorNonParent
+              include Mongoid::Document
+              self.discriminator_key = "test2"
+            end
+          end
+
+          it "does not create a _type field" do
+            expect(LocalDiscriminatorNonParent.fields.keys).to_not include("_type")
+          end
+
+          it "does not create a new field" do
+            expect(LocalDiscriminatorNonParent.fields.keys).to_not include("test2")
+          end
+        end
+      end
+    end
+
+    context "when setting the discriminator key as a symbol" do
+      context "when the discriminator key is changed at the base level" do
+        context "after class creation" do
+          before do
+            class GlobalSymDiscriminatorParent
+              include Mongoid::Document
+            end
+
+            class GlobalSymDiscriminatorChild < GlobalSymDiscriminatorParent
+            end
+
+            Mongoid.discriminator_key = :test
+          end
+
+          after do
+            Mongoid.discriminator_key = "_type"
+          end
+
+          it "gets converted to a string in the parent" do
+            expect(GlobalSymDiscriminatorParent.fields.keys).to_not include("test")
+          end
+
+          it "gets converted to a string in the child" do
+            expect(GlobalSymDiscriminatorChild.fields.keys).to_not include("test")
+          end
+
+          it "is a string globally" do
+            expect(Mongoid.discriminator_key).to eq("test")
+          end
+
+          it "is a string in the parent" do
+            expect(GlobalSymDiscriminatorParent.discriminator_key).to eq("test")
+          end
+
+          it "is a string in the child" do
+            expect(GlobalSymDiscriminatorChild.discriminator_key).to eq("test")
+          end
+        end
+
+        context "before class creation" do
+          before do
+            Mongoid.discriminator_key = :test
+
+            class PreGlobalSymDiscriminatorParent
+              include Mongoid::Document
+            end
+
+            class PreGlobalSymDiscriminatorChild < PreGlobalSymDiscriminatorParent
+            end
+          end
+
+          after do
+            Mongoid.discriminator_key = "_type"
+          end
+
+          it "creates a field with new discriminator key as a string in the parent" do
+            expect(PreGlobalSymDiscriminatorParent.fields.keys).to include("test")
+          end
+
+          it "creates a field with new discriminator key as a string in the child" do
+            expect(PreGlobalSymDiscriminatorChild.fields.keys).to include("test")
+          end
+
+          it "is a string globally" do
+            expect(Mongoid.discriminator_key).to eq("test")
+          end
+
+          it "is a string in the parent" do
+            expect(PreGlobalSymDiscriminatorParent.discriminator_key).to eq("test")
+          end
+
+          it "is a string in the child" do
+            expect(PreGlobalSymDiscriminatorChild.discriminator_key).to eq("test")
+          end
+        end
+      end
+
+      context "when the discriminator key is changed in the parent" do
+        context "after child class creation" do
+          before do
+            class LocalSymDiscriminatorParent
+              include Mongoid::Document
+            end
+
+            class LocalSymDiscriminatorChild < LocalSymDiscriminatorParent
+            end
+
+            LocalSymDiscriminatorParent.discriminator_key = :test2
+          end
+
+          it "creates a new field of type string in the parent" do
+            expect(LocalSymDiscriminatorParent.fields.keys).to include("test2")
+          end
+
+          it "creates a new field of type string in the child" do
+            expect(LocalSymDiscriminatorChild.fields.keys).to include("test2")
+          end
+
+          it "is a string in the parent" do
+            expect(LocalSymDiscriminatorParent.discriminator_key).to eq("test2")
+          end
+
+          it "is a string in the child" do
+            expect(LocalSymDiscriminatorChild.discriminator_key).to eq("test2")
+          end
+        end
+
+        context "before child class creation" do
+          before do
+            class PreLocalSymDiscriminatorParent
+              include Mongoid::Document
+              self.discriminator_key = :test2
+            end
+
+            class PreLocalSymDiscriminatorChild < PreLocalSymDiscriminatorParent
+            end
+          end
+
+          it "creates a new field of type string in the parent" do
+            expect(PreLocalSymDiscriminatorParent.fields.keys).to include("test2")
+          end
+
+          it "creates a new field of type string in the child" do
+            expect(PreLocalSymDiscriminatorChild.fields.keys).to include("test2")
+          end
+
+          it "is a string in the parent" do
+            expect(PreLocalSymDiscriminatorParent.discriminator_key).to eq("test2")
+          end
+
+          it "is a string in the child" do
+            expect(PreLocalSymDiscriminatorChild.discriminator_key).to eq("test2")
+          end
+        end
+      end
+    end
+
+    context "when setting the discriminator key as" do
+      context "a number" do
+        before do
+          Instrument.discriminator_key = 3
+        end
+
+        after do
+          Instrument.discriminator_key = nil
+        end
+
+        it "gets converted to a string" do
+          expect(Instrument.fields.keys).to include("3")
+        end
+
+        it "is a string in the parent" do
+          expect(Instrument.discriminator_key).to eq("3")
+        end
+
+        it "is a string in the child: Guitar" do
+          expect(Guitar.discriminator_key).to eq("3")
+        end
+
+        it "is a string in the child: Piano" do
+          expect(Piano.discriminator_key).to eq("3")
+        end
+      end
+
+      context "a boolean" do
+        before do
+          Instrument.discriminator_key = true
+        end
+
+        after do
+          Instrument.discriminator_key = nil
+        end
+
+        it "gets converted to a string" do
+          expect(Instrument.fields.keys).to include("true")
+        end
+
+        it "is a string in the parent" do
+          expect(Instrument.discriminator_key).to eq("true")
+        end
+
+        it "is a string in the child: Guitar" do
+          expect(Guitar.discriminator_key).to eq("true")
+        end
+
+        it "is a string in the child: Piano" do
+          expect(Piano.discriminator_key).to eq("true")
+        end
+      end
+    end
+
+    context "when setting a field equal to discriminator key and duplicate_fields_exception is true" do
+      before do
+        Mongoid.duplicate_fields_exception = true
+
+        class DuplicateDiscriminatorKeyParent
+          include Mongoid::Document
+          field :dkey, type: String
+        end
+
+        class DuplicateDiscriminatorKeyChild < DuplicateDiscriminatorKeyParent
+        end
+      end
+
+      after do
+        Mongoid.duplicate_fields_exception = false
+      end
+
+      it "does not raise an error" do
+        expect do
+          DuplicateDiscriminatorKeyParent.discriminator_key = "dkey"
+        end.to_not raise_error
+      end
+    end
+
+    context "when the discriminator key conflicts with mongoid's internals" do
+
+      after do
+        Person.discriminator_key = nil
+      end
+
+      [:_association, :invalid].each do |meth|
+        context "when the field is named #{meth}" do
+
+          it "raises an error" do
+            expect {
+              Person.discriminator_key = meth
+            }.to raise_error(Mongoid::Errors::InvalidField)
+          end
+        end
+      end
+    end
+
+    context "when setting a field equal to global discriminator key and duplicate_fields_exception is true" do
+      before do
+        Mongoid.duplicate_fields_exception = true
+        Mongoid.discriminator_key = "dkey"
+
+        class GlobalDuplicateDiscriminatorKeyParent
+          include Mongoid::Document
+        end
+
+        class GlobalDuplicateDiscriminatorKeyChild < GlobalDuplicateDiscriminatorKeyParent
+        end
+      end
+
+      after do
+        Mongoid.duplicate_fields_exception = false
+        Mongoid.discriminator_key = "_type"
+      end
+
+      it "raises an error" do
+        expect do
+          GlobalDuplicateDiscriminatorKeyParent.class_eval do
+            field("dkey")
+          end
+        end.to raise_error(Mongoid::Errors::InvalidField)
+      end
+    end
+
+    context "when the global discriminator key conflicts with mongoid's internals" do
+
+      after do
+        Mongoid.discriminator_key = "_type"
+      end
+
+      [:_association, :invalid].each do |meth|
+        context "when the field is named #{meth}" do
+
+          it "raises an error" do
+            expect do
+              Mongoid.discriminator_key = meth
+            end.to raise_error(Mongoid::Errors::InvalidField)
+          end
+        end
+      end
+    end
+  end
+
+  describe "#discriminator_value" do
+
+    context "when the discriminator value is not set" do
+
+      it "has the correct discriminator_value" do
+        expect(Guitar.discriminator_value).to eq("Guitar")
+      end
+
+      it "has the correct discriminator_value" do
+        expect(Piano.discriminator_value).to eq("Piano")
+      end
+
+      it "has the correct discriminator_value" do
+        expect(Instrument.discriminator_value).to eq("Instrument")
+      end
+    end
+
+
+    context "when the discriminator value is set on the child class" do
+      before do
+        Guitar.discriminator_value = "some string instrument"
+      end
+
+      after do
+        Guitar.discriminator_value = nil
+      end
+
+      it "has the correct discriminator_value" do
+        expect(Guitar.discriminator_value).to eq("some string instrument")
+      end
+
+      it "does not change the sibling's discriminator value" do
+        expect(Piano.discriminator_value).to eq("Piano")
+      end
+
+      it "does not change the parent's discriminator value" do
+        expect(Instrument.discriminator_value).to eq("Instrument")
+      end
+    end
+
+    context "when the discriminator value is set on the parent" do
+      before do
+        Instrument.discriminator_value = "musical thingy"
+      end
+
+      after do
+        Instrument.discriminator_value = nil
+      end
+
+      it "is changed in the parent" do
+        expect(Instrument.discriminator_value).to eq("musical thingy")
+      end
+
+      it "is not changed in the child: Guitar" do
+        expect(Guitar.discriminator_value).to eq("Guitar")
+      end
+
+      it "is not changed in the child: Piano" do
+        expect(Piano.discriminator_value).to eq("Piano")
+      end
+    end
+
+    context "when setting the discriminator value to nil" do
+      before do
+        Guitar.discriminator_value = "some string instrument"
+        Guitar.discriminator_value = nil
+      end
+
+      it "reverts back to default" do
+        expect(Guitar.discriminator_value).to eq("Guitar")
+      end
+    end
+
+    context "when setting discriminator value on parent that is also a child" do
+      before do
+        Browser.discriminator_value = "something"
+      end
+
+      after do
+        Browser.discriminator_value = nil
+      end
+
+      it "has the correct value in the parent" do
+        expect(Browser.discriminator_value).to eq("something")
+      end
+
+      it "doesn't set the grandchild's discriminator value" do
+        expect(Firefox.discriminator_value).to eq("Firefox")
+      end
+    end
+
+    describe ".fields" do
+
+      let(:guitar) do
+        Guitar.new
+      end
+
+      let(:piano) do
+        Piano.new
+      end
+
+      let(:instrument) do
+        Instrument.new
+      end
+
+      context "when the discriminator value is not set" do
+        it "has the correct discriminator_value" do
+          expect(guitar._type).to eq("Guitar")
+        end
+
+        it "has the correct discriminator_value" do
+          expect(piano._type).to eq("Piano")
+        end
+
+        it "has the correct discriminator_value" do
+          expect(instrument._type).to eq("Instrument")
+        end
+      end
+
+      context "when the discriminator value is set on the child class" do
+        before do
+          Guitar.discriminator_value = "some string instrument"
+        end
+
+        after do
+          Guitar.discriminator_value = nil
+        end
+
+        it "has the correct discriminator_value" do
+          expect(guitar._type).to eq("some string instrument")
+        end
+
+        it "does not change the sibling's discriminator value" do
+          expect(piano._type).to eq("Piano")
+        end
+
+        it "does not change the parent's discriminator value" do
+          expect(instrument._type).to eq("Instrument")
+        end
+
+        it "retrieves the correct discriminator_mapping from the parent" do
+          expect(
+            Instrument.get_discriminator_mapping("some string instrument")
+          ).to eq(Guitar)
+        end
+
+        it "retrieves the correct discriminator_mapping from the child: Guitar" do
+          expect(
+            Guitar.get_discriminator_mapping("some string instrument")
+          ).to eq(Guitar)
+        end
+
+        it "is not retrieved from the sibling" do
+          expect(
+            Piano.get_discriminator_mapping("some string instrument")
+          ).to be nil
+        end
+      end
+
+      context "when the discriminator value is set on the parent" do
+        before do
+          Instrument.discriminator_value = "musical thingy"
+        end
+
+        after do
+          Instrument.discriminator_value = nil
+        end
+
+        it "is changed in the parent" do
+          expect(instrument._type).to eq("musical thingy")
+        end
+
+        it "is not changed in the child: Guitar" do
+          expect(guitar._type).to eq("Guitar")
+        end
+
+        it "is not changed in the child: Piano" do
+          expect(piano._type).to eq("Piano")
+        end
+
+        it "retrieves the correct discriminator_mapping from the parent" do
+          expect(
+            Instrument.get_discriminator_mapping("musical thingy")
+          ).to eq(Instrument)
+        end
+
+        it "is not retrieved from the child: Guitar" do
+          expect(
+            Guitar.get_discriminator_mapping("musical thingy")
+          ).to be nil
+        end
+
+        it "is not retrieved from the child: Piano" do
+          expect(
+            Piano.get_discriminator_mapping("musical thingy")
+          ).to be nil
+        end
+      end
+
+      context "when setting the discriminator value to nil" do
+        before do
+          Guitar.discriminator_value = "some string instrument"
+          Guitar.discriminator_value = nil
+        end
+
+        it "reverts back to default" do
+          expect(guitar._type).to eq("Guitar")
+        end
+
+        it "retrieves the correct discriminator_mapping" do
+          expect(
+            Instrument.get_discriminator_mapping("Guitar")
+          ).to eq(Guitar)
+        end
+
+        it "retrieves the old discriminator_mapping" do
+          expect(
+            Instrument.get_discriminator_mapping("some string instrument")
+          ).to eq(Guitar)
+        end
+      end
+
+      context "when setting discriminator value on parent that is also a child" do
+        before do
+          Browser.discriminator_value = "something"
+        end
+
+        after do
+          Browser.discriminator_value = nil
+        end
+
+        let(:browser) do
+          Browser.new
+        end
+
+        let(:firefox) do
+          Firefox.new
+        end
+
+        it "has the correct value in the parent" do
+          expect(browser._type).to eq("something")
+        end
+
+        it "doesn't set the grandchild's discriminator value" do
+          expect(firefox._type).to eq("Firefox")
+        end
+
+        it "retrieves the correct discriminator_mapping from the grandparent" do
+          expect(
+            Canvas.get_discriminator_mapping("something")
+          ).to eq(Browser)
+        end
+
+        it "retrieves the correct discriminator_mapping from the parent" do
+          expect(
+            Browser.get_discriminator_mapping("something")
+          ).to eq(Browser)
+        end
+
+        it "is not retrieved from the grandchild" do
+          expect(
+            Firefox.get_discriminator_mapping("something")
+          ).to be nil
+        end
+      end
+
+      context "when changing the discriminator key" do
+        before do
+          Instrument.discriminator_key = "dkey"
+          Guitar.discriminator_value = "string instrument"
+        end
+
+        after do
+          Instrument.discriminator_key = nil
+          Guitar.discriminator_value = nil
+        end
+
+        let(:guitar) do
+          Guitar.new
+        end
+
+        it "has the correct discriminator_value for the new discriminator_key" do
+          expect(guitar.dkey).to eq("string instrument")
+        end
+
+        it "has the correct discriminator_value for the old discriminator_key" do
+          expect(guitar._type).to eq("string instrument")
+        end
+
+        it "retrieves the correct discriminator_mapping from the parent" do
+          expect(
+            Instrument.get_discriminator_mapping("string instrument")
+          ).to eq(Guitar)
+        end
+
+        it "retrieves the correct discriminator_mapping from the child: Guitar" do
+          expect(
+            Guitar.get_discriminator_mapping("string instrument")
+          ).to eq(Guitar)
+        end
+
+        it "is not retrieved from the sibling" do
+          expect(
+            Piano.get_discriminator_mapping("string instrument")
+          ).to be nil
+        end
+      end
+
+      context "when the discriminator value is set twice" do
+        before do
+          Instrument.discriminator_value = "something"
+          Instrument.discriminator_value = "musical thingy"
+        end
+
+        after do
+          Instrument.discriminator_value = nil
+        end
+
+        it "is changed in the parent" do
+          expect(instrument._type).to eq("musical thingy")
+        end
+
+        it "is not changed in the child: Guitar" do
+          expect(guitar._type).to eq("Guitar")
+        end
+
+        it "is not changed in the child: Piano" do
+          expect(piano._type).to eq("Piano")
+        end
+
+        it "retrieves the correct discriminator_mapping from the parent" do
+          expect(
+            Instrument.get_discriminator_mapping("musical thingy")
+          ).to eq(Instrument)
+        end
+
+        it "is not retrieved from the child: Guitar" do
+          expect(
+            Guitar.get_discriminator_mapping("musical thingy")
+          ).to be nil
+        end
+
+        it "ris not retrieved from the child: Piano" do
+          expect(
+            Piano.get_discriminator_mapping("musical thingy")
+          ).to be nil
+        end
+      end
+    end
+
+    context "when using the Class.new syntax" do
+      context "when assigning to a constant" do
+        before :all do
+          NewClassPerson = Class.new(Person)
+          NewClassPerson2 = Class.new(NewClassPerson)
+        end
+
+        it "has the correct discriminator_value when doing one Class.new" do
+          expect(NewClassPerson.discriminator_value).to eq('NewClassPerson')
+        end
+
+        it "has the correct discriminator_value when doing two Class.new's" do
+          expect(NewClassPerson2.discriminator_value).to eq('NewClassPerson2')
+        end
+      end
+    end
+  end
+
+  describe "#discriminator_mapping" do
+    context "when not changing discriminator_mappings" do
+      it "has the class name as the value: Instrument" do
+        expect(
+          Instrument.get_discriminator_mapping("Instrument")
+        ).to eq(Instrument)
+      end
+
+      it "has the class name as the value: Guitar" do
+        expect(
+          Guitar.get_discriminator_mapping("Guitar")
+        ).to eq(Guitar)
+      end
+
+      it "has the class name as the value: Piano" do
+        expect(
+          Piano.get_discriminator_mapping("Piano")
+        ).to eq(Piano)
+      end
+    end
+
+    context "when adding to the parent" do
+      before do
+        Instrument.add_discriminator_mapping("some_dmap")
+      end
+
+      after do
+        Instrument.add_discriminator_mapping("Instrument")
+      end
+
+      it "can be retrieved from the parent" do
+        expect(
+          Instrument.get_discriminator_mapping("some_dmap")
+        ).to eq(Instrument)
+      end
+
+      it "can be retrieved from the child: Guitar" do
+        expect(
+          Guitar.get_discriminator_mapping("some_dmap")
+        ).to be nil
+      end
+
+      it "can be retrieved from the child: Piano" do
+        expect(
+          Piano.get_discriminator_mapping("some_dmap")
+        ).to be nil
+      end
+    end
+
+    context "when adding to the child" do
+      before do
+        Guitar.add_discriminator_mapping("something")
+      end
+
+      after do
+        Guitar.add_discriminator_mapping("Guitar")
+      end
+
+      it "can be retrieved from the parent" do
+        expect(
+          Instrument.get_discriminator_mapping("something")
+        ).to eq(Guitar)
+      end
+
+      it "can be retrieved from the child: Guitar" do
+        expect(
+          Guitar.get_discriminator_mapping("something")
+        ).to eq(Guitar)
+      end
+
+      it "is not retrieved from the sibling" do
+        expect(
+          Piano.get_discriminator_mapping("something")
+        ).to be nil
+      end
+    end
+
+    context "when adding to the same class twice" do
+      before do
+        Guitar.add_discriminator_mapping("something")
+        Guitar.add_discriminator_mapping("something else")
+      end
+
+      after do
+        Guitar.add_discriminator_mapping("Guitar")
+      end
+
+      it "retrieves the new value from the parent" do
+        expect(
+          Instrument.get_discriminator_mapping("something else")
+        ).to eq(Guitar)
+      end
+
+      it "retrieves the new value from the child: Guitar" do
+        expect(
+          Guitar.get_discriminator_mapping("something else")
+        ).to eq(Guitar)
+      end
+
+      it "is not retrieved from the sibling" do
+        expect(
+          Piano.get_discriminator_mapping("something else")
+        ).to be nil
+      end
+
+      it "retrieves the old value from the parent" do
+        expect(
+          Instrument.get_discriminator_mapping("something")
+        ).to eq(Guitar)
+      end
+
+      it "retrieves the old value from the child: Guitar" do
+        expect(
+          Guitar.get_discriminator_mapping("something")
+        ).to eq(Guitar)
+      end
+
+      it "does not retrieves the old value from the sibling" do
+        expect(
+          Piano.get_discriminator_mapping("something")
+        ).to be nil
+      end
+    end
+  end
 end