mongoid 7.5.4 → 8.1.7

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

@@ -133,7 +133,7 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
             it "detaches the previous relation" do
               expect {
                 game.reload
-              }.to raise_error(Mongoid::Errors::DocumentNotFound)
+              }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Game with id\(s\)/)
             end
           end
         end
@@ -1139,4 +1139,110 @@ describe Mongoid::Association::Referenced::HasOne::Proxy do
       end
     end
   end
+
+  context "when there is a foreign key in the aliased associations" do
+    it "has the correct aliases" do
+      # Instances of Driver do not respond to vehicle_id.
+      expect(Driver.aliased_associations.key?("vehicle_id")).to be false
+      expect(Vehicle.aliased_associations.key?("driver_id")).to be false
+      expect(Vehicle.aliased_fields["driver"]).to eq("driver_id")
+    end
+  end
+
+  context "when the document is not persisted and the association is invalid" do
+
+    before do
+      class HomParent
+        include Mongoid::Document
+        has_one :child, class_name: "HomChild"
+        field :name
+        validates :name, presence: true
+      end
+
+      class HomChild; include Mongoid::Document; end
+
+      belongs_to
+      child.parent = parent
+      child.save
+    end
+
+    after do
+      Object.send(:remove_const, :HomParent)
+      Object.send(:remove_const, :HomChild)
+    end
+
+    let(:belongs_to) do
+      HomChild.belongs_to :parent, autosave: true, validate: false, optional: optional
+    end
+
+    let(:child) { HomChild.new }
+    let(:parent) { HomParent.new }
+
+
+    context "when belongs_to_required_by_default is true" do
+      config_override :belongs_to_required_by_default, true
+
+      context "when optional is true" do
+        let(:optional) { true }
+
+        it "persists the child with the parent_id" do
+          expect(HomChild.first.parent_id).to eq(parent._id)
+          expect(HomParent.count).to eq(0)
+        end
+      end
+
+      context "when optional is false" do
+        let(:optional) { false }
+
+        it "doesn't persist the parent or the child" do
+          expect(HomChild.count).to eq(0)
+          expect(HomParent.count).to eq(0)
+        end
+      end
+
+      context "when optional is not set" do
+        let(:belongs_to) do
+          HomChild.belongs_to :parent, autosave: true, validate: false
+        end
+
+        it "doesn't persist the parent or the child" do
+          expect(HomChild.count).to eq(0)
+          expect(HomParent.count).to eq(0)
+        end
+      end
+    end
+
+    context "when belongs_to_required_by_default is false" do
+      config_override :belongs_to_required_by_default, false
+
+      context "when optional is true" do
+        let(:optional) { true }
+
+        it "persists the child with the parent_id" do
+          expect(HomChild.first.parent_id).to eq(parent._id)
+          expect(HomParent.count).to eq(0)
+        end
+      end
+
+      context "when optional is false" do
+        let(:optional) { false }
+
+        it "doesn't persist the parent or the child" do
+          expect(HomChild.count).to eq(0)
+          expect(HomParent.count).to eq(0)
+        end
+      end
+
+      context "when optional is not set" do
+        let(:belongs_to) do
+          HomChild.belongs_to :parent, autosave: true, validate: false
+        end
+
+        it "persists the child with the parent_id" do
+          expect(HomChild.first.parent_id).to eq(parent._id)
+          expect(HomParent.count).to eq(0)
+        end
+      end
+    end
+  end
 end

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

@@ -95,3 +95,19 @@ class HomAnimal
 
   belongs_to :trainer, class_name: 'HomTrainer', scope: -> { where(name: 'Dave') }
 end
+
+class HomPost
+  include Mongoid::Document
+
+  field :title, type: String
+
+  has_one :comment, inverse_of: :post, class_name: 'HomComment'
+end
+
+class HomComment
+  include Mongoid::Document
+
+  field :content, type: String
+
+  belongs_to :post, inverse_of: :comment, optional: true, class_name: 'HomPost'
+end

