mongoid 9.0.11 → 9.1.1

data/spec/integration/associations/belongs_to_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 require 'support/feature_sandbox'
@@ -15,8 +14,8 @@ def quarantine(context, polymorphic:, dept_aliases:, team_aliases:)
     # Have to eval this, because otherwise we get syntax errors when defining a class
     # inside a method.
     #
-    # I know the scissors are sharp! But I want to run with them anwyay!
-    Object.class_eval <<-RUBY
+    # I know the scissors are sharp! But I want to run with them anyway!
+    Object.class_eval <<-RUBY, __FILE__, __LINE__ + 1
       class SandboxManager; include Mongoid::Document; end
       class SandboxDepartment; include Mongoid::Document; end
       class SandboxTeam; include Mongoid::Document; end
@@ -24,10 +23,10 @@ def quarantine(context, polymorphic:, dept_aliases:, team_aliases:)
 
     SandboxManager.belongs_to :unit, polymorphic: polymorphic
 
-    SandboxDepartment.identify_as *dept_aliases, resolver: polymorphic
+    SandboxDepartment.identify_as(*dept_aliases, resolver: polymorphic)
     SandboxDepartment.has_many :sandbox_managers, as: :unit
 
-    SandboxTeam.identify_as *team_aliases, resolver: polymorphic
+    SandboxTeam.identify_as(*team_aliases, resolver: polymorphic)
     SandboxTeam.has_one :sandbox_manager, as: :unit
   end
 
@@ -50,13 +49,14 @@ describe 'belongs_to associations' do
     let(:klass) do
       Class.new do
         include Mongoid::Document
+
         belongs_to :movie
       end
     end
 
     it 'loads the association correctly' do
-      expect { klass }.to_not raise_error
-      expect { klass.new.movie }.to_not raise_error
+      expect { klass }.not_to raise_error
+      expect { klass.new.movie }.not_to raise_error
       instance = klass.new
       movie = Movie.new
       instance.movie = movie
@@ -70,21 +70,22 @@ describe 'belongs_to associations' do
     let(:department) { SandboxDepartment.create }
     let(:team) { SandboxTeam.create }
 
-    shared_context 'it finds the associated records' do
+    shared_examples 'it finds the associated records' do
       it 'successfully finds the manager\'s unit' do
-        expect(dept_manager.reload.unit).to be == department
-        expect(team_manager.reload.unit).to be == team
+        expect(dept_manager.reload.unit).to eq department
+        expect(team_manager.reload.unit).to eq team
       end
 
       it 'successfully finds the unit\'s manager' do
-        dept_manager; team_manager # make sure these are created first...
+        dept_manager
+        team_manager # make sure these are created first...
 
-        expect(department.reload.sandbox_managers).to be == [ dept_manager ]
-        expect(team.reload.sandbox_manager).to be == team_manager
+        expect(department.reload.sandbox_managers).to eq [ dept_manager ]
+        expect(team.reload.sandbox_manager).to eq team_manager
       end
     end
 
-    shared_context 'it searches for alternative aliases' do
+    shared_examples 'it searches for alternative aliases' do
       it 'successfully finds the corresponding unit when unit_type is a different alias' do
         dept_manager.update unit_type: 'sandbox_dept'
         dept_manager.reload
@@ -92,11 +93,24 @@ describe 'belongs_to associations' do
         team_manager.update unit_type: 'group'
         team_manager.reload
 
-        expect(dept_manager.reload.unit_type).to be == 'sandbox_dept'
-        expect(dept_manager.unit).to be == department
+        expect(dept_manager.reload.unit_type).to eq 'sandbox_dept'
+        expect(dept_manager.unit).to eq department
+
+        expect(team_manager.reload.unit_type).to eq 'group'
+        expect(team_manager.unit).to eq team
+      end
+
+      it 'eager-loads the corresponding unit when unit_type is a different alias' do
+        dept_manager.update unit_type: 'sandbox_dept'
+        team_manager.update unit_type: 'group'
 
