mongoid 8.0.13 → 8.1.0

data/spec/integration/callbacks_spec.rb

@@ -448,23 +448,110 @@ describe 'callbacks integration tests' do
     end
   end
 
-  context 'cascade callbacks' do
-    ruby_version_gte '3.0'
-    config_override :around_callbacks_for_embeds, false
+  context 'saved_change_to_attribute, attribute_before_last_save, will_save_change_to_attribute' do
+    class TestSCTAAndABLSInCallbacks
+      include Mongoid::Document
 
-    let(:book) do
-      Book.new
-    end
+      field :name, type: String
+      field :age, type: Integer
 
-    before do
-      1500.times do
-        book.pages.build
+      set_callback :save, :before do |doc|
+        [:name, :age].each do |attr|
+          saved_change_to_attribute_values_before[attr] += [saved_change_to_attribute(attr)]
+          attribute_before_last_save_values_before[attr] += [attribute_before_last_save(attr)]
+          will_save_change_to_attribute_values_before[attr] += [will_save_change_to_attribute?(attr)]
+        end
+      end
+
+      set_callback :save, :after do |doc|
+        [:name, :age].each do |attr|
+          saved_change_to_attribute_values_after[attr] += [saved_change_to_attribute(attr)]
+          saved_change_to_attribute_q_values_after[attr] += [saved_change_to_attribute?(attr)]
+          attribute_before_last_save_values_after[attr] += [attribute_before_last_save(attr)]
+        end
+      end
+
+      def saved_change_to_attribute_values_before
+        @saved_change_to_attribute_values_before ||= Hash.new do
+          []
+        end
+      end
+
+      def attribute_before_last_save_values_before
+        @attribute_before_last_save_values_before ||= Hash.new do
+          []
+        end
+      end
+
+      def saved_change_to_attribute_values_after
+        @saved_change_to_attribute_values_after ||= Hash.new do
+          []
+        end
+      end
+
+      def saved_change_to_attribute_q_values_after
+        @saved_change_to_attribute_q_values_after ||= Hash.new do
+          []
+        end
+      end
+
+      def attribute_before_last_save_values_after
+        @attribute_before_last_save_values_after ||= Hash.new do
+          []
+        end
+      end
+
+      def will_save_change_to_attribute_values_before
+        @will_save_change_to_attribute_values_before ||= Hash.new do
+          []
+        end
       end
     end
 
-    # https://jira.mongodb.org/browse/MONGOID-5658
-    it 'does not raise SystemStackError' do
-      expect { book.save! }.not_to raise_error(SystemStackError)
+    it 'reproduces ActiveRecord::AttributeMethods::Dirty behavior' do
+      subject = TestSCTAAndABLSInCallbacks.new(name: 'Name 1')
+      subject.save!
+      subject.age = 18
+      subject.save!
+      subject.name = 'Name 2'
+      subject.save!
+
+      expect(subject.saved_change_to_attribute_values_before).to eq(
+        {
+          :name => [nil, [nil, "Name 1"], nil],
+          :age => [nil, nil, [nil, 18]],
+        }
+      )
+      expect(subject.saved_change_to_attribute_values_after).to eq(
+        {
+          :name => [[nil, "Name 1"], nil, ["Name 1", "Name 2"]],
+          :age => [nil, [nil, 18], nil],
+        }
+      )
+      expect(subject.saved_change_to_attribute_q_values_after).to eq(
+        {
+          :name => [true, false, true],
+          :age => [false, true, false],
+        }
+      )
+      expect(subject.attribute_before_last_save_values_before).to eq(
+        {
+          :name => [nil, nil, "Name 1"],
+          :age => [nil, nil, nil]
+        }
+      )
+      expect(subject.attribute_before_last_save_values_after).to eq(
+        {
+          :name => [nil, "Name 1", "Name 1"],
+          :age => [nil, nil, 18]
+        }
+      )
+      expect(subject.will_save_change_to_attribute_values_before).to eq(
+        {
+          :name => [true, false, true],
+          :age => [false, true, false]
+        }
+      )
     end
   end
 

data/spec/integration/discriminator_key_spec.rb

@@ -81,8 +81,9 @@ describe "#discriminator_key" do
     end
 
     context "before class creation" do
+      config_override :discriminator_key, "test"
+
       before do
-        Mongoid.discriminator_key = "test"
 
         class PreGlobalIntDiscriminatorParent
           include Mongoid::Document
@@ -93,7 +94,6 @@ describe "#discriminator_key" do
       end
 
       after do
-        Mongoid.discriminator_key = "_type"
         Object.send(:remove_const, :PreGlobalIntDiscriminatorParent)
         Object.send(:remove_const, :PreGlobalIntDiscriminatorChild)
       end
@@ -336,9 +336,9 @@ describe "#discriminator_key" do
     end
 
     context "Example 3" do
-      before do
-        Mongoid.discriminator_key = "shape_type"
+      config_override :discriminator_key, "shape_type"
 
