mongoid 7.1.0.rc0 → 7.2.0.rc1

data/spec/mongoid/fields_spec.rb

@@ -431,7 +431,9 @@ describe Mongoid::Fields do
     context "when the Symbol type is used" do
 
       before do
-        expect(Mongoid.logger).to receive(:warn)
+        Mongoid::Fields::Validators::Macro.class_eval do
+          @field_type_is_symbol_warned = false
+        end
       end
 
       after do
@@ -439,8 +441,29 @@ describe Mongoid::Fields do
       end
 
       it "warns that the BSON symbol type is deprecated" do
+        expect(Mongoid.logger).to receive(:warn)
+
+        Band.field :should_warn, type: Symbol
+      end
+
+      it "warns on first use of Symbol type only" do
+        expect(Mongoid.logger).to receive(:warn).once
+
         Band.field :should_warn, type: Symbol
       end
+
+      context 'when using Symbol field type in multiple classes' do
+        after do
+          Truck.fields.delete("should_warn")
+        end
+
+        it "warns on first use of Symbol type only" do
+          expect(Mongoid.logger).to receive(:warn).once
+
+          Band.field :should_warn, type: Symbol
+          Truck.field :should_warn, type: Symbol
+        end
+      end
     end
 
     context "when the options are not valid" do
@@ -810,7 +833,8 @@ describe Mongoid::Fields do
       end
 
       it "does not return subclass defaults" do
-        expect(shape.pre_processed_defaults).to eq([ "_id", "x", "y", "_type" ])
+        expect(shape.pre_processed_defaults).to eq([ "_id", "x", "y" ])
+        expect(shape.post_processed_defaults).to eq([ "_type" ])
       end
     end
 
@@ -821,7 +845,8 @@ describe Mongoid::Fields do
       end
 
       it "has the parent and child defaults" do
-        expect(circle.pre_processed_defaults).to eq([ "_id", "x", "y", "_type", "radius" ])
+        expect(circle.pre_processed_defaults).to eq([ "_id", "x", "y", "radius" ])
+        expect(circle.post_processed_defaults).to eq([ "_type" ])
       end
     end
   end
@@ -1093,6 +1118,10 @@ describe Mongoid::Fields do
       it "does not return subclass fields" do
         expect(shape.fields.keys).to_not include("radius")
       end
+
+      it 'includes _type field' do
+        expect(shape.fields.keys).to include("_type")
+      end
     end
 
     context "on subclasses" do
@@ -1112,6 +1141,28 @@ describe Mongoid::Fields do
       it "includes the child fields" do
         expect(circle.fields.keys).to include("radius")
       end
+
+      it 'includes _type field' do
+        expect(circle.fields.keys).to include("_type")
+      end
+    end
+
+    context "on new subclasses" do
+      it "all subclasses get the discriminator key" do
+        class DiscriminatorParent
+          include Mongoid::Document
+        end
+
+        class DiscriminatorChild1 < DiscriminatorParent
+        end
+
+        class DiscriminatorChild2 < DiscriminatorParent
+        end
+
+        expect(DiscriminatorParent.fields.keys).to include("_type")
+        expect(DiscriminatorChild1.fields.keys).to include("_type")
+        expect(DiscriminatorChild2.fields.keys).to include("_type")
+      end
     end
   end
 
@@ -1329,4 +1380,22 @@ describe Mongoid::Fields do
       end
     end
   end
+
+  describe '_type field' do
+    context 'on parent class' do
+      let(:shape) { Shape.new }
+
+      it 'is correctly set' do
+        shape.attributes['_type'].should == 'Shape'
+      end
+    end
+
+    context 'on child class' do
+      let(:circle) { Circle.new }
+
+      it 'is correctly set' do
+        circle.attributes['_type'].should == 'Circle'
+      end
+    end
+  end
 end

data/spec/mongoid/findable_spec.rb

@@ -479,6 +479,38 @@ describe Mongoid::Findable do
     end
   end
 