data/spec/mongoid/association/syncable_spec.rb

@@ -3,9 +3,9 @@
 require "spec_helper"
 
 describe "Syncable Association" do
+  config_override :raise_not_found_error, true
 
   before(:all) do
-    Mongoid.raise_not_found_error = true
     Person._synced(Person.relations["preferences"])
     Person.has_and_belongs_to_many :preferences
     Preference.has_and_belongs_to_many :people
@@ -496,4 +496,18 @@ describe "Syncable Association" do
       expect(dog.reload.breed_ids).to eq([ breed.id ])
     end
   end
+
+  context "when setting one document on unpersisted HABTM association" do
+    let!(:dog) { Dog.create! }
+    let!(:breed) { Breed.new }
+
+    before do
+      breed.dogs = Dog.all
+      breed.save!
+    end
+
+    it "sets the foreign key on the other side" do
+      expect(dog.reload.breed_ids).to eq([breed._id])
+    end
+  end
 end

data/spec/mongoid/atomic/paths_spec.rb

@@ -329,7 +329,6 @@ describe Mongoid::Atomic::Paths do
       context "assignment after saving" do
 
         it "correctly sets the association for the embedded class" do
-          pending 'MONGOID-5039'
 
           customer.home_address = CustomerAddress.new
           customer.work_address = CustomerAddress.new
@@ -346,19 +345,6 @@ describe Mongoid::Atomic::Paths do
           expect(customer.work_address.atomic_path).to eq("work_address")
         end
       end
-
-      context "inverse assignment" do
-
-        it "correctly returns the path for each embedded class" do
-          pending 'MONGOID-5039'
-
-          customer.work_address = CustomerAddress.new
-          customer.work_address.addressable = customer
-
-          expect(customer.home_address.atomic_path).to eq("home_address")
-          expect(customer.work_address.atomic_path).to eq("work_address")
-        end
-      end
     end
   end
 end

data/spec/mongoid/attributes/nested_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require_relative '../association/referenced/has_many_models'
+require_relative '../association/referenced/has_and_belongs_to_many_models'
+require_relative './nested_spec_models'
 
 describe Mongoid::Attributes::Nested do
 
@@ -1353,7 +1356,7 @@ describe Mongoid::Attributes::Nested do
                 expect {
                   person.addresses_attributes =
                     { "foo" => { "id" => "test", "street" => "Test" } }
-                }.to raise_error(Mongoid::Errors::DocumentNotFound)
+                }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Address with id\(s\)/)
               end
             end
           end
@@ -3012,7 +3015,7 @@ describe Mongoid::Attributes::Nested do
                       { "0" =>
                         { "id" => BSON::ObjectId.new.to_s, "title" => "Rogue" }
                       }
-                  }.to raise_error(Mongoid::Errors::DocumentNotFound)
+                  }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Post with id\(s\)/)
                 end
               end
             end
@@ -3046,7 +3049,7 @@ describe Mongoid::Attributes::Nested do
                 expect {
                   person.posts_attributes =
                     { "foo" => { "id" => "test", "title" => "Test" } }
-                }.to raise_error(Mongoid::Errors::DocumentNotFound)
+                }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Post with id\(s\)/)
               end
             end
           end
@@ -3763,7 +3766,7 @@ describe Mongoid::Attributes::Nested do
                 expect {
                   person.preferences_attributes =
                     { "foo" => { "id" => "test", "name" => "Test" } }
-                }.to raise_error(Mongoid::Errors::DocumentNotFound)
+                }.to raise_error(Mongoid::Errors::DocumentNotFound, /Document\(s\) not found for class Preference with id\(s\)/)
               end
             end
           end
@@ -4395,13 +4398,6 @@ describe Mongoid::Attributes::Nested do
 
     context "when nesting multiple levels and parent is timestamped" do
 
-      around do |example|
-        original_relations = Location.relations
-        Location.embedded_in :address, touch: true
-        example.run
-        Location.relations = original_relations
-      end
-
       after do
         Address.reset_callbacks(:save)
       end
