mongoid 7.4.0 → 8.0.3

data/spec/mongoid/timestamps_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require_relative './timestamps_spec_models'
 
 describe Mongoid::Timestamps do
 
@@ -14,6 +15,15 @@ describe Mongoid::Timestamps do
       Dokument.fields
     end
 
+    let(:time_zone) { "Pacific Time (US & Canada)" }
+
+    around do |ex|
+      z = Time.zone
+      Time.zone = time_zone
+      ex.run
+      Time.zone = z
+    end
+
     before do
       document.run_callbacks(:create)
       document.run_callbacks(:save)
@@ -35,6 +45,14 @@ describe Mongoid::Timestamps do
       expect(document.updated_at).to be_within(10).of(Time.now.utc)
     end
 
+    it "sets the created_at to the correct time zone" do
+      expect(document.created_at.time_zone.name).to eq(time_zone)
+    end
+
+    it "sets the updated_at to the correct time zone" do
+      expect(document.updated_at.time_zone.name).to eq(time_zone)
+    end
+
     it "ensures created_at equals updated_at on new records" do
       expect(document.updated_at).to eq(document.created_at)
     end
@@ -107,4 +125,376 @@ describe Mongoid::Timestamps do
       expect(document.updated_at).to be_within(1).of(Time.now)
     end
   end
