mongoid 7.1.6 → 7.1.10

data/spec/integration/callbacks_models.rb

@@ -0,0 +1,49 @@
+class Galaxy
+  include Mongoid::Document
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  embeds_many :stars
+
+  private
+
+  def set_age
+    self.age ||= 100_000
+  end
+end
+
+class Star
+  include Mongoid::Document
+
+  embedded_in :galaxy
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  embeds_many :planets
+
+  private
+
+  def set_age
+    self.age ||= 42_000
+  end
+end
+
+class Planet
+  include Mongoid::Document
+
+  embedded_in :star
+
+  field :age, type: Integer
+
+  before_validation :set_age
+
+  private
+
+  def set_age
+    self.age ||= 2_000
+  end
+end

data/spec/integration/callbacks_spec.rb

@@ -0,0 +1,216 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+require_relative './callbacks_models'
+
+describe 'callbacks integration tests' do
+  context 'when modifying attributes in a callback' do
+
+    context 'when creating top-level document' do
+      context 'top level document' do
+        let(:instance) do
+          Galaxy.create!
+        end
+
+        it 'writes the attribute value into the model' do
+          instance.age.should == 100_000
+        end
+
+        it 'persists the attribute value' do
+          Galaxy.find(instance.id).age.should == 100_000
+        end
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          let(:instance) do
+            Galaxy.create!(stars: [Star.new])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          let(:instance) do
+            Galaxy.create!(stars: [{}])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          let(:instance) do
+            Galaxy.create!(stars: [Star.new(
+              planets: [Planet.new],
+            )])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          let(:instance) do
+            Galaxy.create!(stars: [
+              planets: [{}],
+            ])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+
+    context 'when updating top-level document via #save' do
+      let!(:instance) do
+        Galaxy.create!
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.stars = [Star.new]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.stars = [{}]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.stars = [Star.new(planets: [Planet.new])]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.stars = [planets: [{}]]
+            instance.save!
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+
+    context 'when updating top-level document via #update_attributes' do
+      let!(:instance) do
+        Galaxy.create!
+      end
+
+      context 'embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.age.should == 42_000
+          end
+
+          it 'persists the attribute value' do
+            Galaxy.find(instance.id).stars.first.age.should == 42_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes(stars: [Star.new])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes(stars: [{}])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+
+      context 'nested embedded document' do
+        shared_examples 'persists the attribute value' do
+          it 'writes the attribute value into the model' do
+            instance.stars.first.planets.first.age.should == 2_000
+          end
+
+          it 'persists the attribute value' do
+            pending 'MONGOID-4476'
+
+            Galaxy.find(instance.id).stars.first.planets.first.age.should == 2_000
+          end
+        end
+
+        context 'set as a document instance' do
+          before do
+            instance.update_attributes(stars: [Star.new(planets: [Planet.new])])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+
+        context 'set as attributes on parent' do
+          before do
+            instance.update_attributes(stars: [planets: [{}]])
+          end
+
+          include_examples 'persists the attribute value'
+        end
+      end
+    end
+  end
+end

data/spec/integration/document_spec.rb

@@ -19,4 +19,25 @@ describe Mongoid::Document do
       DelegatingPatient.default_client.should be Mongoid.default_client
     end
   end
+
+  describe '#reload' do
+    context 'when changing shard key value' do
+      require_topology :sharded
+
+      let(:profile) do
+        # Profile shard_key :name
+        Profile.create!(name: "Alice")
+      end
+
+      it "successfully reloads the document after saving an update to the sharded field" do
+        expect(profile.name).to eq("Alice")
+        profile.name = "Bob"
+        profile.save!
+
+        profile.reload
+
+        expect(profile.name).to eq("Bob")
+      end
+    end
+  end
 end

data/spec/lite_spec_helper.rb

@@ -3,6 +3,7 @@
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "shared", "lib"))
 
 # Load byebug before mongoid, to place breakpoints in the lib methods.
 # But SpecConfig needs the driver code - require the driver here.