+  describe '.count' do
+    context 'when the collection is not empty' do
+      before do
+        Band.create!(name: "Tool")
+        Band.create!(name: "Photek")
+      end
+
+      it 'returns the currect count' do
+        expect(Band.count).to eq(2)
+      end
+    end
+  end
+
+  describe '.estimated_count' do
+    context 'when the collection is not empty' do
+      before do
+        Band.create(name: "Tool")
+        Band.create(name: "Photek")
+      end
+
+      it 'returns the correct count' do
+        expect(Band.estimated_count).to eq(2)
+      end
+    end
+
+    context 'when the collection is empty' do
+      it 'returns the correct count' do
+        expect(Band.estimated_count).to eq(0)
+      end
+    end
+  end
+
   Mongoid::Criteria::Queryable::Selectable.forwardables.each do |method|
 
     describe "##{method}" do

data/spec/mongoid/indexable_spec.rb

@@ -48,7 +48,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when database specific options exist", if: non_legacy_server? do
+    context "when database specific options exist" do
 
       let(:klass) do
         Class.new do
@@ -98,7 +98,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when database options are specified", if: non_legacy_server? do
+    context "when database options are specified" do
 
       let(:klass) do
         Class.new do
@@ -136,7 +136,8 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when a collation option is specified", if: collation_supported? do
+    context "when a collation option is specified" do
+      min_server_version '3.4'
 
       let(:klass) do
         Class.new do
@@ -190,6 +191,32 @@ describe Mongoid::Indexable do
         expect(spec.options).to eq(unique: false, background: true)
       end
     end
+
+    context "when using a custom discriminator_key" do 
+      context "when indexes have not been added" do
+        let(:klass) do
+          Class.new do
+            include Mongoid::Document
+            self.discriminator_key = "dkey"
+            def self.hereditary?
+              true
+            end
+          end
+        end
+  
+        before do
+          klass.add_indexes
+        end
+  
+        let(:spec) do
+          klass.index_specification(dkey: 1)
+        end
+  
+        it "adds the _type index" do
+          expect(spec.options).to eq(unique: false, background: true)
+        end
+      end
+    end
   end
 
   describe ".index" do
@@ -311,7 +338,8 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when providing a collation option", if: collation_supported? do
+    context "when providing a collation option" do
+      min_server_version '3.4'
 
       before do
         klass.index({ name: 1 }, collation: { locale: 'en_US', strength: 2 })
@@ -381,7 +409,7 @@ describe Mongoid::Indexable do
       end
     end
 
-    context "when providing a geospacial index" do
+    context "when providing a geospatial index" do
 
       before do
         klass.index({ location: "2d" }, { min: -200, max: 200, bits: 32 })
@@ -391,7 +419,7 @@ describe Mongoid::Indexable do
         klass.index_specification(location: "2d").options
       end
 
-      it "sets the geospacial index" do
+      it "sets the geospatial index" do
         expect(options).to eq({ min: -200, max: 200, bits: 32 })
       end
     end

data/spec/mongoid/inspectable_spec.rb

@@ -26,12 +26,39 @@ describe Mongoid::Inspectable do
       end
 
       it "displays defined fields" do
-        expect(inspected).to include("title: \"CEO\"")
+        expect(inspected).to include(%q,title: "CEO",)
       end
 
       it "displays field aliases" do
         expect(inspected).to include("t(test):")
       end
+
+      it "displays the default discriminator key" do 
+        expect(inspected).to include(%q,_type: "Person",)
+      end
+    end
+
+    context "when using a custom discriminator key" do
+
+      before do 
+        Person.discriminator_key = "dkey"
+      end
+
+      after do 
+        Person.discriminator_key = nil
+      end
+
+      let(:person) do
+        Person.new(title: "CEO")
+      end
+
+      let(:inspected) do
+        person.inspect
+      end
+
+      it "displays the new discriminator key" do 
+        expect(inspected).to include(%q,dkey: "Person",)
+      end
     end
 
     context "when allowing dynamic fields" do
@@ -45,7 +72,7 @@ describe Mongoid::Inspectable do
       end
 
       it "includes dynamic attributes" do
-        expect(inspected).to include("some_attribute: \"foo\"")
+        expect(inspected).to include(%q,some_attribute: "foo",)
       end
     end
   end

data/spec/mongoid/interceptable_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require "spec_helper"
+require_relative './interceptable_spec_models'
 
 describe Mongoid::Interceptable do
 
@@ -1706,8 +1707,8 @@ describe Mongoid::Interceptable do
   context "when loading a model multiple times" do
 
     before do
-      load "spec/app/models/callback_test.rb"
-      load "spec/app/models/callback_test.rb"
+      load File.join(MODELS, "callback_test.rb")
+      load File.join(MODELS, "callback_test.rb")
     end
 
     let(:callback) do
