mongoid 7.3.2 → 7.4.0

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class EmmCongress
   include Mongoid::Document
@@ -52,3 +51,19 @@ class EmmProduct
 
   field :name, type: String
 end
+
+class EmmInner
+  include Mongoid::Document
+
+  embeds_many :friends, :class_name => self.name, :cyclic => true
+  embedded_in :parent, :class_name => self.name, :cyclic => true
+
+  field :level, :type => Integer
+end
+
+class EmmOuter
+  include Mongoid::Document
+  embeds_many :inners, class_name: 'EmmInner'
+
+  field :level, :type => Integer
+end

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './embeds_many_models'

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -88,7 +87,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:name) do
@@ -174,7 +173,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
           context "when replacing an existing document" do
 
             let(:pet_owner) do
-              PetOwner.create
+              PetOwner.create!
             end
 
             let(:pet_one) do
@@ -207,7 +206,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
         context 'when the original document does not need to be unset because it will be replaced by the $set' do
 
           let!(:pet_owner) do
-            PetOwner.create(pet: pet_one)
+            PetOwner.create!(pet: pet_one)
           end
 
           let(:pet_one) do
@@ -280,7 +279,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:parent_shelf) do
-          Shelf.create
+          Shelf.create!
         end
 
         let(:child_shelf) do
@@ -312,7 +311,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
     context "when setting a new document multiple times in a row" do
 
       let(:parent) do
-        Parent.create
+        Parent.create!
       end
 
       before do
@@ -373,7 +372,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is persisted" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:name) do
@@ -462,7 +461,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the documents are not new records" do
 
         let(:parent_shelf) do
-          Shelf.create
+          Shelf.create!
         end
 
         let(:child_shelf) do
@@ -611,7 +610,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:name) do
@@ -656,7 +655,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:parent_shelf) do
-          Shelf.create
+          Shelf.create!
         end
 
         let!(:child_shelf) do
@@ -758,7 +757,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the parent is not a new record" do
 
         let(:person) do
-          Person.create
+          Person.create!
         end
 
         let!(:name) do
@@ -779,7 +778,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
       context "when the embedded document inherits its relationship" do
 
         let(:courier_job) do
-          CourierJob.create
+          CourierJob.create!
         end
 
         let(:old_child) do
@@ -848,7 +847,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when the embedded document has an array field" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:name) do
@@ -867,7 +866,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
 
       before do
         from_db.aliases = [ "Syd", "Sydney" ]
-        from_db.save
+        from_db.save!
       end
 
       it "sets the values of the array" do
@@ -883,7 +882,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when embedding a many under a one" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     before do
@@ -909,7 +908,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
         context "when saving the root" do
 
           before do
-            from_db.save
+            from_db.save!
           end
 
           it "persists the new document on the first save" do
@@ -923,15 +922,15 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when embedding a one under a many" do
 
     let!(:person) do
-      Person.create
+      Person.create!
     end
 
     let!(:address_one) do
-      person.addresses.create(street: "hobrecht")
+      person.addresses.create!(street: "hobrecht")
     end
 
     let!(:address_two) do
-      person.addresses.create(street: "kreuzberg")
+      person.addresses.create!(street: "kreuzberg")
     end
 
     context "when a parent was removed outside of mongoid" do
@@ -966,7 +965,7 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when embedded documents are stored without ids" do
 
     let!(:band) do
-      Band.create(name: "Moderat")
+      Band.create!(name: "Moderat")
     end
 
     before do
@@ -1013,9 +1012,9 @@ describe Mongoid::Association::Embedded::EmbedsOne::Proxy do
   context "when parent validation of child is set to false" do
 
     let(:building) do
-      building = Building.create
+      building = Building.create!
       building.building_address = BuildingAddress.new
-      building.save
+      building.save!
       building.reload
     end
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 # This file is added as an autoload target, but should never be actually
 # processed.

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 class EomParent
   include Mongoid::Document

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './embeds_one_models'

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 require_relative './embeds_one_models'

data/spec/mongoid/association/macros_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -407,7 +406,7 @@ describe Mongoid::Association::Macros do
               let(:default_require) { true }
 
               it 'does not require the association' do
-                expect(relation.save).to be(true)
+                expect(relation.save!).to be(true)
               end
             end
 
@@ -416,7 +415,7 @@ describe Mongoid::Association::Macros do
               let(:default_require) { false }
 
               it 'does not require the association' do
-                expect(relation.save).to be(true)
+                expect(relation.save!).to be(true)
               end
             end
           end
@@ -499,7 +498,7 @@ describe Mongoid::Association::Macros do
                 let(:default_require) { true }
 
                 it 'does not require the association' do
-                  expect(relation.save).to be(true)
+                  expect(relation.save!).to be(true)
                 end
               end
 
@@ -508,7 +507,7 @@ describe Mongoid::Association::Macros do
                 let(:default_require) { true }
 
                 it 'does not require the association' do
-                  expect(relation.save).to be(true)
+                  expect(relation.save!).to be(true)
                 end
               end
             end
@@ -527,7 +526,7 @@ describe Mongoid::Association::Macros do
                 let(:default_require) { true }
 
                 it 'does not require the association' do
