mongoid 8.0.3 → 8.1.0

data/spec/mongoid/tasks/database_spec.rb

@@ -4,6 +4,59 @@ require "spec_helper"
 
 describe "Mongoid::Tasks::Database" do
 
+  before(:all) do
+    module DatabaseSpec
+      class Measurement
+        include Mongoid::Document
+
+        field :timestamp, type: Time
+        field :temperature, type: Integer
+
+        embeds_many :comments
+
+        store_in collection: "measurement",
+          collection_options: {
+            capped: true, size: 10000
+          }
+      end
+
+      class Comment
+        include Mongoid::Document
+
+        field :content, type: String
+
+        embedded_in :measurement
+
+        store_in collection_options: {
+            capped: true, size: 10000
+          }
+      end
+
+      class Note
+        include Mongoid::Document
+
+        field :text
+
+        recursively_embeds_one
+
+        store_in collection_options: {
+          capped: true, size: 10000
+        }
+      end
+    end
+  end
+
+  after(:all) do
+    Mongoid.deregister_model(DatabaseSpec::Measurement)
+    DatabaseSpec.send(:remove_const, :Measurement)
+    Mongoid.deregister_model(DatabaseSpec::Comment)
+    DatabaseSpec.send(:remove_const, :Comment)
+    Mongoid.deregister_model(DatabaseSpec::Note)
+    DatabaseSpec.send(:remove_const, :Note)
+    Object.send(:remove_const, :DatabaseSpec)
+  end
+
+
   let(:logger) do
     double("logger").tap do |log|
       allow(log).to receive(:info)
@@ -18,6 +71,80 @@ describe "Mongoid::Tasks::Database" do
     [ User, Account, Address, Draft ]
   end
 
+  describe '.create_collections' do
+    context 'collection_options are specified' do
+      let(:models) do
+        [DatabaseSpec::Measurement]
+      end
+
+      after do
+        DatabaseSpec::Measurement.collection.drop
+      end
+
+      [true, false].each do |force|
+        context "when force is #{force}" do
+          it 'creates the collection' do
+            expect(DatabaseSpec::Measurement).to receive(:create_collection).once.with(force: force)
+            Mongoid::Tasks::Database.create_collections(models, force: force)
+          end
+        end
+      end
+    end
+
+    context 'collection_options are not specified' do
+      let(:models) do
+        [Person]
+      end
+
+      [true, false].each do |force|
+        context "when force is #{force}" do
+          it 'creates the collection' do
+            expect(Person).to receive(:create_collection).once.with(force: force)
+            Mongoid::Tasks::Database.create_collections(models, force: force)
+          end
+        end
+      end
+
+      context "when collection options is defined on embedded model" do
+
+        let(:models) do
+          [DatabaseSpec::Comment]
+        end
+
+        let(:logger) do
+          double("logger").tap do |log|
+            expect(log).to receive(:info).once.with(/MONGOID: collection options ignored on: .*, please define in the root model/)
+          end
+        end
+
+        before do
+          allow(Mongoid::Tasks::Database).to receive(:logger).and_return(logger)
+        end
+
+        it "does nothing, but logging" do
+          expect(DatabaseSpec::Comment).to receive(:create_collection).never
+          Mongoid::Tasks::Database.create_collections(models)
+        end
+      end
+
+      context "when collection options is defined on cyclic model" do
+
+        let(:models) do
+          [DatabaseSpec::Note]
+        end
+
+        after do
+          DatabaseSpec::Note.collection.drop
+        end
+
+        it "creates the collection" do
+          expect(DatabaseSpec::Note).to receive(:create_collection).once
+          Mongoid::Tasks::Database.create_collections(models)
+        end
+      end
+    end
+  end
+
   describe ".create_indexes" do
 
     let!(:klass) do

data/spec/mongoid/timestamps_spec.rb

@@ -17,12 +17,7 @@ describe Mongoid::Timestamps do
 
     let(:time_zone) { "Pacific Time (US & Canada)" }
 
-    around do |ex|
-      z = Time.zone
-      Time.zone = time_zone
-      ex.run
-      Time.zone = z
-    end
+    time_zone_override "Pacific Time (US & Canada)"
 
     before do
       document.run_callbacks(:create)
