mongoid 9.0.11 → 9.1.1

data/spec/integration/associations/foreign_key_spec.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
-require_relative './foreign_key_spec_models'
+require_relative 'foreign_key_spec_models'
 
 describe 'Association foreign key configuration' do
   describe 'has_many/belongs_to' do
@@ -28,13 +27,13 @@ describe 'Association foreign key configuration' do
       expect(email.company.id).to eq(company.id)
     end
 
-    it "has the correct criteria" do
-      company = ForeignKeySpec::Company.create!(c: "3")
-      email = ForeignKeySpec::Email.create!(company: company)
+    it 'has the correct criteria' do
+      company = ForeignKeySpec::Company.create!(c: '3')
+      ForeignKeySpec::Email.create!(company: company)
 
       criteria = ForeignKeySpec::Email.where(company: company)
 
-      expect(criteria.selector).to eq({ "c_ref" => "3" })
+      expect(criteria.selector).to eq({ 'c_ref' => '3' })
     end
 
     context 'with default scope' do
@@ -42,7 +41,7 @@ describe 'Association foreign key configuration' do
         it 'looks up child' do
           company = ForeignKeySpec::ScopedCompany.create!(c: 'test')
           on_email = ForeignKeySpec::ScopedEmail.create!(company: company, s: 'on')
-          off_email = ForeignKeySpec::ScopedEmail.create!(company: company, s: 'off')
+          ForeignKeySpec::ScopedEmail.create!(company: company, s: 'off')
 
           company = ForeignKeySpec::ScopedCompany.find(company.id)
           expect(company.emails.length).to eq(1)
@@ -58,7 +57,7 @@ describe 'Association foreign key configuration' do
 
           company = ForeignKeySpec::ScopedCompany.find(company.id)
           expect(company.emails.unscoped.length).to eq(2)
-          expect(company.emails.unscoped.map(&:id).sort).to eq([on_email.id, off_email.id].sort)
+          expect(company.emails.unscoped.map(&:id).sort).to eq([ on_email.id, off_email.id ].sort)
         end
       end
     end
@@ -83,7 +82,7 @@ describe 'Association foreign key configuration' do
       company = ForeignKeySpec::Company.create!(c: 'test')
       founder = ForeignKeySpec::Founder.create!(company: company)
 
-      email = ForeignKeySpec::Founder.find(founder.id)
+      ForeignKeySpec::Founder.find(founder.id)
       expect(founder.company.id).to eq(company.id)
     end
   end
@@ -100,9 +99,9 @@ describe 'Association foreign key configuration' do
       zoo.animals << animal
       zoo.save!
 
-      expect(zoo.animals).to eq([animal])
+      expect(zoo.animals).to eq([ animal ])
       zoo = ForeignKeySpec::Zoo.find(zoo.id)
-      expect(zoo.animals).to eq([animal])
+      expect(zoo.animals).to eq([ animal ])
     end
   end
 end

data/spec/integration/associations/foreign_key_spec_models.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 module ForeignKeySpec
   class Company
@@ -7,9 +6,9 @@ module ForeignKeySpec
 
     field :c, type: String
     has_many :emails, class_name: 'ForeignKeySpec::Email',
-      foreign_key: 'c_ref', primary_key: 'c'
+                      foreign_key: 'c_ref', primary_key: 'c'
     has_one :founder, class_name: 'ForeignKeySpec::Founder',
-      foreign_key: 'c_ref', primary_key: 'c'
+                      foreign_key: 'c_ref', primary_key: 'c'
   end
 
   class Email
@@ -17,7 +16,7 @@ module ForeignKeySpec
 
     field :c_ref, type: String
     belongs_to :company, class_name: 'ForeignKeySpec::Company',
-      foreign_key: 'c_ref', primary_key: 'c'
+                         foreign_key: 'c_ref', primary_key: 'c'
   end
 
   class Founder
@@ -25,7 +24,7 @@ module ForeignKeySpec
 
     field :c_ref, type: String
     belongs_to :company, class_name: 'ForeignKeySpec::Company',