@@ -1722,4 +1723,65 @@ describe Mongoid::Interceptable do
       end
     end
   end
+
+  context 'when creating a parent and embedded child' do
+    let(:registry) { InterceptableSpec::CallbackRegistry.new }
+    let(:parent) do
+      InterceptableSpec::CbParent.new(registry).tap do |parent|
+        parent.cb_children << InterceptableSpec::CbChild.new(registry, cb_parent: parent)
+      end
+    end
+
+    let(:expected) do
+      [
+        [InterceptableSpec::CbParent, :before_validation],
+        [InterceptableSpec::CbChild, :before_validation],
+        [InterceptableSpec::CbChild, :after_validation],
+        [InterceptableSpec::CbParent, :after_validation],
+        [InterceptableSpec::CbParent, :before_save],
+        [InterceptableSpec::CbParent, :before_create],
+        [InterceptableSpec::CbParent, :after_create],
+        [InterceptableSpec::CbParent, :after_save],
+      ]
+    end
+
+    it 'calls callbacks in the right order' do
+      parent.save!
+      expect(registry.calls).to eq expected
+    end
+  end
+
+  context 'when creating a parent and embedded child with cascading callbacks' do
+    let(:registry) { InterceptableSpec::CallbackRegistry.new }
+    let(:parent) do
+      InterceptableSpec::CbParent.new(registry).tap do |parent|
+        parent.cb_cascaded_children <<
+          InterceptableSpec::CbCascadedChild.new(registry, cb_parent: parent)
+      end
+    end
+
+    let(:expected) do
+      [
+        [InterceptableSpec::CbParent, :before_validation],
+        [InterceptableSpec::CbCascadedChild, :before_validation],
+        [InterceptableSpec::CbCascadedChild, :after_validation],
+        [InterceptableSpec::CbParent, :after_validation],
+        [InterceptableSpec::CbParent, :before_save],
+        [InterceptableSpec::CbCascadedChild, :before_save],
+        [InterceptableSpec::CbParent, :before_create],
+        [InterceptableSpec::CbCascadedChild, :before_create],
+        [InterceptableSpec::CbParent, :after_create],
+        [InterceptableSpec::CbCascadedChild, :after_create],
+        [InterceptableSpec::CbParent, :after_save],
+        [InterceptableSpec::CbCascadedChild, :after_save],
+      ]
+    end
+
+    it 'calls callbacks in the right order' do
+      pending 'MONGOID-3795'
+
+      parent.save!
+      expect(registry.calls).to eq expected
+    end
+  end
 end

data/spec/mongoid/interceptable_spec_models.rb

@@ -0,0 +1,76 @@
+module InterceptableSpec
+  class CallbackRegistry
+    def initialize
+      @calls = []
+    end
+
+    def record_call(cls, cb)
+      @calls << [cls, cb]
+    end
+
+    attr_reader :calls
+  end
+
+  module CallbackTracking
+    extend ActiveSupport::Concern
+
+    included do
+      %i(
+        validation save create update
+      ).each do |what|
+        %i(before after).each do |whn|
+          send("#{whn}_#{what}", "#{whn}_#{what}_stub".to_sym)
+          define_method("#{whn}_#{what}_stub") do
+            callback_registry.record_call(self.class, "#{whn}_#{what}".to_sym)
+          end
+        end
+      end
+    end
+  end
+
+  class CbParent
+    include Mongoid::Document
+
+    def initialize(callback_registry)
+      @callback_registry = callback_registry
+      super()
+    end
+
+    attr_reader :callback_registry
+
+    embeds_many :cb_children
+    embeds_many :cb_cascaded_children, cascade_callbacks: true
+
+    include CallbackTracking
+  end
+
+  class CbChild
+    include Mongoid::Document
+
+    embedded_in :cb_parent
+
+    def initialize(callback_registry, options)
+      @callback_registry = callback_registry
+      super(options)
+    end
+
+    attr_reader :callback_registry
+
+    include CallbackTracking
+  end
+
+  class CbCascadedChild
+    include Mongoid::Document
+
+    embedded_in :cb_parent
+
+    def initialize(callback_registry, options)
+      @callback_registry = callback_registry
+      super(options)
+    end
+
+    attr_reader :callback_registry
+
+    include CallbackTracking
+  end
+end