-        expect(team_manager.reload.unit_type).to be == 'group'
-        expect(team_manager.unit).to be == team
+        managers = SandboxManager.where(:_id.in => [ dept_manager.id, team_manager.id ])
+                                 .includes(:unit)
+                                 .to_a
+        units_by_id = managers.to_h { |m| [ m.id, m.ivar(:unit) ] }
+
+        expect(units_by_id[dept_manager.id]).to eq department
+        expect(units_by_id[team_manager.id]).to eq team
       end
     end
 
@@ -105,8 +119,8 @@ describe 'belongs_to associations' do
         quarantine(self, polymorphic: true, dept_aliases: [], team_aliases: [])
 
         it 'populates the unit_type with the class name' do
-          expect(dept_manager.unit_type).to be == 'SandboxDepartment'
-          expect(team_manager.unit_type).to be == 'SandboxTeam'
+          expect(dept_manager.unit_type).to eq 'SandboxDepartment'
+          expect(team_manager.unit_type).to eq 'SandboxTeam'
         end
 
         it_behaves_like 'it finds the associated records'
@@ -116,8 +130,8 @@ describe 'belongs_to associations' do
         quarantine(self, polymorphic: true, dept_aliases: %w[ dept sandbox_dept ], team_aliases: %w[ team group ])
 
         it 'populates the unit_type with the first alias' do
-          expect(dept_manager.unit_type).to be == 'dept'
-          expect(team_manager.unit_type).to be == 'team'
+          expect(dept_manager.unit_type).to eq 'dept'
+          expect(team_manager.unit_type).to eq 'team'
         end
 
         it_behaves_like 'it finds the associated records'
@@ -127,6 +141,7 @@ describe 'belongs_to associations' do
 
     context 'when the association uses a registered resolver' do
       before(:context) { Mongoid::ModelResolver.register_resolver Mongoid::ModelResolver.new, :sandbox }
+
       quarantine(self, polymorphic: :sandbox, dept_aliases: %w[ dept sandbox_dept ], team_aliases: %w[ team group ])
 
       it 'does not include the aliases in the default resolver' do
@@ -134,8 +149,8 @@ describe 'belongs_to associations' do
       end
 
       it 'populates the unit_type with the first alias' do
-        expect(dept_manager.unit_type).to be == 'dept'
-        expect(team_manager.unit_type).to be == 'team'
+        expect(dept_manager.unit_type).to eq 'dept'
+        expect(team_manager.unit_type).to eq 'team'
       end
 
       it_behaves_like 'it finds the associated records'
@@ -144,16 +159,16 @@ describe 'belongs_to associations' do
 
     context 'when the association uses an unregistered resolver' do
       quarantine(self, polymorphic: Mongoid::ModelResolver.new,
-        dept_aliases: %w[ dept sandbox_dept ],
-        team_aliases: %w[ team group ])
+                       dept_aliases: %w[ dept sandbox_dept ],
+                       team_aliases: %w[ team group ])
 
       it 'does not include the aliases in the default resolver' do
         expect(Mongoid::ModelResolver.instance.keys_for(SandboxDepartment.new)).not_to include('dept')
       end
 
       it 'populates the unit_type with the first alias' do
-        expect(dept_manager.unit_type).to be == 'dept'
-        expect(team_manager.unit_type).to be == 'team'
+        expect(dept_manager.unit_type).to eq 'dept'
+        expect(team_manager.unit_type).to eq 'team'
       end
 
       it_behaves_like 'it finds the associated records'

data/spec/integration/associations/embedded_dirty_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 require_relative '../../mongoid/association/embedded/embeds_many_models'

data/spec/integration/associations/embedded_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 require_relative '../../mongoid/association/embedded/embeds_many_models'
@@ -18,25 +17,25 @@ describe 'embedded associations' do
     shared_examples_for 'an embedded association' do
       it 'adds child documents to parent association object' do
         legislator
-        congress.legislators._target.should == [legislator]
+        congress.legislators._target.should eq [ legislator ]
       end
 
       it 'adds child documents to parent association object criteria' do
         legislator
-        congress.legislators.criteria.documents.should == [legislator]
+        congress.legislators.criteria.documents.should eq [ legislator ]
       end
 
       it 'populates documents on parent association object' do