-      foreign_key: 'c_ref', primary_key: 'c'
+                         foreign_key: 'c_ref', primary_key: 'c'
   end
 
   class Animal
@@ -33,7 +32,7 @@ module ForeignKeySpec
 
     field :a, type: String
     has_and_belongs_to_many :zoos, class_name: 'ForeignKeySpec::Zoo',
-      foreign_key: 'z_refs', primary_key: 'z'
+                                   foreign_key: 'z_refs', primary_key: 'z'
   end
 
   class Zoo
@@ -41,7 +40,7 @@ module ForeignKeySpec
 
     field :z, type: String
     has_and_belongs_to_many :animals, class_name: 'ForeignKeySpec::Animal',
-      foreign_key: 'a_refs', primary_key: 'a'
+                                      foreign_key: 'a_refs', primary_key: 'a'
   end
 
   class ScopedCompany
@@ -49,7 +48,7 @@ module ForeignKeySpec
 
     field :c, type: String
     has_many :emails, class_name: 'ForeignKeySpec::ScopedEmail',
-      foreign_key: 'c_ref', primary_key: 'c'
+                      foreign_key: 'c_ref', primary_key: 'c'
   end
 
   class ScopedEmail
@@ -57,7 +56,7 @@ module ForeignKeySpec
 
     field :c_ref, type: String
     belongs_to :company, class_name: 'ForeignKeySpec::ScopedCompany',
-      foreign_key: 'c_ref', primary_key: 'c'
+                         foreign_key: 'c_ref', primary_key: 'c'
 
     field :s, type: String
     default_scope -> { where(s: 'on') }

data/spec/integration/associations/has_and_belongs_to_many_spec.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
 module HabtmSpec
   class Page
     include Mongoid::Document
+
     embeds_many :blocks, class_name: 'HabtmSpec::Block'
   end
 
   class Block
     include Mongoid::Document
+
     embedded_in :page, class_name: 'HabtmSpec::Page'
   end
 
@@ -21,6 +22,7 @@ module HabtmSpec
 
   class Attachment
     include Mongoid::Document
+
     field :file, type: String
   end
 
@@ -49,7 +51,7 @@ module HabtmSpec
     include Mongoid::Document
 
     field :name, type: String
-    
+
     has_and_belongs_to_many :items, class_name: 'HabtmSpec::Item', inverse_of: :colors
     has_and_belongs_to_many :beams, class_name: 'HabtmSpec::Beam', inverse_of: :colors
 
@@ -58,18 +60,18 @@ module HabtmSpec
 end
 
 describe 'has_and_belongs_to_many associations' do
-
   context 'when an anonymous class defines a has_and_belongs_to_many association' do
     let(:klass) do
       Class.new do
         include Mongoid::Document
+
         has_and_belongs_to_many :movies, inverse_of: nil
       end
     end
 
     it 'loads the association correctly' do
-      expect { klass }.to_not raise_error
-      expect { klass.new.movies }.to_not raise_error
+      expect { klass }.not_to raise_error
+      expect { klass.new.movies }.not_to raise_error
       expect(klass.new.movies.build).to be_a Movie
     end
   end
@@ -80,15 +82,31 @@ describe 'has_and_belongs_to_many associations' do
     let(:page) { HabtmSpec::Page.create! }
 
     let(:image_block) do
-      image_block = page.blocks.build({
-        _type: 'HabtmSpec::ImageBlock',
-        attachment_ids: [ attachment.id.to_s ],
-        attachments_attributes: { '1234' => { file: 'bar.jpg', id: attachment.id.to_s } }
-      })
+      page.blocks.build({
+                          _type: 'HabtmSpec::ImageBlock',
+                          attachment_ids: [ attachment.id.to_s ],
+                          attachments_attributes: { '1234' => { file: 'bar.jpg',
+                                                                id: attachment.id.to_s } }
+                        })
     end
 