@@ -15,7 +16,7 @@ require "mongo"
 require 'pp'
 
 require 'support/spec_config'
-require 'support/lite_constraints'
+require 'mrss/lite_constraints'
 require "support/session_registry"
 
 unless SpecConfig.instance.ci?
@@ -50,11 +51,10 @@ RSpec.configure do |config|
     config.add_formatter(RSpec::Core::Formatters::JsonFormatter, File.join(File.dirname(__FILE__), '../tmp/rspec.json'))
   end
 
-  if SpecConfig.instance.ci?
+  if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
     timeout = if SpecConfig.instance.app_tests?
-      # Allow 5 minutes per test for the app tests, since they install
-      # gems for Rails applications which can take a long time.
-      300
+      # App tests under JRuby take a REALLY long time (over 5 minutes per test).
+      500
     else
       # Allow a max of 30 seconds per test.
       # Tests should take under 10 seconds ideally but it seems
@@ -68,7 +68,7 @@ RSpec.configure do |config|
     end
   end
 
-  config.extend(LiteConstraints)
+  config.extend(Mrss::LiteConstraints)
 end
 
 # require all shared examples

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

@@ -507,4 +507,54 @@ describe Mongoid::Association::Embedded::EmbeddedIn::Proxy do
       end
     end
   end
+
+  context "when the same class is embedded multiple times" do
+
+    let(:customer) do
+      Customer.new
+    end
+
+    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
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+
+        customer.save!
+
+        customer.home_address = CustomerAddress.new
+        customer.work_address = CustomerAddress.new
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+
+    context "inverse assignment" do
+
+      it "correctly sets the association for the embedded class" do
+        pending 'MONGOID-5039'
+
+        customer.work_address = CustomerAddress.new
+        customer.work_address.addressable = customer
+
+        expect(customer.home_address._association.store_as).to eq("home_address")
+        expect(customer.work_address._association.store_as).to eq("work_address")
+
+        expect(customer.home_address.instance_eval { _association.store_as }).to eq("home_address")
+        expect(customer.work_address.instance_eval { _association.store_as }).to eq("work_address")
+      end
+    end
+  end
 end

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

@@ -2416,13 +2416,26 @@ describe Mongoid::Association::Embedded::EmbedsMany::Proxy do
     end
 
     context "when providing a criteria class method" do
+      context "without keyword arguments" do
 
-      let(:addresses) do
-        person.addresses.california
+        let(:addresses) do
+          person.addresses.california
+        end
+
+        it "applies the criteria to the documents" do
+          expect(addresses).to eq([ address_one ])
+        end
       end
 
-      it "applies the criteria to the documents" do
-        expect(addresses).to eq([ address_one ])
+      context "with keyword arguments" do
+
+        let(:addresses) do
+          person.addresses.city_and_state(city: "Sacramento", state: "CA")
+        end
+
+        it "applies the criteria to the documents" do
+          expect(addresses).to eq([])
+        end
       end
     end
 

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

@@ -1332,4 +1332,21 @@ describe Mongoid::Association::Referenced::BelongsTo::Proxy do
       end
     end
   end
+
+  describe "#method_missing" do
+      let!(:person) do
+        Person.create
+      end
+
+      let!(:game) do
+        Game.create(person: person)
+      end
+
+    it 'handles keyword args' do
+      expect do
+        game.person.set_personal_data(ssn: '123', age: 25)
+      end.not_to raise_error
+    end
+
+  end
 end

data/spec/mongoid/atomic/paths_spec.rb

@@ -268,5 +268,46 @@ describe Mongoid::Atomic::Paths do
         end
       end
     end
+
+    context "when the same class is embedded in multiple associations" do
+
+      let(:customer) do
+        Customer.new
+      end
+
+      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
+
+          expect(customer.home_address.atomic_path).to eq("home_address")
+          expect(customer.work_address.atomic_path).to eq("work_address")
+
+          customer.save!
+
+          customer.home_address = CustomerAddress.new
+          customer.work_address = CustomerAddress.new
+
+          expect(customer.home_address.atomic_path).to eq("home_address")
+          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