mongoid 3.1.5 → 8.0.2

data/spec/mongoid/timestamps/updated/short_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Updated::Short do
@@ -18,23 +20,23 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "does not add c_at to the document" do
-      fields["c_at"].should be_nil
+      expect(fields["c_at"]).to be_nil
     end
 
     it "adds u_at to the document" do
-      fields["u_at"].should_not be_nil
+      expect(fields["u_at"]).to_not be_nil
     end
 
     it "does not add the long updated_at" do
-      fields["updated_at"].should be_nil
+      expect(fields["updated_at"]).to be_nil
     end
 
     it "forces the updated_at timestamps to UTC" do
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
 
     it "aliases the raw field" do
-      agent.u_at.should eq(agent.updated_at)
+      expect(agent.u_at).to eq(agent.updated_at)
     end
   end
 
@@ -47,15 +49,15 @@ describe Mongoid::Timestamps::Updated::Short do
       end
 
       let(:doc) do
-        ShortAgent.create(updated_at: time)
+        ShortAgent.create!(updated_at: time)
       end
 
       it "does not override it with the default" do
-        doc.updated_at.should eq(time)
+        expect(doc.updated_at).to eq(time)
       end
 
       it "does not persist an auto value" do
-        doc.reload.updated_at.should eq(time)
+        expect(doc.reload.updated_at).to eq(time)
       end
     end
   end
@@ -63,7 +65,7 @@ describe Mongoid::Timestamps::Updated::Short do
   context "when the document has not changed" do
 
     let(:agent) do
-      ShortAgent.instantiate("_id" => Moped::BSON::ObjectId.new, "account_ids" => [])
+      ShortAgent.instantiate("_id" => BSON::ObjectId.new, "account_ids" => [])
     end
 
     before do
@@ -71,20 +73,20 @@ describe Mongoid::Timestamps::Updated::Short do
     end
 
     it "does not run the update callbacks" do
-      agent.should_receive(:updated_at=).never
-      agent.save
+      expect(agent).to receive(:updated_at=).never
+      agent.save!
     end
   end
 
   context "when the document is created" do
 
     let(:agent) do
-      ShortAgent.create
+      ShortAgent.create!
     end
 
     it "runs the update callbacks" do
-      agent.updated_at.should_not be_nil
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to_not be_nil
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
   end
 end

data/spec/mongoid/timestamps/updated_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 describe Mongoid::Timestamps::Updated do
@@ -18,19 +20,15 @@ describe Mongoid::Timestamps::Updated do
     end
 
     it "does not add created_at to the document" do
-      fields["created_at"].should be_nil
+      expect(fields["created_at"]).to be_nil
     end
 
     it "adds updated_at to the document" do
-      fields["updated_at"].should_not be_nil
+      expect(fields["updated_at"]).to_not be_nil
     end
 
     it "forces the updated_at timestamps to UTC" do
-      agent.updated_at.should be_within(10).of(Time.now.utc)
-    end
-
-    it "includes a record_timestamps class_accessor to ease AR compatibility" do
-      Agent.should.respond_to? :record_timestamps
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
   end
 
@@ -43,15 +41,15 @@ describe Mongoid::Timestamps::Updated do
       end
 
       let(:doc) do
-        Dokument.create(updated_at: time)
+        Dokument.create!(updated_at: time)
       end
 
       it "does not override it with the default" do
-        doc.updated_at.should eq(time)
+        expect(doc.updated_at).to eq(time)
       end
 
       it "does not persist an auto value" do
-        doc.reload.updated_at.should eq(time)
+        expect(doc.reload.updated_at).to eq(time)
       end
     end
   end
@@ -59,7 +57,7 @@ describe Mongoid::Timestamps::Updated do
   context "when the document has not changed" do
 
     let(:agent) do
-      Agent.instantiate("_id" => Moped::BSON::ObjectId.new, "account_ids" => [])
+      Agent.instantiate("_id" => BSON::ObjectId.new, "account_ids" => [])
     end
 
     before do
@@ -67,20 +65,20 @@ describe Mongoid::Timestamps::Updated do
     end
 
     it "does not run the update callbacks" do
-      agent.should_receive(:updated_at=).never
-      agent.save
+      expect(agent).to receive(:updated_at=).never
+      agent.save!
     end
   end
 
   context "when the document is created" do
 
     let(:agent) do
-      Agent.create
+      Agent.create!
     end
 
     it "runs the update callbacks" do
-      agent.updated_at.should_not be_nil
-      agent.updated_at.should be_within(10).of(Time.now.utc)
+      expect(agent.updated_at).to_not be_nil
+      expect(agent.updated_at).to be_within(10).of(Time.now.utc)
     end
   end
 end

data/spec/mongoid/timestamps_spec.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require "spec_helper"
+require_relative './timestamps_spec_models'
 
 describe Mongoid::Timestamps do
 
@@ -12,33 +15,46 @@ 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)
     end
 
     it "adds created_at to the document" do
-      fields["created_at"].should_not be_nil
+      expect(fields["created_at"]).to_not be_nil
     end
 
     it "adds updated_at to the document" do
-      fields["updated_at"].should_not be_nil
+      expect(fields["updated_at"]).to_not be_nil
     end
 
     it "forces the created_at timestamps to UTC" do
-      document.created_at.should be_within(10).of(Time.now.utc)
+      expect(document.created_at).to be_within(10).of(Time.now.utc)
     end
 
     it "forces the updated_at timestamps to UTC" do
-      document.updated_at.should be_within(10).of(Time.now.utc)
+      expect(document.updated_at).to be_within(10).of(Time.now.utc)
     end
 
-    it "ensures created_at equals updated_at on new records" do
-      document.updated_at.should eq(document.created_at)
+    it "sets the created_at to the correct time zone" do
+      expect(document.created_at.time_zone.name).to eq(time_zone)
     end
 
-    it "includes a record_timestamps class_accessor to ease AR compatibility" do
-      Dokument.should.respond_to? :record_timestamps
+    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
   end
 
@@ -53,8 +69,8 @@ describe Mongoid::Timestamps do
     end
 
     it "does not run the update callbacks" do
-      document.should_receive(:updated_at=).never
-      document.save
+      expect(document).to receive(:updated_at=).never
+      document.save!
     end
   end
 
@@ -70,30 +86,30 @@ describe Mongoid::Timestamps do
     end
 
     it "does not set updated at" do
-      document.should_receive(:updated_at=).never
-      document.save
+      expect(document).to receive(:updated_at=).never
+      document.save!
     end
   end
 
   context "when the document is created" do
 
     let!(:document) do
-      Dokument.create
+      Dokument.create!
     end
 
     it "runs the update callbacks" do
-      document.updated_at.should eq(document.created_at)
+      expect(document.updated_at).to eq(document.created_at)
     end
   end
 
   context "when only embedded documents have changed" do
 
     let!(:document) do
-      Dokument.create(updated_at: 2.days.ago)
+      Dokument.create!(updated_at: 2.days.ago)
     end
 
     let!(:address) do
-      document.addresses.create(street: "Karl Marx Strasse")
+      document.addresses.create!(street: "Karl Marx Strasse")
     end
 
     let!(:updated_at) do
@@ -102,11 +118,383 @@ describe Mongoid::Timestamps do
 
     before do
       address.number = 1
-      document.save
+      document.save!
     end
 
     it "updates the root document updated at" do
-      document.updated_at.should be_within(1).of(Time.now)
+      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