-        congress.legislators.documents.should == [legislator]
+        congress.legislators.documents.should eq [ legislator ]
       end
 
       it 'returns created child when referencing embedded association' do
-        congress.legislators.should == [legislator]
+        congress.legislators.should eq [ legislator ]
       end
 
       it 'returns created child when referencing Criteria created from embedded association' do
         congress.legislators.all.should be_a(Mongoid::Criteria)
-        congress.legislators.all.to_a.should == [legislator]
+        congress.legislators.all.to_a.should eq [ legislator ]
       end
     end
 
@@ -71,32 +70,32 @@ describe 'embedded associations' do
 
     shared_examples_for 'adds child documents to parent association' do
       it 'adds child documents to parent association' do
-        manufactory.products._target.should == [product]
+        manufactory.products._target.should eq [ product ]
       end
     end
 
     shared_examples_for 'an embedded association' do
       it 'adds child documents to parent association object' do
         product
-        manufactory.products._target.should == [product]
+        manufactory.products._target.should eq [ product ]
       end
 
       it 'adds child documents to parent association object criteria' do
         product
-        manufactory.products.criteria.documents.should == [product]
+        manufactory.products.criteria.documents.should eq [ product ]
       end
 
       it 'populates documents on parent association object' do
-        manufactory.products.documents.should == [product]
+        manufactory.products.documents.should eq [ product ]
       end
 
       it 'returns created child when referencing embedded association' do
-        manufactory.products.should == [product]
+        manufactory.products.should eq [ product ]
       end
 
       it 'returns created child when referencing Criteria created from embedded association' do
         manufactory.products.all.should be_a(Mongoid::Criteria)
-        manufactory.products.all.to_a.should == [product]
+        manufactory.products.all.to_a.should eq [ product ]
       end
     end
 
@@ -111,7 +110,7 @@ describe 'embedded associations' do
     context 'when association is loaded' do
       before do
         # This query must be before the product is created
-        manufactory.products.where(name: "Car").first
+        manufactory.products.where(name: 'Car').first
 
         product
       end
@@ -126,11 +125,10 @@ describe 'embedded associations' do
     end
 
     context 'embeds_one' do
-
       shared_examples 'is set' do
         it 'is set' do
           parent.child = child_cls.new
-          parent.child.parent.should == parent
+          parent.child.parent.should eq parent
         end
       end
 
@@ -150,12 +148,11 @@ describe 'embedded associations' do
     end
 
     context 'embeds_many' do
-
       let(:child) { parent.legislators.new }
 
       shared_examples 'is set' do
         it 'is set' do
-          child.congress.should == parent
+          child.congress.should eq parent
         end
       end
 
@@ -217,7 +214,7 @@ describe 'embedded associations' do
       end
 
       context 'embeds_many' do
-        let(:parent) { EmmCongress.create!(legislators: [EmmLegislator.new]) }
+        let(:parent) { EmmCongress.create!(legislators: [ EmmLegislator.new ]) }
 
         it 'updates' do
           first_updated_at = parent.updated_at
@@ -245,7 +242,7 @@ describe 'embedded associations' do
       end
 
       context 'embeds_many' do
-        let(:parent) { EmmCongress.create!(legislators: [EmmLegislator.new]) }
+        let(:parent) { EmmCongress.create!(legislators: [ EmmLegislator.new ]) }
 
         it 'updates' do
           pending 'https://jira.mongodb.org/browse/MONGOID-3252'
@@ -261,8 +258,9 @@ describe 'embedded associations' do
     end
   end
 
-  context "when summing properties on an embedded child" do
+  context 'when summing properties on an embedded child' do
     let(:user) { EmmUser.new }
+
     before do
       user.orders.build(amount: 200)
       expect(user.orders.sum(:amount)).to eq(200)
@@ -271,7 +269,7 @@ describe 'embedded associations' do
       user.orders.build(amount: 500)
     end
 
-    it "the cache is cleared after deletion" do
+    it 'the cache is cleared after deletion' do
       expect(user.orders.sum(:amount)).to eq(500)
     end
   end