-    it 'does not raise on save' do
-      expect { image_block.save! }.not_to raise_error
+    # The nested attributes are processed before the attachment_ids
+    # assignment is applied, so at that point the id is not yet in the
+    # association and resolving it requires a collection-wide lookup.
+    context 'when allow_reparenting_via_nested_attributes is false' do
+      config_override :allow_reparenting_via_nested_attributes, false
+
+      it 'raises a document not found error' do
+        expect { image_block.save! }.to raise_error(Mongoid::Errors::DocumentNotFound)
+      end
+    end
+
+    context 'when allow_reparenting_via_nested_attributes is true' do
+      config_override :allow_reparenting_via_nested_attributes, true
+
+      it 'does not raise on save' do
+        expect { image_block.save! }.not_to raise_error
+      end
     end
   end
 
@@ -111,7 +129,7 @@ describe 'has_and_belongs_to_many associations' do
               beams_attributes: [
                 {
                   _id: beam.id,
-                  name: updated_beam_name,
+                  name: updated_beam_name
                 }
               ]
             }
@@ -122,7 +140,7 @@ describe 'has_and_belongs_to_many associations' do
       context 'when the beam is invalid' do
         let(:updated_beam_name) { '' } # invalid value
 
-        it 'will not save the parent' do
+        it 'does not save the parent' do
           expect(item.update(attributes)).to be_falsey
           expect(item.errors).not_to be_empty
           expect(item.reload.title).not_to eq(updated_item_title)
@@ -131,7 +149,7 @@ describe 'has_and_belongs_to_many associations' do
       end
 
       context 'when the beam is valid' do
-        it 'will save the parent' do
+        it 'saves the parent' do
           expect(item.update(attributes)).to be_truthy
           expect(item.errors).to be_empty
           expect(item.reload.title).to eq(updated_item_title)

data/spec/integration/associations/has_many_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 require 'mongoid/association/referenced/has_many_models'
@@ -26,8 +25,8 @@ describe 'has_many associations' do
       it 'destroys' do
         address
 
-        HmmCompany.count.should == 1
-        HmmAddress.count.should == 1
+        HmmCompany.count.should eq 1
+        HmmAddress.count.should eq 1
 
         company.with_session do |session|
           session.with_transaction do
@@ -35,8 +34,8 @@ describe 'has_many associations' do
           end
         end
 
-        HmmCompany.count.should == 0
-        HmmAddress.count.should == 0
+        HmmCompany.count.should eq 0
+        HmmAddress.count.should eq 0
       end
     end
 
@@ -50,8 +49,8 @@ describe 'has_many associations' do
       it 'destroys' do
         address
 
-        HmmCompany.count.should == 1
-        HmmAddress.count.should == 1
+        HmmCompany.count.should eq 1
+        HmmAddress.count.should eq 1
 
         lambda do
           company.with_session do |session|
@@ -61,8 +60,8 @@ describe 'has_many associations' do
           end
         end.should raise_error(Mongoid::Errors::DocumentNotDestroyed)
 
-        HmmCompany.count.should == 1
-        HmmAddress.count.should == 1
+        HmmCompany.count.should eq 1
+        HmmAddress.count.should eq 1
       end
     end
   end
@@ -98,11 +97,11 @@ describe 'has_many associations' do
       end
 
       it 'does not destroy the dependent object' do
-        wiki_page.comments.should == [comment]
-        wiki_page.comments = [comment]
+        wiki_page.comments.should eq [ comment ]
+        wiki_page.comments = [ comment ]
         wiki_page.save!
         wiki_page.reload
-        wiki_page.comments.should == [comment]
+        wiki_page.comments.should eq [ comment ]
       end
     end
 
@@ -118,11 +117,11 @@ describe 'has_many associations' do
       end
 
       it 'does not destroy the dependent object' do
-        series.books.should == [book]
-        series.books = [book]
+        series.books.should eq [ book ]
+        series.books = [ book ]
         series.save!
         series.reload
-        series.books.should == [book]
+        series.books.should eq [ book ]
       end
     end
   end
@@ -149,7 +148,7 @@ describe 'has_many associations' do
                 {
                   _id: grandchild.id,
                   title: updated_grandchild_title,
-                  num: updated_grandchild_num,
+                  num: updated_grandchild_num
                 }
               ]
             }