+      before do
         class Example3Shape
           include Mongoid::Document
           field :x, type: Integer
@@ -358,7 +358,6 @@ describe "#discriminator_key" do
       end
 
       after do
-        Mongoid.discriminator_key = "_type"
         Object.send(:remove_const, :Example3Shape)
         Object.send(:remove_const, :Example3Circle)
         Object.send(:remove_const, :Example3Rectangle)

data/spec/integration/dots_and_dollars_spec.rb

@@ -267,20 +267,10 @@ describe "Dots and Dollars" do
         DADMUser.where("$_amount": 0).first
       end
 
-      it 'raises an error' do
+      it "raise an error" do
         expect do
           queried
-        end.to raise_error(Mongoid::Errors::InvalidQuery)
-      end
-
-      context 'when allow_unsafe_query_operators is true' do
-        config_override :allow_unsafe_query_operators, true
-
-        it 'raises an error from the server' do
-          expect do
-            queried
-          end.to raise_error(Mongo::Error::OperationFailure)
-        end
+        end.to raise_error(Mongo::Error::OperationFailure)
       end
     end
   end

data/spec/integration/i18n_fallbacks_spec.rb

@@ -3,11 +3,12 @@
 require 'spec_helper'
 
 describe 'i18n fallbacks' do
-  with_i18n_fallbacks
+  require_fallbacks
 
   context 'when fallbacks are enabled with a locale list' do
+    with_default_i18n_configs
+
     before do
-      I18n.default_locale = :en
       I18n.fallbacks[:de] = [ :en ]
     end
 

data/spec/integration/matcher_operator_data/regex.yml

@@ -135,27 +135,6 @@
       $regex: bar
   matches: false
 
-# Object#=~ is gone as of Ruby 3.2, so an element that cannot be matched
-# against has to be skipped rather than passed to =~.
-- name: array field value - element that cannot be matched against
-  document:
-    title:
-      - 42
-      - foo
-  query:
-    title:
-      $regex: foo
-  matches: true
-
-- name: array field value - no element can be matched against
-  document:
-    title:
-      - 42
-  query:
-    title:
-      $regex: foo
-  matches: false
-
 - name: true field value
   document:
     title: true

data/spec/mongoid/association/eager_spec.rb

@@ -14,36 +14,14 @@ describe Mongoid::Association::EagerLoadable do
       Mongoid::Contextual::Mongo.new(criteria)
     end
 
-    let(:association_host) { Account }
-
     let(:inclusions) do
       includes.map do |key|
-        association_host.reflect_on_association(key)
+        Account.reflect_on_association(key)
       end
     end
 
     let(:doc) { criteria.first }
 
-    context 'when root is an STI subclass' do
-      # Driver has_one Vehicle
-      # Vehicle belongs_to Driver
-      # Truck is a Vehicle
-
-      before do
-        Driver.create!(vehicle: Truck.new)
-      end
-
-      let(:criteria) { Truck.all }
-      let(:includes) { %i[ driver ] }
-      let(:association_host) { Truck }
-
-      it 'preloads the driver' do
-        expect(doc.ivar(:driver)).to be false
-        context.preload(inclusions, [ doc ])
-        expect(doc.ivar(:driver)).to be == Driver.first
-      end
-    end
-
     context "when belongs_to" do
 
       let!(:account) do
@@ -64,7 +42,7 @@ describe Mongoid::Association::EagerLoadable do
       it "preloads the parent" do
         expect(doc.ivar(:person)).to be false
         context.preload(inclusions, [doc])
-        expect(doc.ivar(:person)).to be == person
+        expect(doc.ivar(:person)).to eq(doc.person)
       end
     end
 

data/spec/mongoid/association/embedded/embedded_in/proxy_spec.rb

@@ -616,4 +616,31 @@ describe Mongoid::Association::Embedded::EmbeddedIn::Proxy do
       end
     end
   end
+
+  context "when assigning a hash" do
+    let(:building_address) { BuildingAddress.new }
+
+    before do
+      building_address.building = { name: "Chrysler" }
+    end
+
+    it "creates the objects correctly" do
+      expect(building_address.building).to be_a(Building)
+      expect(building_address.building.name).to eq("Chrysler")
+    end
+  end
+
+  context "when replacing an association with a hash" do
+    let(:building_address) { BuildingAddress.new }
+
+    before do
+      building_address.building = { name: "Chrysler" }
+      building_address.building = { name: "Empire State" }
+    end
+
+    it "creates the objects correctly" do
+      expect(building_address.building).to be_a(Building)
+      expect(building_address.building.name).to eq("Empire State")
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_many/proxy_spec.rb

@@ -2357,10 +2357,7 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
       context "when the id does not match" do
 
         context "when config set to raise error" do
