mongoid 7.5.4 → 8.1.6

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/embedded/embeds_one_models.rb

@@ -52,3 +52,22 @@ class EomDnlChild
   embedded_in :parent, class_name: 'EomDnlParent'
   embedded_in :missing_parent, class_name: 'EomDnlMissingParent'
 end
+
+class EomAddress
+  include Mongoid::Document
+
+  field :city, type: String
+
+  embedded_in :addressable, polymorphic: true
+end
+
+# app/models/company.rb
+class EomCompany
+  include Mongoid::Document
+
+  embeds_one :address, class_name: 'EomAddress', as: :addressable
+  accepts_nested_attributes_for :address
+
+  embeds_one :delivery_address, class_name: 'EomAddress', as: :addressable
+  accepts_nested_attributes_for :delivery_address
+end

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

@@ -953,4 +953,32 @@ describe Mongoid::Association::Embedded::EmbedsOne do
       expect(association.create_relation(owner, target)).to be_a(EmbeddedObject)
     end
   end
+
+  context "when multiple embeds_one associations reference the same class" do
+    let(:acme) { EomCompany.create(address: { city: 'Gotham' }, delivery_address: { city: 'Parcelville' }) }
+
+    context "when the first assignment is modified" do
+      before do
+        acme.update(address: EomAddress.new(city: 'Bigville'))
+        acme.reload
+      end
+
+      it "updates the correct association" do
+        expect(acme.address.city).to eq("Bigville")
+        expect(acme.delivery_address.city).to eq("Parcelville")
+      end
+    end
+
+    context "when the second assignment is modified" do
+      before do
+        acme.update(delivery_address: EomAddress.new(city: 'Bigville'))
+        acme.reload
+      end
+
+      it "updates the correct association" do
+        expect(acme.address.city).to eq("Gotham")
+        expect(acme.delivery_address.city).to eq("Bigville")
+      end
+    end
+  end
 end

data/spec/mongoid/association/referenced/belongs_to/binding_spec.rb

@@ -83,7 +83,8 @@ describe Mongoid::Association::Referenced::BelongsTo::Binding do
         end
 
         it "does nothing" do
-          expect(game).to receive(:person=).never
+          expect(game).to receive(:person=).with(person).never
+          expect(game).to receive(:person=).with(nil).once
           binding.bind_one
         end
       end

data/spec/mongoid/association/referenced/belongs_to/buildable_spec.rb

@@ -235,4 +235,58 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
       end
     end
   end
+
+  context 'when the object is already associated with another object' do
+
+    context "when inverse is has_many" do
+
+      let(:drug1) do
+        Drug.create!
+      end
+
+      let(:drug2) do
+        Drug.create!
+      end
+
+      let(:person) do
+        Person.create!
+      end
+
+      before do
+        drug1.person = person
+        drug2.person = person
+      end
+
+      it 'does not clear the object of its previous association' do
+        expect(drug1.person).to eq(person)
+        expect(drug2.person).to eq(person)
+        expect(person.drugs).to eq([drug1, drug2])
+      end
+    end
+
+    context "when inverse is has_one" do
+
+      let(:account1) do
+        Account.create!(name: "1")
+      end
+
+      let(:account2) do
+        Account.create!(name: "2")
+      end
+
+      let(:person) do
+        Person.create!
+      end
+
+      before do
+        account1.person = person
+        account2.person = person
+      end
+
+      it 'clears the object of its previous association' do
+        expect(account1.person).to be_nil
+        expect(account2.person).to eq(person)
+      end
+    end
+  end
 end

data/spec/mongoid/association/referenced/belongs_to/proxy_spec.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require_relative '../belongs_to_models.rb'
 
 describe Mongoid::Association::Referenced::BelongsTo::Proxy do
 
@@ -1368,6 +1369,20 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
         game.person.set_personal_data(ssn: '123', age: 25)
       end.not_to raise_error
     end
+  end
+
+  # This is a very specific case, see MONGOID-5089 for more details.
+  context "when required is false, child is an orphan, and parent has explicit _id" do
+    let(:comment) { BTMComment.create! }
+    let(:article) do
+      BTMArticle.new(
+        comment_ids: [comment.id],
+        id: 1
+      )
+    end
 
+    it "uses the correct explicit id" do
+      expect(article.comments.first.article_id).to eq(1)
+    end
   end
 end

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

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class BTMArticle
+  include Mongoid::Document
+  has_many :comments, class_name: "BTMComment"
+end
+
+class BTMComment
+  include Mongoid::Document
+  belongs_to :article, class_name: "BTMArticle", required: false
+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
 
@@ -2019,8 +2003,8 @@ describe Mongoid::Association::Referenced::BelongsTo do
 
   describe '#foreign_key_check' do
 
-    it 'returns the foreign_key followed by "_changed?"' do
-      expect(association.foreign_key_check).to eq('owner_object_id_changed?')
+    it 'returns the foreign_key followed by "_previously_changed?"' do
+      expect(association.foreign_key_check).to eq('owner_object_id_previously_changed?')
     end
   end