mongoid 7.2.6 → 7.3.3

data/spec/mongoid/persistable/savable_spec.rb

@@ -293,6 +293,8 @@ describe Mongoid::Persistable::Savable do
           expect(truck.crates[1].volume).to eq 0.8
           expect(truck.crates[1].toys.size).to eq 0
 
+          # TODO: MONGOID-5026: combine the updates so that there are
+          # no conflicts.
           #expect(truck.atomic_updates[:conflicts]).to eq nil
 
           expect { truck.save! }.not_to raise_error
@@ -360,8 +362,6 @@ describe Mongoid::Persistable::Savable do
 
         context 'when also updating first embedded top level association' do
           it 'performs all writes' do
-            pending 'https://jira.mongodb.org/browse/MONGOID-4982'
-
             truck.crates.first.volume = 2
             truck.crates.first.toys.build(name: 'Bear')
             truck.crates.build
@@ -397,8 +397,6 @@ describe Mongoid::Persistable::Savable do
 
         context 'when embedded association embeds another association' do
           it 'persists the new documents' do
-            pending 'https://jira.mongodb.org/browse/MONGOID-4982'
-
             expect(truck.seats.size).to eq 1
             expect(truck.seats[0].rating).to eq 1
 
@@ -409,7 +407,7 @@ describe Mongoid::Persistable::Savable do
 
             _truck = Truck.find(truck.id)
             expect(_truck.seats.size).to eq 2
-            expect(_truck.seats[0].rating).to eq 1
+            expect(_truck.seats[0].rating).to eq 2
             expect(_truck.seats[0].armrests.length).to eq 1
             expect(_truck.seats[1].rating).to eq 100
           end

data/spec/mongoid/persistable/upsertable_spec.rb

@@ -32,7 +32,7 @@ describe Mongoid::Persistable::Upsertable do
     context "when the document is new" do
 
       let!(:existing) do
-        Band.create(name: "Photek")
+        Band.create!(name: "Photek")
       end
 
       context "when a matching document exists in the db" do

data/spec/mongoid/query_cache_middleware_spec.rb

@@ -58,4 +58,12 @@ describe Mongoid::QueryCache::Middleware do
       end
     end
   end
+
+  context 'when driver implements query cache middleware' do
+    min_driver_version '2.15'
+
+    it 'uses the driver query cache middleware' do
+      Mongoid::QueryCache::Middleware.should be Mongo::QueryCache::Middleware
+    end
+  end
 end

data/spec/mongoid/reloadable_spec.rb

@@ -110,7 +110,7 @@ describe Mongoid::Reloadable do
 
     context "when document not saved" do
 
-      context "when raising not found error" do
+      context "when there is no document matching our id" do
 
         it "raises an error" do
           expect {
@@ -118,6 +118,23 @@ describe Mongoid::Reloadable do
           }.to raise_error(Mongoid::Errors::DocumentNotFound)
         end
       end
+
+      context 'when there is a document matching our id' do
+
+        let!(:previous) { Agent.create!(title: '007') }
+
+        let(:agent) { Agent.new(id: previous.id) }
+
+        it 'loads the existing document' do
+          agent.title.should be nil
+
+          lambda do
+            agent.reload
+          end.should_not raise_error
+
+          agent.title.should == '007'
+        end
+      end
     end
 
     context "when the document is embedded" do

data/spec/mongoid/shardable_spec.rb

@@ -128,6 +128,50 @@ describe Mongoid::Shardable do
       end
     end
 
+    context 'when record is persisted' do
+      let(:instance) { klass.create(name: value) }
+
+      it { is_expected.to eq({ 'name' => value }) }
+
+      context 'changing shard key value' do
+        let(:new_value) { 'a-new-value' }
+
+        before do
+          instance.name = new_value
+        end
+
+        it 'uses the newly set shard key value' do
+          subject.should == { 'name' => new_value }
+        end
+      end
+    end
+  end
+
+  describe '#shard_key_selector_in_db' do
+    subject { instance.shard_key_selector_in_db }
+    let(:klass) { Band }
+    let(:value) { 'a-brand-name' }
+
+    before { klass.shard_key(:name) }
+
+    context 'when record is new' do
+      let(:instance) { klass.new(name: value) }
+
+      it { is_expected.to eq({ 'name' => value }) }
+
+      context 'changing shard key value' do
+        let(:new_value) { 'a-new-value' }
+
+        before do
+          instance.name = new_value
+        end
+
+        it 'uses the existing shard key value' do
+          subject.should == { 'name' => new_value }
+        end
+      end
+    end
+
     context 'when record is persisted' do
       let(:instance) { klass.create(name: value) }
 

data/spec/mongoid/touchable_spec.rb

@@ -2,6 +2,7 @@
 # encoding: utf-8
 
 require "spec_helper"
+require_relative './touchable_spec_models'
 
 describe Mongoid::Touchable do
 
@@ -9,7 +10,7 @@ describe Mongoid::Touchable do
 
     context "when the document has no associations" do
       let(:updatable) do
-        Updatable.create
+        Updatable.create!
       end
 
       it "responds to #touch" do
@@ -28,30 +29,135 @@ describe Mongoid::Touchable do
       end
     end
 
-    context "when the document is embedded" do
+    context 'when the document has a parent association' do
 
-      before do
-        Label.send(:include, Mongoid::Touchable::InstanceMethods)
+      let(:building) do
+        parent_cls.create!
       end
 
-      let(:band) do
-        Band.create(name: "Placebo")
+      let(:entrance) do
+        building.entrances.create!
       end
 
-      let(:label) do
-        band.create_label(name: "Mute", updated_at: 10.days.ago)
+      let(:floor) do
+        building.floors.create!
       end
 