+
+  # This section of tests describes the behavior of the updated_at field for
+  # different updates on associations, as outlined in PR #5219.
+  describe "updated_at attribute" 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 touch: true" do
+      let(:user) { TimestampsSpec::Touch::User.create! }
+      let(:address) { TimestampsSpec::Touch::Address.create! }
+      let(:account) { TimestampsSpec::Touch::Account.create! }
+      let(:pet) { TimestampsSpec::Touch::Pet.create! }
+
+      before do
+        [user, address, account, pet]
+        update_time
+      end
+
+      context "when HABTM association" do
+
+        context "when updating the association itself" do
+          before do
+            user.update(addresses: [address])
+          end
+
+          it "updates the timestamps correctly" do
+            pending "MONGOID-4953"
+            user.updated_at.should == update_time
+            address.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            pending "MONGOID-4953"
+            user.reload.updated_at.should == update_time
+            address.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            user.update(address_ids: [address.id])
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == update_time
+            address.updated_at.should == start_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            address.reload.updated_at.should == start_time
+          end
+        end
+      end
+
+      context "when has_many association" do
+
+        context "when updating the association itself" do
+          before do
+            user.update(accounts: [account])
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == update_time
+            account.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            user.update(account_ids: [account.id])
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == update_time
+            account.updated_at.should == start_time
+          end
+
+          # The Account object's updated_at is updated in the database but not
+          # locally, since, in this case, the Account object is not passed into
+          # the update function, so the Account object updated locally is not
+          # the same as the one that we have locally here.
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+      end
+
+      context "when belongs_to association; on has_many" do
+
+        context "when updating the association itself" do
+          before do
+            account.update(user: user)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == update_time
+            account.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            account.update(user_id: user.id)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            account.updated_at.should == update_time
+          end
+
+          # The User object's updated_at is updated in the database but not
+          # locally, since, in this case, the User object is not passed into
+          # the update function, so the User object updated locally is not
+          # the same as the one that we have locally here.
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+      end
+
+      context "when has_one association" do
+
+        context "when updating the association itself" do
+          before do
+            user.update(pet: pet)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == update_time
+            pet.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            pet.reload.updated_at.should == update_time
+          end
+        end
+      end
+
+      context "when belongs_to association; on has_one" do
+
+        context "when updating the association itself" do
+          before do
+            pet.update(user: user)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == update_time
+            pet.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            pet.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            pet.update(user_id: pet.id)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            pet.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            pet.reload.updated_at.should == update_time
+          end
+        end
+      end
+    end
+
+    context "when touch: false" do
+      let(:user) { TimestampsSpec::NoTouch::User.create! }
+      let(:address) { TimestampsSpec::NoTouch::Address.create! }
+      let(:account) { TimestampsSpec::NoTouch::Account.create! }
+      let(:pet) { TimestampsSpec::NoTouch::Pet.create! }
+
+      before do
+        [user, address, account, pet]
+        update_time
+      end
+
+      context "when HABTM association" do
+
+        context "when updating the association itself" do
+          before do
+            user.update(addresses: [address])
+          end
+
+          it "updates the timestamps correctly" do
+            pending "MONGOID-4953"
+            user.updated_at.should == update_time
+            address.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            pending "MONGOID-4953"
+            user.reload.updated_at.should == update_time
+            address.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            user.update(address_ids: [address.id])
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == update_time
+            address.updated_at.should == start_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == update_time
+            address.reload.updated_at.should == start_time
+          end
+        end
+      end
+
+      context "when has_many association" do
+
+        context "when updating the association itself" do
+          before do
+            user.update(accounts: [account])
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            account.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            user.update(account_ids: [account.id])
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            account.updated_at.should == start_time
+          end
+
+          # The Account object's updated_at is updated in the database but not
+          # locally, since, in this case, the Account object is not passed into
+          # the update function, so the Account object updated locally is not
+          # the same as the one that we have locally here.
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+      end
+
+      context "when belongs_to association; on has_many" do
+
+        context "when updating the association itself" do
+          before do
+            account.update(user: user)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            account.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            account.update(user_id: user.id)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            account.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            account.reload.updated_at.should == update_time
+          end
+        end
+      end
+
+      context "when has_one association" do
+
+        context "when updating the association itself" do
+          before do
+            user.update(pet: pet)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            pet.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            pet.reload.updated_at.should == update_time
+          end
+        end
+      end
+
+      context "when belongs_to association; on has_one" do
+
+        context "when updating the association itself" do
+          before do
+            pet.update(user: user)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            pet.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            pet.reload.updated_at.should == update_time
+          end
+        end
+
+        context "when updating the association's foreign key" do
+          before do
+            pet.update(user_id: pet.id)
+          end
+
+          it "updates the timestamps correctly" do
+            user.updated_at.should == start_time
+            pet.updated_at.should == update_time
+          end
+
+          it "updates the timestamps in the db correctly" do
+            user.reload.updated_at.should == start_time
+            pet.reload.updated_at.should == update_time
+          end
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/timestamps_spec_models.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module TimestampsSpec
+  module Touch
+    class User
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      has_and_belongs_to_many :addresses, class_name: "TimestampsSpec::Touch::Address"
+      has_many :accounts, class_name: "TimestampsSpec::Touch::Account"
+      has_one :pet, class_name: "TimestampsSpec::Touch::Pet"
+    end
+
+    class Address
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      has_and_belongs_to_many :users, class_name: "TimestampsSpec::Touch::User"
+    end
+
+    class Account
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :user, required: false, touch: true, class_name: "TimestampsSpec::Touch::User"
+    end
+
+    class Pet
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :user, required: false, touch: true, class_name: "TimestampsSpec::Touch::User"
+    end
+  end
+
+  module NoTouch
+    class User
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      has_and_belongs_to_many :addresses, class_name: "TimestampsSpec::NoTouch::Address"
+      has_many :accounts, class_name: "TimestampsSpec::NoTouch::Account"
+      has_one :pet, class_name: "TimestampsSpec::NoTouch::Pet"
+    end
+
+    class Address
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      has_and_belongs_to_many :users, class_name: "TimestampsSpec::NoTouch::User"
+    end
+
+    class Account
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :user, required: false, touch: false, class_name: "TimestampsSpec::NoTouch::User"
+    end
+
+    class Pet
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :user, required: false, touch: false, class_name: "TimestampsSpec::NoTouch::User"
+    end
+  end
+end

data/spec/mongoid/touchable_spec.rb

@@ -584,5 +584,121 @@ describe Mongoid::Touchable do
         end
       end
     end