@@ -279,10 +277,10 @@ describe 'embedded associations' do
   context 'when modifying an embedded document & removing another embedded document' do
     let(:user) do
       EmmUser.create!(orders: [
-        EmmOrder.new(sku: 0, amount: 0),
-        EmmOrder.new(sku: 1, amount: 1),
-        EmmOrder.new(sku: 2, amount: 2),
-      ])
+                        EmmOrder.new(sku: 0, amount: 0),
+                        EmmOrder.new(sku: 1, amount: 1),
+                        EmmOrder.new(sku: 2, amount: 2)
+                      ])
     end
 
     context 'when modifying first and removing second' do
@@ -292,9 +290,9 @@ describe 'embedded associations' do
         user.save!
         user.reload
 
-        user.orders.map do
-          |order| [order.sku, order.amount]
-        end.should == [[1, 10], [2, 2]]
+        user.orders.map do |order|
+          [ order.sku, order.amount ]
+        end.should eq [ [ 1, 10 ], [ 2, 2 ] ]
       end
     end
 
@@ -305,9 +303,9 @@ describe 'embedded associations' do
         user.save!
         user.reload
 
-        user.orders.map do
-          |order| [order.sku, order.amount]
-        end.should == [[1, 1], [2, 20]]
+        user.orders.map do |order|
+          [ order.sku, order.amount ]
+        end.should eq [ [ 1, 1 ], [ 2, 20 ] ]
       end
     end
   end
@@ -315,37 +313,37 @@ describe 'embedded associations' do
   context 'when modifying a nested embedded document & removing another nested embedded document' do
     let(:user) do
       EmmUser.create!(orders: [
-        EmmOrder.new(sku: 0, surcharges: [EmmSurcharge.new(amount: 0)]),
-        EmmOrder.new(sku: 1, surcharges: [EmmSurcharge.new(amount: 1)]),
-        EmmOrder.new(sku: 2, surcharges: [EmmSurcharge.new(amount: 2)]),
-      ])
+                        EmmOrder.new(sku: 0, surcharges: [ EmmSurcharge.new(amount: 0) ]),
+                        EmmOrder.new(sku: 1, surcharges: [ EmmSurcharge.new(amount: 1) ]),
+                        EmmOrder.new(sku: 2, surcharges: [ EmmSurcharge.new(amount: 2) ])
+                      ])
     end
 
     context 'when modifying first and removing second' do
       it 'works correctly' do
         pending 'MONGOID-5364'
 
-        user.orders[1].assign_attributes(surcharges: [amount: 10])
+        user.orders[1].assign_attributes(surcharges: [ { amount: 10 } ])
         user.orders[0].destroy
         user.save!
         user.reload
 
-        user.orders.map do
-          |order| [order.sku, order.surcharges.first.amount]
-        end.should == [[1, 10], [2, 2]]
+        user.orders.map do |order|
+          [ order.sku, order.surcharges.first.amount ]
+        end.should eq [ [ 1, 10 ], [ 2, 2 ] ]
       end
     end
 
     context 'when removing first and modifying second' do
       it 'works correctly' do
         user.orders[0].destroy
-        user.orders[1].assign_attributes(surcharges: [amount: 20])
+        user.orders[1].assign_attributes(surcharges: [ { amount: 20 } ])
         user.save!
         user.reload
 
-        user.orders.map do
-          |order| [order.sku, order.surcharges.first.amount]
-        end.should == [[1, 1], [2, 20]]
+        user.orders.map do |order|
+          [ order.sku, order.surcharges.first.amount ]
+        end.should eq [ [ 1, 1 ], [ 2, 20 ] ]
       end
     end
   end

data/spec/integration/associations/embeds_many_spec.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
-# rubocop:todo all
 
 require 'spec_helper'
 
 module EmbedsManySpec
   class Post
     include Mongoid::Document
+
     field :title, type: String
     embeds_many :comments, class_name: 'EmbedsManySpec::Comment', as: :container
     accepts_nested_attributes_for :comments