@@ -77,17 +72,20 @@ describe Mongoid::Timestamps do
   context "when the document has changed with updated_at specified" do
 
     let(:document) do
-      Dokument.new(created_at: Time.now.utc)
+      Dokument.create(created_at: Time.now.utc)
+    end
+
+    let(:expected_updated_at) do
+      DateTime.parse("2001-06-12")
     end
 
     before do
-      document.new_record = false
-      document.updated_at = DateTime.parse("2001-06-12")
+      document.updated_at = expected_updated_at
     end
 
     it "does not set updated at" do
-      expect(document).to receive(:updated_at=).never
       document.save!
+      expect(document.reload.updated_at).to be == expected_updated_at
     end
   end
 
@@ -127,7 +125,7 @@ describe Mongoid::Timestamps do
   end
 
   # This section of tests describes the behavior of the updated_at field for
-  # different updates on associations, as outlined in PR #5219.
+  # different updates on referenced associations, as outlined in PR #5219.
   describe "updated_at attribute" do
     let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
 

data/spec/mongoid/touchable_spec.rb

@@ -89,7 +89,7 @@ describe Mongoid::Touchable do
         end
       end
 
-      shared_examples 'updates the parent when :touch is not set' do
+      shared_examples 'updates the parent when :touch is false' do
         it 'does not update updated_at on parent' do
           entrance
           update_time
@@ -130,7 +130,7 @@ describe Mongoid::Touchable do
 
         include_examples 'updates the child'
         include_examples 'updates the parent when :touch is true'
-        include_examples 'updates the parent when :touch is not set'
+        include_examples 'updates the parent when :touch is false'
 
         context 'when also updating an additional field' do
           it 'persists the update to the additional field' do
@@ -587,7 +587,7 @@ describe Mongoid::Touchable do
 
     context "when the touch option is true" do
 
-      shared_examples "updates the updated_at" do
+      shared_examples "updates the parent's updated_at" do
 
         let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
 
@@ -624,19 +624,58 @@ describe Mongoid::Touchable do
         end
       end
 
+      shared_examples "updates the child's updated_at" do
+
+        let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
+
+        let(:update_time) do
+          Timecop.freeze(Time.at(Time.now.to_i) + 2)
+        end
+
+        after do
+          Timecop.return
+        end
+
+        let(:building) do
+          parent_cls.create!
+        end
+
+        let(:floor) do
+          building.floors.create!
+        end
+
+        before do
+          floor
+          update_time
+          floor.level = 9
+          floor.send(meth)
+        end
+
+        it "the parent is not nil" do
+          expect(floor.building).to_not be nil
+        end
+
+        it "updates the child's timestamp" do
+          floor.updated_at.should == update_time
+          floor.reload.updated_at.should == update_time
+        end
+      end
+
       [ :save!, :destroy, :touch].each do |meth|
         context "with #{meth} on referenced associations" do
           let(:parent_cls) { TouchableSpec::Referenced::Building }
           let(:meth) { meth }
 
-          include_examples "updates the updated_at"
+          include_examples "updates the child's updated_at" unless meth == :destroy
+          include_examples "updates the parent's updated_at"
         end
 
         context "with #{meth} on embedded associations" do
           let(:parent_cls) { TouchableSpec::Embedded::Building }
           let(:meth) { meth }
 
-          include_examples "updates the updated_at"
+          include_examples "updates the child's updated_at" unless meth == :destroy
+          include_examples "updates the parent's updated_at"
         end
       end
     end
@@ -701,4 +740,237 @@ describe Mongoid::Touchable do
       end
     end
   end