+
+    context "when the touch option is true" do
+
+      shared_examples "updates the 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 parent's timestamp" do
+          building.updated_at.should == update_time
+          building.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"
+        end
+
+        context "with #{meth} on embedded associations" do
+          let(:parent_cls) { TouchableSpec::Embedded::Building }
+          let(:meth) { meth }
+
+          include_examples "updates the updated_at"
+        end
+      end
+    end
+
+    context "when the touch option is false" do
+
+      shared_examples "does not update the parent" 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(:entrance) do
+          building.entrances.create!
+        end
+
+        before do
+          entrance
+          update_time
+          entrance.touch
+        end
+
+        it "updates the child's timestamp" do
+          entrance.updated_at.should == update_time
+          entrance.reload.updated_at.should == update_time
+        end
+
+        it "does not update the parent's timestamp" do
+          building.updated_at.should == start_time
+          building.reload.updated_at.should == start_time
+        end
+      end
+
+      [ :save!, :destroy, :touch].each do |meth|
+        context "with #{meth} on belongs_to" do
+          let(:meth) { meth }
+          let(:parent_cls) { TouchableSpec::Referenced::Building }
+
+          include_examples "does not update the parent"
+        end
+
+        context "with #{meth} on embedded_in" do
+          let(:meth) { meth }
+          let(:parent_cls) { TouchableSpec::Embedded::Building }
+
+          before do
+            skip "MONGOID-5274"
+          end
+
+          include_examples "does not update the parent"
+        end
+      end
+    end
   end
 end

data/spec/mongoid/touchable_spec_models.rb

@@ -6,15 +6,15 @@ module TouchableSpec
       include Mongoid::Document
       include Mongoid::Timestamps
 
-      embeds_many :entrances
-      embeds_many :floors
+      embeds_many :entrances, class_name: "TouchableSpec::Embedded::Entrance"
+      embeds_many :floors, class_name: "TouchableSpec::Embedded::Floor"
     end
 
     class Entrance
       include Mongoid::Document
       include Mongoid::Timestamps
 
-      embedded_in :building
+      embedded_in :building, class_name: "TouchableSpec::Embedded::Building"
 
       field :last_used_at, type: Time
     end
@@ -23,7 +23,9 @@ module TouchableSpec
       include Mongoid::Document
       include Mongoid::Timestamps
 
-      embedded_in :building, touch: true
+      field :level, type: Integer
+
+      embedded_in :building, touch: true, class_name: "TouchableSpec::Embedded::Building"
     end
   end
 
@@ -32,22 +34,24 @@ module TouchableSpec
       include Mongoid::Document
       include Mongoid::Timestamps
 
-      has_many :entrances, inverse_of: :building
-      has_many :floors, inverse_of: :building
+      has_many :entrances, inverse_of: :building, class_name: "TouchableSpec::Referenced::Entrance"
+      has_many :floors, inverse_of: :building, class_name: "TouchableSpec::Referenced::Floor"
     end
 
     class Entrance
       include Mongoid::Document
       include Mongoid::Timestamps
 
-      belongs_to :building
+      belongs_to :building, touch: false, class_name: "TouchableSpec::Referenced::Building"
     end
 
     class Floor
       include Mongoid::Document
       include Mongoid::Timestamps
 
-      belongs_to :building, touch: true
+      field :level, type: Integer
+
+      belongs_to :building, touch: true, class_name: "TouchableSpec::Referenced::Building"
     end
   end
 end

data/spec/mongoid/traversable_spec.rb

@@ -336,13 +336,7 @@ describe Mongoid::Traversable do
     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
+      config_override :discriminator_key, 'hello'
 
       it "sets the correct value globally" do
         expect(Mongoid.discriminator_key).to eq("hello")
@@ -904,10 +898,9 @@ describe Mongoid::Traversable do
     end
 
     context "when the global discriminator key conflicts with mongoid's internals" do
-
-      after do
-        Mongoid.discriminator_key = "_type"
-      end
+      # This is not an override, it is meant to restore the original value
+      # after the test only.
+      config_override :discriminator_key, '_type'
 
       [:_association, :invalid].each do |meth|
         context "when the field is named #{meth}" do

data/spec/mongoid/validatable/presence_spec.rb

@@ -287,7 +287,7 @@ describe Mongoid::Validatable::PresenceValidator do
             it "does not save the association target" do
               child.persisted?.should be false
 
-              expect { child.reload }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              expect { child.reload }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class HomAccreditation with id\(s\)/)
             end
           end
         end