-
-          before do
-            Mongoid.raise_not_found_error = true
-          end
+          config_override :raise_not_found_error, true
 
           it "raises an error" do
             expect {
@@ -2370,19 +2367,12 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
         end
 
         context "when config set not to raise error" do
+          config_override :raise_not_found_error, false
 
           let(:address) do
             person.addresses.find(BSON::ObjectId.new)
           end
 
-          before do
-            Mongoid.raise_not_found_error = false
-          end
-
-          after do
-            Mongoid.raise_not_found_error = true
-          end
-
           it "returns nil" do
             expect(address).to be_nil
           end
@@ -2406,10 +2396,7 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
       context "when the ids do not match" do
 
         context "when config set to raise error" do
-
-          before do
-            Mongoid.raise_not_found_error = true
-          end
+          config_override :raise_not_found_error, true
 
           it "raises an error" do
             expect {
@@ -2419,19 +2406,12 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
         end
 
         context "when config set not to raise error" do
+          config_override :raise_not_found_error, false
 
           let(:addresses) do
             person.addresses.find([ BSON::ObjectId.new ])
           end
 
-          before do
-            Mongoid.raise_not_found_error = false
-          end
-
-          after do
-            Mongoid.raise_not_found_error = true
-          end
-
           it "returns an empty array" do
             expect(addresses).to be_empty
           end
@@ -4591,7 +4571,7 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
     before do
       band.collection.
           find(_id: band.id).
-          update_one("$set" => { records: [{ name: "Moderat" }]})
+          update_one("$set" => { records: [{ _id: BSON::ObjectId.new, name: "Moderat" }]})
     end
 
     context "when loading the documents" do
@@ -4865,4 +4845,19 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
       expect(from_db.company_tags.size).to eq(2)
     end
   end
+
+  context "when assigning hashes" do
+    let(:user) { EmmUser.create! }
+
+    before do
+      user.orders = [ { sku: 1 }, { sku: 2 } ]
+    end
+
+    it "creates the objects correctly" do
+      expect(user.orders.first).to be_a(EmmOrder)
+      expect(user.orders.last).to be_a(EmmOrder)
+
+      expect(user.orders.map(&:sku).sort).to eq([ 1, 2 ])
+    end
+  end
 end

data/spec/mongoid/association/embedded/embeds_many_models.rb

@@ -100,6 +100,7 @@ end
 class EmmOrder
   include Mongoid::Document
 
+  field :sku
   field :amount, type: Integer
 
   embedded_in :user, class_name: 'EmmUser'

data/spec/mongoid/association/embedded/embeds_many_query_spec.rb

@@ -27,10 +27,6 @@ describe Mongoid::Association::Embedded::EmbedsMany do
       expect(legislator.attributes.keys).to eq(['_id', 'a'])
     end
 
-    it 'allows accessing the parent' do
-      expect { legislator.congress }.not_to raise_error
-    end
-
     context 'when using only with $' do
       before do
         Patient.destroy_all

data/spec/mongoid/association/embedded/embeds_one/proxy_spec.rb

@@ -202,7 +202,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
             end
           end
         end
-        
+
         context 'when the original document does not need to be unset because it will be replaced by the $set' do
 
           let!(:pet_owner) do
@@ -971,7 +971,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
     before do
       band.collection.
           find(_id: band.id).
-          update_one("$set" => { label: { name: "Mute" }})
+          update_one("$set" => { label: { _id: BSON::ObjectId.new, name: "Mute" }})
     end
 
     context "when loading the documents" do
@@ -1022,4 +1022,17 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       expect(building.building_address).to be_a(BuildingAddress)
     end
   end
+
+  context "when assigning a hash" do
+    let(:building) { Building.create! }
+
+    before do
+      building.building_address = { city: "NYC" }
+    end
+
+    it "creates the objects correctly" do
+      expect(building.building_address).to be_a(BuildingAddress)
+      expect(building.building_address.city).to eq("NYC")
+    end
+  end
 end

data/spec/mongoid/association/referenced/belongs_to_spec.rb

@@ -546,17 +546,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
       end
 
       context 'when the global config option is true' do
-
-        around(:example) do |example|
-          original_config = Mongoid.belongs_to_required_by_default
-          Mongoid.belongs_to_required_by_default = true
-          example.run
-          Mongoid.belongs_to_required_by_default = original_config
-        end
-
-        let!(:original_required_config) do
-          Mongoid.belongs_to_required_by_default
-        end
+        config_override :belongs_to_required_by_default, true
 
         context 'when the required option is true' do
 
@@ -684,13 +674,7 @@ describe Mongoid::Association::Referenced::BelongsTo do
       end
 
       context 'when the global config option is false' do
-
-        around(:example) do |example|
-          original_config = Mongoid.belongs_to_required_by_default
-          Mongoid.belongs_to_required_by_default = false
-          example.run
-          Mongoid.belongs_to_required_by_default = original_config
-        end
+        config_override :belongs_to_required_by_default, false
 
         context 'when the required option is true' do