+
+  describe "when saving a document" do
+
+    let!(:start_time) { Timecop.freeze(Time.at(Time.now.to_i)) }
+
+    let(:update_time) do
+      Timecop.freeze(Time.at(Time.now.to_i) + 2)
+    end
+
+    after do
+      Timecop.return
+    end
+
+    context "when only using the root document" do
+
+      shared_examples "timeless is cleared" do
+        it "clears the timeless option" do
+          expect(doc.timeless?).to be false
+        end
+      end
+
+      shared_examples "touches the document" do
+        it "touches the document" do
+          expect(doc.created_at).to eq(start_time)
+          expect(doc.updated_at).to eq(start_time)
+        end
+      end
+
+      shared_examples "updates the document" do
+        it "updates the document" do
+          expect(doc.created_at).to eq(start_time)
+          expect(doc.updated_at).to eq(update_time)
+        end
+      end
+
+      let(:doc) { Dokument.new }
+
+      context "when saving a new document" do
+
+        context "when not passing a touch option" do
+
+          before do
+            doc.save!
+          end
+
+          include_examples "touches the document"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: true" do
+
+          before do
+            doc.save!(touch: true)
+          end
+
+          include_examples "touches the document"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: false" do
+
+          before do
+            doc.save!(touch: false)
+          end
+
+          include_examples "touches the document"
+          include_examples "timeless is cleared"
+        end
+      end
+
+      context "when updating a document" do
+        before do
+          doc.save!
+          doc.title = "title"
+          update_time
+        end
+
+        context "when not passing a touch option" do
+
+          before do
+            doc.save!
+          end
+
+          include_examples "updates the document"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: true" do
+
+          before do
+            doc.save!(touch: true)
+          end
+
+          include_examples "updates the document"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: false" do
+
+          before do
+            doc.save!(touch: false)
+          end
+
+          include_examples "touches the document"
+          include_examples "timeless is cleared"
+        end
+      end
+    end
+
+    context "when saving embedded associations with cascadable callbacks" do
+
+      shared_examples "timeless is cleared" do
+        it "clears the timeless option" do
+          expect(book.timeless?).to be false
+          expect(book.covers.first.timeless?).to be false
+        end
+      end
+
+      shared_examples "touches the document" do
+        it "touches the document" do
+          expect(book.created_at).to eq(start_time)
+          expect(book.updated_at).to eq(start_time)
+        end
+      end
+
+      shared_examples "updates the document" do
+        it "updates the document" do
+          expect(book.created_at).to eq(start_time)
+          expect(book.updated_at).to eq(update_time)
+        end
+      end
+
+      shared_examples "touches the children" do
+        it "touches the children" do
+          expect(book.covers.first.created_at).to eq(start_time)
+          expect(book.covers.first.updated_at).to eq(start_time)
+        end
+      end
+
+      shared_examples "updates the children" do
+        it "updates the children" do
+          expect(book.covers.first.created_at).to eq(start_time)
+          expect(book.covers.first.updated_at).to eq(update_time)
+        end
+      end
+
+      let(:book) do
+        Book.new(covers: [ cover ])
+      end
+
+      let(:cover) do
+        Cover.new
+      end
+
+      context "when saving a new document" do
+
+        context "when not passing a touch option" do
+
+          before do
+            book.save!
+          end
+
+          include_examples "touches the document"
+          include_examples "touches the children"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: true" do
+
+          before do
+            book.save!(touch: true)
+          end
+
+          include_examples "touches the document"
+          include_examples "touches the children"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: false" do
+
+          before do
+            book.save!(touch: false)
+          end
+
+          include_examples "touches the document"
+          include_examples "touches the children"
+          include_examples "timeless is cleared"
+        end
+      end
+
+      context "when updating a document" do
+        before do
+          book.save!
+          book.title = "title"
+          book.covers.first.title = "title"
+          update_time
+        end
+
+        context "when not passing a touch option" do
+
+          before do
+            book.save!
+          end
+
+          include_examples "updates the document"
+          include_examples "updates the children"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: true" do
+
+          before do
+            book.save!(touch: true)
+          end
+
+          include_examples "updates the document"
+          include_examples "updates the children"
+          include_examples "timeless is cleared"
+        end
+
+        context "when passing touch: false" do
+
+          before do
+            book.save!(touch: false)
+          end
+
+          include_examples "touches the document"
+          include_examples "touches the children"
+          include_examples "timeless is cleared"
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/touchable_spec_models.rb

@@ -6,6 +6,8 @@ module TouchableSpec
       include Mongoid::Document
       include Mongoid::Timestamps
 
+      field :title, type: String
+
       embeds_many :entrances, class_name: "TouchableSpec::Embedded::Entrance"
       embeds_many :floors, class_name: "TouchableSpec::Embedded::Floor"
     end