@@ -4928,4 +4924,77 @@ describe Mongoid::Attributes::Nested do
       end
     end
   end
+
+  context "when destroying has_many child using nested attributes" do
+    let(:school) do
+      School.create
+    end
+
+    let!(:student) do
+      school.students.create
+    end
+
+    before do
+      school.attributes = {
+        '_id': school.id,
+        'students_attributes': [{
+          '_id': student.id,
+          '_destroy': 1
+          }]
+        }
+    end
+
+    it "is able to access the parent in the after_destroy callback" do
+      expect(school.after_destroy_triggered).to eq(true)
+    end
+  end
+
+  context "when destroying has_many child using nested attributes" do
+    let(:school) do
+      HabtmmSchool.create!(students: [student])
+    end
+
+    let(:student) do
+      HabtmmStudent.create!
+    end
+
+    before do
+      student.schools << school
+      school.attributes = {
+        '_id': school.id,
+        'students_attributes': [{
+          '_id': student.id,
+          '_destroy': 1
+          }]
+        }
+    end
+
+    it "is able to access the parent in the after_destroy callback" do
+      expect(school.reload.after_destroy_triggered).to eq(true)
+    end
+  end
+
+  context "when using a multi-leveled nested attribute on a referenced association" do
+    let(:author) { NestedAuthor.create }
+    let(:one_level_params) { { post_attributes: { title: 'test' } } }
+    let(:two_levels_params) { { post_attributes: { comments_attributes: [ { body: 'test' } ] } } }
+
+    it "creates a 1st-depth child model" do
+      author.update_attributes(one_level_params)
+      expect(author.post.persisted?).to be true
+    end
+
+    it "creates a 1st-depth child model, and a 2nd-depth child model" do
+      author.update_attributes(two_levels_params)
+      expect(author.post.comments.count).to eq 1
+    end
+
+    context "the 1st-depth child model already exists" do
+      it "creates a 2nd-depth child model" do
+        author.create_post(title: 'test')
+        author.update_attributes(two_levels_params)
+        expect(author.post.comments.count).to eq 1
+      end
+    end
+  end
 end

data/spec/mongoid/attributes/nested_spec_models.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+class NestedAuthor
+  include Mongoid::Document
+
+  field :name, type: String
+  has_one :post, class_name: "NestedPost"
+  accepts_nested_attributes_for :post
+end
+
+class NestedComment
+  include Mongoid::Document
+
+  field :body, type: String
+  belongs_to :post, class_name: "NestedPost"
+end
+
+class NestedPost
+  include Mongoid::Document
+
+  field :title, type: String
+  belongs_to :author, class_name: "NestedAuthor"
+  has_many :comments, class_name: "NestedComment"
+  accepts_nested_attributes_for :comments
+end
+
+class NestedBook
+  include Mongoid::Document
+
+  embeds_one :cover, class_name: "NestedCover"
+  embeds_many :pages, class_name: "NestedPage"
+
+  accepts_nested_attributes_for :cover, :pages
+end
+
+class NestedCover
+  include Mongoid::Document
+
+  field :title, type: String
+  embedded_in :book, class_name: "NestedBook"
+end
+
+class NestedPage
+  include Mongoid::Document
+
+  field :number, type: Integer
+  embedded_in :book, class_name: "NestedBook"
+end

data/spec/mongoid/attributes/projector_spec.rb

@@ -5,11 +5,7 @@ require "spec_helper"
 describe Mongoid::Attributes::Projector do
   Dir[File.join(File.dirname(__FILE__), 'projector_data', '*.yml')].sort.each do |path|
     context File.basename(path) do
-      specs = if RUBY_VERSION.start_with?("2.5")
-                YAML.safe_load(File.read(path), [], [], true)
-              else
-                YAML.safe_load(File.read(path), aliases: true)
-              end
+      specs = YAML.safe_load(File.read(path), aliases: true)
 
       specs.each do |spec|
         context spec['name'] do