@@ -13,6 +13,7 @@ module EmbedsManySpec
 
   class Comment
     include Mongoid::Document
+
     field :content, type: String
     validates :content, presence: true
     embedded_in :container, polymorphic: true
@@ -22,30 +23,29 @@ module EmbedsManySpec
 end
 
 describe 'embeds_many associations' do
-
   context 're-associating the same object' do
     context 'with dependent: destroy' do
       let(:canvas) do
-        Canvas.create!(shapes: [Shape.new])
+        Canvas.create!(shapes: [ Shape.new ])
       end
 
       let!(:shape) { canvas.shapes.first }
 
       it 'does not destroy the dependent object' do
-        canvas.shapes = [shape]
+        canvas.shapes = [ shape ]
         canvas.save!
         canvas.reload
-        canvas.shapes.should == [shape]
+        canvas.shapes.should eq [ shape ]
       end
     end
   end
 
   context 'clearing association when parent is not saved' do
-    let!(:parent) { Canvas.create!(shapes: [Shape.new]) }
+    let!(:parent) { Canvas.create!(shapes: [ Shape.new ]) }
 
-    let(:unsaved_parent) { Canvas.new(id: parent.id, shapes: [Shape.new]) }
+    let(:unsaved_parent) { Canvas.new(id: parent.id, shapes: [ Shape.new ]) }
 
-    context "using #clear" do
+    context 'using #clear' do
       it 'deletes the target from the database' do
         unsaved_parent.shapes.clear
 
@@ -63,11 +63,11 @@ describe 'embeds_many associations' do
 
         unsaved_parent.new_record?.should be true
         parent.reload
-        parent.shapes.length.should == 1
+        parent.shapes.length.should eq 1
       end
     end
 
-    context "using #delete_all" do
+    context 'using #delete_all' do
       before do
         unsaved_parent.shapes.delete_all
       end
@@ -75,7 +75,7 @@ describe 'embeds_many associations' do
       include_examples 'does not delete the target from the database'
     end
 
-    context "using #destroy_all" do
+    context 'using #destroy_all' do
       before do
         unsaved_parent.shapes.destroy_all
       end
@@ -87,7 +87,7 @@ describe 'embeds_many associations' do
   context 'assigning attributes to the same association' do
     context 'setting then clearing' do
       let(:canvas) do
-        Canvas.create!(shapes: [Shape.new])
+        Canvas.create!(shapes: [ Shape.new ])
       end
 
       shared_examples 'persists correctly' do
@@ -100,7 +100,7 @@ describe 'embeds_many associations' do
 
       context 'via assignment operator' do
         before do
-          canvas.shapes = [Shape.new, Shape.new]
+          canvas.shapes = [ Shape.new, Shape.new ]
           canvas.shapes = []
           canvas.save!
         end
@@ -110,8 +110,8 @@ describe 'embeds_many associations' do
 
       context 'via attributes=' do
         before do
-          canvas.attributes = {shapes: [Shape.new, Shape.new]}
-          canvas.attributes = {shapes: []}
+          canvas.attributes = { shapes: [ Shape.new, Shape.new ] }
+          canvas.attributes = { shapes: [] }
           canvas.save!
         end
 
@@ -120,7 +120,7 @@ describe 'embeds_many associations' do
 
       context 'via assign_attributes' do
         before do
-          canvas.assign_attributes(shapes: [Shape.new, Shape.new])
+          canvas.assign_attributes(shapes: [ Shape.new, Shape.new ])
           canvas.assign_attributes(shapes: [])
           canvas.save!
         end
@@ -131,7 +131,7 @@ describe 'embeds_many associations' do
 
     context 'clearing then setting' do
       let(:canvas) do
-        Canvas.create!(shapes: [Shape.new])
+        Canvas.create!(shapes: [ Shape.new ])
       end
 
       shared_examples 'persists correctly' do
@@ -145,7 +145,7 @@ describe 'embeds_many associations' do
       context 'via assignment operator' do
         before do
           canvas.shapes = []
-          canvas.shapes = [Shape.new, Shape.new]
+          canvas.shapes = [ Shape.new, Shape.new ]
           canvas.save!
         end
 