-      before do
-        label.touch
+      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
 
-      it "updates the updated_at timestamp" do
-        expect(label.updated_at).to be_within(1).of(Time.now)
+      after do
+        Timecop.return
       end
 
-      it "persists the changes" do
-        expect(label.reload.updated_at).to be_within(1).of(Time.now)
+      shared_examples 'updates the child' do
+        it "updates the updated_at timestamp" do
+          entrance
+          update_time
+          entrance.touch
+
+          entrance.updated_at.should == update_time
+        end
+
+        it "persists the changes" do
+          entrance
+          update_time
+          entrance.touch
+
+          entrance.reload.updated_at.should == update_time
+        end
+      end
+
+      shared_examples 'updates the parent when :touch is true' do
+
+        it 'updates updated_at on parent' do
+          floor
+          update_time
+          floor.touch
+
+          building.updated_at.should == update_time
+        end
+
+        it 'persists updated updated_at on parent' do
+          floor
+          update_time
+          floor.touch
+
+          building.reload.updated_at.should == update_time
+        end
+      end
+
+      shared_examples 'updates the parent when :touch is not set' do
+        it 'does not update updated_at on parent' do
+          entrance
+          update_time
+          entrance.touch
+
+          building.updated_at.should == update_time
+        end
+
+        it 'does not persist updated updated_at on parent' do
+          entrance
+          update_time
+          entrance.touch
+
+          building.reload.updated_at.should == update_time
+        end
+      end
+
+      shared_examples 'does not update the parent when :touch is not set' do
+        it 'does not update updated_at on parent' do
+          entrance
+          update_time
+          entrance.touch
+
+          building.updated_at.should == start_time
+        end
+
+        it 'does not persist updated updated_at on parent' do
+          entrance
+          update_time
+          entrance.touch
+
+          building.reload.updated_at.should == start_time
+        end
+      end
+
+      context "when the document is embedded" do
+        let(:parent_cls) { TouchableSpec::Embedded::Building }
+
+        include_examples 'updates the child'
+        include_examples 'updates the parent when :touch is true'
+        include_examples 'updates the parent when :touch is not set'
+
+        context 'when also updating an additional field' do
+          it 'persists the update to the additional field' do
+            entrance
+            update_time
+            entrance.touch(:last_used_at)
+
+            entrance.reload
+            building.reload
+
+            # This is the assertion we want.
+            entrance.last_used_at.should == update_time
+
+            # Check other timestamps for good measure.
+            entrance.updated_at.should == update_time
+            building.updated_at.should == update_time
+          end
+        end
+      end
+
+      context "when the document is referenced" do
+        let(:parent_cls) { TouchableSpec::Referenced::Building }
+
+        include_examples 'updates the child'
+        include_examples 'updates the parent when :touch is true'
+        include_examples 'does not update the parent when :touch is not set'
       end
     end
 
@@ -415,11 +521,11 @@ describe Mongoid::Touchable do
       context "when modifying the child" do
 
         let!(:agency) do
-          Agency.create
+          Agency.create!
         end
 
         let!(:agent) do
-          agency.agents.create(number: '1')
+          agency.agents.create!(number: '1')
         end
 
         it "updates the parent's updated at" do

data/spec/mongoid/touchable_spec_models.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+module TouchableSpec
+  module Embedded
+    class Building
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embeds_many :entrances
+      embeds_many :floors
+    end
+
+    class Entrance
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :building
+
+      field :last_used_at, type: Time
+    end
+
+    class Floor
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      embedded_in :building, touch: true
+    end
+  end
+
+  module Referenced
+    class Building
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      has_many :entrances, inverse_of: :building
+      has_many :floors, inverse_of: :building
+    end
+
+    class Entrance
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :building
+    end
+
+    class Floor
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      belongs_to :building, touch: true
+    end
+  end
+end

data/spec/mongoid/validatable_spec.rb

@@ -37,7 +37,7 @@ describe Mongoid::Validatable do
       end
 
       let(:documents) do
-        Mongoid::Association::Referenced::HasMany::Targets::Enumerable.new([ address ])
+        Mongoid::Association::Referenced::HasMany::Enumerable.new([ address ])
       end
 
       before do

data/spec/spec_helper.rb

@@ -29,13 +29,17 @@ def database_id_alt
   "mongoid_test_alt"
 end
 
+require 'mrss/cluster_config'
+require 'support/client_registry'
+require 'mrss/constraints'
+
+ClusterConfig = Mrss::ClusterConfig
+
 require 'support/authorization'
 require 'support/expectations'
 require 'support/helpers'
 require 'support/macros'
-require 'support/cluster_config'
 require 'support/constraints'
-require 'mrss/constraints'
 
 # Give MongoDB servers time to start up in CI environments
 if SpecConfig.instance.ci?

data/spec/support/client_registry.rb

@@ -0,0 +1,9 @@
+require 'singleton'
+
+class ClientRegistry
+  include Singleton
+
+  def global_client(name)
+    Mongoid.default_client
+  end
+end

data/spec/support/models/bolt.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Bolt
+  include Mongoid::Document
+
+  belongs_to :hole
+end

data/spec/support/models/hole.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Hole
+  include Mongoid::Document
+
+  has_one :bolt, dependent: :destroy
+  has_one :threadlocker, dependent: :delete_all
+  has_one :sealer, dependent: :restrict_with_exception
+  has_many :nuts, dependent: :destroy
+  has_many :washers, dependent: :delete_all
+  has_many :spacers, dependent: :restrict_with_exception
+end

data/spec/support/models/mop.rb

@@ -23,4 +23,3 @@ class Mop
   field :regexp_field, type: Regexp
   field :bson_regexp_field, type: BSON::Regexp::Raw
 end
-