-                  expect(relation.save).to be(true)
+                  expect(relation.save!).to be(true)
                 end
               end
 
@@ -536,7 +535,7 @@ describe Mongoid::Association::Macros do
                 let(:default_require) { false }
 
                 it 'does not require the association' do
-                  expect(relation.save).to be(true)
+                  expect(relation.save!).to be(true)
                 end
               end
             end
@@ -559,7 +558,7 @@ describe Mongoid::Association::Macros do
               let(:default_require) { true }
 
               it 'does not require the association' do
-                expect(relation.save).to be(true)
+                expect(relation.save!).to be(true)
               end
             end
 
@@ -568,7 +567,7 @@ describe Mongoid::Association::Macros do
               let(:default_require) { false }
 
               it 'does not require the association' do
-                expect(relation.save).to be(true)
+                expect(relation.save!).to be(true)
               end
             end
           end
@@ -617,7 +616,7 @@ describe Mongoid::Association::Macros do
         let(:default_require) { false }
 
         it 'does not require the association' do
-          expect(relation.save).to be(true)
+          expect(relation.save!).to be(true)
         end
       end
     end

data/spec/mongoid/association/nested/many_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/association/nested/one_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/association/options_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

data/spec/mongoid/association/polymorphic_spec.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 

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

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
 
 require "spec_helper"
 
@@ -15,8 +14,12 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
       association.build(base, object)
     end
 
+    let(:options) do
+      {}
+    end
+
     let(:association) do
-      Post.relations['person']
+      Mongoid::Association::Referenced::BelongsTo.new(Post, :person, options)
     end
 
     context "when provided an id" do
@@ -24,7 +27,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
       context "when the object is an object id" do
 
         let!(:person) do
-          Person.create(_id: object)
+          Person.create!(_id: object, username: 'Bob')
         end
 
         let(:object) do
@@ -32,7 +35,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
         end
 
         before do
-          expect(Person).to receive(:where).with(association.primary_key => object).and_call_original
+          expect_any_instance_of(Mongoid::Criteria).to receive(:where).with(association.primary_key => object).and_call_original
         end
 
         it "sets the document" do
@@ -40,6 +43,41 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
         end
       end
 
+      context "when scope is specified" do
+
+        let!(:person) do
+          Person.create(_id: object, username: 'Bob')
+        end
+
+        let(:object) do
+          BSON::ObjectId.new
+        end
+
+        let(:options) do
+          {
+            scope: -> { where(username: 'Bob') }
+          }
+        end
+
+        context "when document satisfies scope" do
+
+          it "sets the document" do
+            expect(document).to eq(person)
+          end
+        end
+
+        context "when document does not satisfy scope" do
+
+          let!(:person) do
+            Person.create(_id: object, username: 'Bruce')
+          end
+
+          it "returns nil" do
+            expect(document).to eq(nil)
+          end
+        end
+      end
+
       context 'when the id is nil' do
 
         let(:object) do
@@ -58,7 +96,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
       context "when the id does not correspond to a document in the database" do
 
         let!(:person) do
-          Person.create
+          Person.create!
         end
 
         let(:object) do
@@ -66,7 +104,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
         end
 
         before do
-          expect(Person).to receive(:where).with(association.primary_key => object).and_call_original
+          expect_any_instance_of(Mongoid::Criteria).to receive(:where).with(association.primary_key => object).and_call_original
         end
 
         it 'returns nil' do
@@ -77,7 +115,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
       context "when the object is an integer" do
 
         let!(:person) do
-          Person.create(_id: object)
+          Person.create!(_id: object)
         end
 
         let(:object) do
@@ -85,7 +123,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
         end
 
         before do
-          expect(Person).to receive(:where).with(association.primary_key => object).and_call_original
+          expect_any_instance_of(Mongoid::Criteria).to receive(:where).with(association.primary_key => object).and_call_original
         end
 
         it "sets the document" do
@@ -97,7 +135,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
     context "when provided a object" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:object) do
@@ -105,7 +143,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
       end
 
       before do
-        expect(Person).not_to receive(:where)
+        expect_any_instance_of(Mongoid::Criteria).not_to receive(:where)
       end
 
       it "returns the object" do
@@ -116,7 +154,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
     context "when the document is persisted" do
 
       let!(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:game) do
@@ -131,16 +169,16 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
     context 'setting an associated document to nil' do
 
       let(:person) do
-        Person.create
+        Person.create!
       end
 
       let(:game) do
-        Game.create(person: person)
+        Game.create!(person: person)
       end
 
       before do
         game.person = nil
-        game.save
+        game.save!
       end
 
       it 'sets the person_id to nil' do
@@ -156,11 +194,11 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
   describe '#substitute' do
 
     let(:person) do
-      Person.create
+      Person.create!
     end
 
     let(:game) do
-      Game.create(person: person)
+      Game.create!(person: person)
     end
 
     context 'setting an associated document to nil' do
@@ -181,7 +219,7 @@ describe Mongoid::Association::Referenced::BelongsTo::Buildable do
     context 'setting an associated document to other doc' do
 
       let(:other_person) do
-        Person.create
+        Person.create!
       end
 
       before do