@@ -14,7 +16,7 @@ module TouchableSpec
       include Mongoid::Document
       include Mongoid::Timestamps
 
-      embedded_in :building, class_name: "TouchableSpec::Embedded::Building"
+      embedded_in :building, touch: false, class_name: "TouchableSpec::Embedded::Building"
 
       field :last_used_at, type: Time
     end

data/spec/mongoid/traversable_spec.rb

@@ -531,9 +531,9 @@ describe Mongoid::Traversable do
         end
 
         context "before class creation" do
-          before do
-            Mongoid.discriminator_key = "test"
+          config_override :discriminator_key, "test"
 
+          before do
             class PreGlobalDiscriminatorParent
               include Mongoid::Document
             end
@@ -542,10 +542,6 @@ describe Mongoid::Traversable do
             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
@@ -677,9 +673,9 @@ describe Mongoid::Traversable do
         end
 
         context "before class creation" do
-          before do
-            Mongoid.discriminator_key = :test
+          config_override :discriminator_key, :test
 
+          before do
             class PreGlobalSymDiscriminatorParent
               include Mongoid::Document
             end
@@ -688,10 +684,6 @@ describe Mongoid::Traversable do
             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
@@ -829,8 +821,9 @@ describe Mongoid::Traversable do
     end
 
     context "when setting a field equal to discriminator key and duplicate_fields_exception is true" do
+      config_override :duplicate_fields_exception, true
+
       before do
-        Mongoid.duplicate_fields_exception = true
 
         class DuplicateDiscriminatorKeyParent
           include Mongoid::Document
@@ -841,10 +834,6 @@ describe Mongoid::Traversable do
         end
       end
 
-      after do
-        Mongoid.duplicate_fields_exception = false
-      end
-
       it "does not raise an error" do
         expect do
           DuplicateDiscriminatorKeyParent.discriminator_key = "dkey"
@@ -871,9 +860,10 @@ describe Mongoid::Traversable do
     end
 
     context "when setting a field equal to global discriminator key and duplicate_fields_exception is true" do
+      config_override :duplicate_fields_exception, true
+      config_override :discriminator_key, "dkey"
+
       before do
-        Mongoid.duplicate_fields_exception = true
-        Mongoid.discriminator_key = "dkey"
 
         class GlobalDuplicateDiscriminatorKeyParent
           include Mongoid::Document
@@ -883,11 +873,6 @@ describe Mongoid::Traversable do
         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

data/spec/mongoid/validatable/uniqueness_spec.rb

@@ -2476,11 +2476,10 @@ describe Mongoid::Validatable::UniquenessValidator do
   describe "i18n" do
 
     context 'when using a different locale' do
-      around do |example|
-        I18n.with_locale(:fr) { example.run }
-      end
+      with_default_i18n_configs
 
       before do
+        I18n.locale = :fr
         # Translation key location is as per rails-i18n gem.
         # See: https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/en.yml
         I18n.backend.store_translations(:fr, { errors: { messages: { taken: 'est déjà utilisé(e)' } } })

data/spec/mongoid_spec.rb

@@ -13,22 +13,46 @@ describe Mongoid do
       end
     end
 
-    context "when a block is supplied" do
+    context "when a block is given" do
+      config_override :preload_models, false
 
-      before do
-        Mongoid.configure do |config|
-          config.preload_models = true
+      context "with arity 0" do
+
+        before do
+          Mongoid.configure do
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
         end
       end
 
-      after do
-        Mongoid.configure do |config|
-          config.preload_models = false
+      context "with arity 1" do
+
+        before do
+          Mongoid.configure do |config|
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
         end
       end
 
-      it "sets the values on the config instance" do
-        expect(Mongoid.preload_models).to be true
+      context "with arity 2" do
+
+        before do
+          Mongoid.configure do |config, _other|
+            config.preload_models = true
+          end
+        end
+
+        it "sets the values on the config instance" do
+          expect(Mongoid.preload_models).to be true
+        end
       end
     end
   end
@@ -51,6 +75,8 @@ describe Mongoid do
     end
 
     it "disconnects from all active clients" do
+      pending 'https://jira.mongodb.org/browse/MONGOID-5621'
+
       clients.each do |client|
         expect(client.cluster).to receive(:disconnect!).and_call_original
       end