@@ -160,7 +159,7 @@ describe 'has_many associations' do
       context 'when the grandchild is invalid' do
         let(:updated_grandchild_num) { -1 } # invalid value
 
-        it 'will not save the parent' do
+        it 'does not save the parent' do
           expect(post.update(attributes)).to be_falsey
           expect(post.errors).not_to be_empty
           expect(post.reload.title).not_to eq(updated_parent_title)
@@ -172,7 +171,7 @@ describe 'has_many associations' do
       context 'when the grandchild is valid' do
         let(:updated_grandchild_num) { 1 }
 
-        it 'will save the parent' do
+        it 'saves the parent' do
           expect(post.update(attributes)).to be_truthy
           expect(post.errors).to be_empty
           expect(post.reload.title).to eq(updated_parent_title)

data/spec/integration/associations/has_one_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 require 'mongoid/association/referenced/has_one_models'
@@ -26,8 +25,8 @@ describe 'has_one associations' do
       it 'destroys' do
         address
 
-        HomCollege.count.should == 1
-        HomAddress.count.should == 1
+        HomCollege.count.should eq 1
+        HomAddress.count.should eq 1
 
         HomCollege.with_session do |session|
           session.with_transaction do
@@ -35,8 +34,8 @@ describe 'has_one associations' do
           end
         end
 
-        HomCollege.count.should == 0
-        HomAddress.count.should == 0
+        HomCollege.count.should eq 0
+        HomAddress.count.should eq 0
       end
     end
 
@@ -50,8 +49,8 @@ describe 'has_one associations' do
       it 'does not destroy' do
         address
 
-        HomCollege.count.should == 1
-        HomAddress.count.should == 1
+        HomCollege.count.should eq 1
+        HomAddress.count.should eq 1
 
         lambda do
           HomCollege.with_session do |session|
@@ -61,8 +60,8 @@ describe 'has_one associations' do
           end
         end.should raise_error(Mongoid::Errors::DocumentNotDestroyed)
 
-        HomCollege.count.should == 1
-        HomAddress.count.should == 1
+        HomCollege.count.should eq 1
+        HomAddress.count.should eq 1
       end
     end
   end
@@ -77,28 +76,26 @@ describe 'has_one associations' do
     shared_examples 'delegates to the field' do |reloaded: false|
       context 'non-conflicting field name' do
         it 'delegates to the field' do
-          parent.accreditation.price.should == 42
+          parent.accreditation.price.should eq 42
         end
 
         context 'using send' do
           it 'delegates to the field' do
-            parent.accreditation.send(:price).should == 42
+            parent.accreditation.send(:price).should eq 42
           end
         end
       end
 
       context 'field name that conflicts with Kernel' do
         it 'delegates to the field' do
-          parent.accreditation.format.should == 'fmt'
+          parent.accreditation.format.should eq 'fmt'
         end
 
         context 'using send' do
           it 'delegates to the field' do
-            if reloaded
-              pending 'MONGOID-5018'
-            end
+            pending 'MONGOID-5018' if reloaded
 
-            parent.accreditation.send(:format).should == 'fmt'
+            parent.accreditation.send(:format).should eq 'fmt'
           end
         end
       end
@@ -146,11 +143,11 @@ describe 'has_one associations' do
       end
 
       it 'does not destroy the dependent object' do
-        person.game.should == game
+        person.game.should eq game
         person.game = person.game
         person.save!
         person.reload
-        person.game.should == game
+        person.game.should eq game
       end
     end
 
@@ -166,23 +163,23 @@ describe 'has_one associations' do
       end
 
       it 'does not destroy the dependent object' do
-        person.account.should == account
+        person.account.should eq account
         person.account = person.account
         person.save!
         person.reload
-        person.account.should == account
+        person.account.should eq account
       end
     end
   end
 
-  context "when assigning to a has_one" do
+  context 'when assigning to a has_one' do
     let(:post) { HomPost.create! }
-    let(:comment1) { HomComment.create!(content: "Comment 1") }
+    let(:comment1) { HomComment.create!(content: 'Comment 1') }
 