@@ -154,8 +154,8 @@ describe 'embeds_many associations' do
 
       context 'via attributes=' do
         before do
-          canvas.attributes = {shapes: []}
-          canvas.attributes = {shapes: [Shape.new, Shape.new]}
+          canvas.attributes = { shapes: [] }
+          canvas.attributes = { shapes: [ Shape.new, Shape.new ] }
           canvas.save!
         end
 
@@ -165,7 +165,7 @@ describe 'embeds_many associations' do
       context 'via assign_attributes' do
         before do
           canvas.assign_attributes(shapes: [])
-          canvas.assign_attributes(shapes: [Shape.new, Shape.new])
+          canvas.assign_attributes(shapes: [ Shape.new, Shape.new ])
           canvas.save!
         end
 
@@ -175,7 +175,7 @@ describe 'embeds_many associations' do
 
     context 'updating a child then clearing' do
       let(:canvas) do
-        Canvas.create!(shapes: [Shape.new])
+        Canvas.create!(shapes: [ Shape.new ])
       end
 
       shared_examples 'persists correctly' do
@@ -202,7 +202,7 @@ describe 'embeds_many associations' do
       context 'via attributes=' do
         before do
           canvas.shapes.first.x = 1
-          canvas.attributes = {shapes: []}
+          canvas.attributes = { shapes: [] }
           canvas.save!
         end
 
@@ -222,7 +222,7 @@ describe 'embeds_many associations' do
 
     context 'including duplicates in the assignment' do
       let(:canvas) do
-        Canvas.create!(shapes: [Shape.new])
+        Canvas.create!(shapes: [ Shape.new ])
       end
 
       shared_examples 'persists correctly' do
@@ -266,13 +266,14 @@ describe 'embeds_many associations' do
     let(:klass) do
       Class.new do
         include Mongoid::Document
+
         embeds_many :addresses
       end
     end
 
     it 'loads the association correctly' do
-      expect { klass }.to_not raise_error
-      expect { klass.new.addresses }.to_not raise_error
+      expect { klass }.not_to raise_error
+      expect { klass.new.addresses }.not_to raise_error
       expect(klass.new.addresses.build).to be_a Address
     end
   end
@@ -298,7 +299,7 @@ describe 'embeds_many associations' do
               comments_attributes: [
                 {
                   _id: grandchild.id,
-                  content: updated_grandchild_content,
+                  content: updated_grandchild_content
                 }
               ]
             }
@@ -309,7 +310,7 @@ describe 'embeds_many associations' do
       context 'when the grandchild is invalid' do
         let(:updated_grandchild_content) { '' } # 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)
@@ -318,7 +319,7 @@ describe 'embeds_many associations' do
       end
 
       context 'when the grandchild is valid' do
-        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)
@@ -327,4 +328,20 @@ describe 'embeds_many associations' do
       end
     end
   end
+
+  context 'when a hash is provided instead of an array for an embeds_many association' do
+    let(:post) { EmbedsManySpec::Post.new(title: 'Broken post', comments: { content: 'Comment' }) }
+
+    it 'does not raise an error on initialization' do
+      expect { post }.not_to raise_error
+    end
+
+    it 'does not raise an error when accessing the association' do
+      expect { post.comments }.not_to raise_error
+    end
+
+    it 'allows building new documents on the association' do
+      expect(post.comments.build).to be_a EmbedsManySpec::Comment
+    end
+  end
 end

data/spec/integration/associations/embeds_one_spec.rb

@@ -12,7 +12,7 @@ describe 'embeds_one associations' do
       let!(:palette) { canvas.palette }
 
       it 'does not destroy the dependent object' do
-        canvas.palette = canvas.palette
+        canvas.palette = canvas.palette # rubocop:disable Lint/SelfAssignment
         canvas.save!
         canvas.reload
         expect(canvas.palette).to eq palette
@@ -24,6 +24,7 @@ describe 'embeds_one associations' do
     let(:klass) do
       Class.new do
         include Mongoid::Document
+
         embeds_one :address
       end
     end