-    context "when assigning the same value" do
+    context 'when assigning the same value' do
       let(:comment2) { HomComment.create! }
 
-      it "persists it correctly" do
+      it 'persists it correctly' do
         post.comment = comment1
         post.reload
         expect(post.comment).to eq(comment1)
@@ -193,10 +190,10 @@ describe 'has_one associations' do
       end
     end
 
-    context "when assigning two values with the same _id" do
+    context 'when assigning two values with the same _id' do
       let(:comment2) { HomComment.new(id: comment1.id) }
 
-      it "raises a duplicate key error" do
+      it 'raises a duplicate key error' do
         post.comment = comment1
         expect do
           post.comment = comment2
@@ -204,17 +201,17 @@ describe 'has_one associations' do
       end
     end
 
-    context "when duping the object and changing attributes" do
+    context 'when duping the object and changing attributes' do
       let(:comment2) { comment1.dup }
 
       before do
-        comment2.content = "Comment 2"
+        comment2.content = 'Comment 2'
 
         post.comment = comment1
         post.reload
       end
 
-      it "updates the attributes correctly" do
+      it 'updates the attributes correctly' do
         post.comment = comment2
         post.reload
 
@@ -223,10 +220,10 @@ describe 'has_one associations' do
       end
     end
 
-    context "when explicitly setting the foreign key" do
-      let(:comment2) { HomComment.new(container_id: post.id, container_type: post.class.name, content: "2") }
+    context 'when explicitly setting the foreign key' do
+      let(:comment2) { HomComment.new(container_id: post.id, container_type: post.class.name, content: '2') }
 
-      it "persists the new comment" do
+      it 'persists the new comment' do
         post.comment = comment1
         post.reload
 
@@ -238,10 +235,10 @@ describe 'has_one associations' do
       end
     end
 
-    context "when reassigning the same value" do
-      let(:comment2) { HomComment.create!(content: "Comment 2") }
+    context 'when reassigning the same value' do
+      let(:comment2) { HomComment.create!(content: 'Comment 2') }
 
-      it "persists it correctly" do
+      it 'persists it correctly' do
         post.comment = comment1
         post.reload
         expect(post.comment).to eq(comment1)
@@ -257,17 +254,17 @@ describe 'has_one associations' do
     end
   end
 
-  context "when overwriting an association" do
-    let(:post1) { HomPost.create!(title: "post 1") }
-    let(:post2) { HomPost.create!(title: "post 2") }
+  context 'when overwriting an association' do
+    let(:post1) { HomPost.create!(title: 'post 1') }
+    let(:post2) { HomPost.create!(title: 'post 2') }
     let(:comment) { HomComment.create(post: post1) }
 
-    it "does not overwrite the original value" do
-      pending "MONGOID-3999"
+    it 'does not overwrite the original value' do
+      pending 'MONGOID-3999'
       p1 = comment.container
-      expect(p1.title).to eq("post 1")
+      expect(p1.title).to eq('post 1')
       comment.container = post2
-      expect(p1.title).to eq("post 1")
+      expect(p1.title).to eq('post 1')
     end
   end
 
@@ -291,7 +288,7 @@ describe 'has_one associations' do
             comment_attributes: {
               _id: grandchild.id,
               content: updated_grandchild_content,
-              num: updated_grandchild_num,
+              num: updated_grandchild_num
             }
           }
         }
@@ -300,7 +297,7 @@ describe 'has_one associations' do
       context 'when the grandchild is invalid' do
         let(:updated_grandchild_num) { -1 } # invalid value
 
-        it 'will not save the parent' do
+        it 'does not save the parent' do
           expect(post.update(attributes)).to be_falsey
           expect(post.errors).not_to be_empty
           expect(post.reload.title).not_to eq(updated_parent_title)
@@ -312,7 +309,7 @@ describe 'has_one associations' do
       context 'when the grandchild is valid' do
         let(:updated_grandchild_num) { 1 }
 
-        it 'will save the parent' do
+        it 'saves the parent' do
           expect(post.update(attributes)).to be_truthy
           expect(post.errors).to be_empty
           expect(post.reload.title).to eq(updated_parent_title)