mongoid 8.1.5 → 9.0.0

data/spec/integration/app_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -10,6 +11,15 @@ def check_call(cmd, **opts)
   Mrss::ChildProcessHelper.check_call(cmd, **opts)
 end
 
+def gem_version_argument(version)
+  "_#{version}_" if version
+end
+
+def insert_rails_gem_version(cmd)
+  gem_version = gem_version_argument(SpecConfig.instance.installed_rails_version)
+  cmd.tap { cmd[1,0] = gem_version if gem_version }
+end
+
 describe 'Mongoid application tests' do
   before(:all) do
     unless SpecConfig.instance.app_tests?
@@ -81,55 +91,78 @@ describe 'Mongoid application tests' do
     end
 
     # Exit should be either success or SIGTERM
-    [0, 15, 128 + 15].should include(status)
+    allowed_statuses = [0, 15, 128 + 15]
+    if RUBY_PLATFORM == 'java'
+      # Puma on JRuby exits with status 1 when it receives a TERM signal.
+      allowed_statuses << 1
+    end
+    allowed_statuses.should include(status)
 
     rv
   end
 
-  context 'new application - rails' do
-    it 'creates' do
-      install_rails
+  def prepare_new_rails_app(name)
+    install_rails
 
-      Dir.chdir(TMP_BASE) do
-        FileUtils.rm_rf('mongoid-test')
-        check_call(%w(rails new mongoid-test --skip-spring --skip-active-record), env: clean_env)
+    Dir.chdir(TMP_BASE) do
+      FileUtils.rm_rf(name)
+      check_call(insert_rails_gem_version(%W(rails new #{name} --skip-spring --skip-active-record)), env: clean_env)
 
-        Dir.chdir('mongoid-test') do
-          adjust_app_gemfile
-          check_call(%w(bundle install), env: clean_env)
+      Dir.chdir(name) do
+        adjust_rails_defaults
+        adjust_app_gemfile
+        check_call(%w(bundle install), env: clean_env)
 
-          check_call(%w(rails g model post), env: clean_env)
-          check_call(%w(rails g model comment post:belongs_to), env: clean_env)
+        yield
+      end
+    end
+  end
 
-          # https://jira.mongodb.org/browse/MONGOID-4885
-          comment_text = File.read('app/models/comment.rb')
-          comment_text.should =~ /belongs_to :post/
-          comment_text.should_not =~ /embedded_in :post/
-        end
+  context 'new application - rails' do
+    it 'creates' do
+      prepare_new_rails_app 'mongoid-test' do
+        check_call(%w(rails g model post), env: clean_env)
+        check_call(%w(rails g model comment post:belongs_to), env: clean_env)
+
+        # https://jira.mongodb.org/browse/MONGOID-4885
+        comment_text = File.read('app/models/comment.rb')
+        comment_text.should =~ /belongs_to :post/
+        comment_text.should_not =~ /embedded_in :post/
       end
     end
 
     it 'generates Mongoid config' do
-      install_rails
-
-      Dir.chdir(TMP_BASE) do
-        FileUtils.rm_rf('mongoid-test-config')
-        check_call(%w(rails new mongoid-test-config --skip-spring --skip-active-record), env: clean_env)
-
-        Dir.chdir('mongoid-test-config') do
-          adjust_app_gemfile
-          check_call(%w(bundle install), env: clean_env)
-
-          mongoid_config_file = File.join(TMP_BASE,'mongoid-test-config/config/mongoid.yml')
+      prepare_new_rails_app 'mongoid-test-config' do
+        mongoid_config_file = File.join(TMP_BASE, 'mongoid-test-config/config/mongoid.yml')
+
+        File.exist?(mongoid_config_file).should be false
+        check_call(%w(rails g mongoid:config), env: clean_env)
+        File.exist?(mongoid_config_file).should be true
+
+        config_text = File.read(mongoid_config_file)
+        expect(config_text).to match /mongoid_test_config_development/
+        expect(config_text).to match /mongoid_test_config_test/
+
+        Mongoid::Config::Introspection.options(include_deprecated: true).each do |opt|
+          if opt.deprecated?
+            # deprecated options should not be included
+            expect(config_text).not_to include "# #{opt.name}:"
+          else
+            block = "    #{opt.indented_comment(indent: 4)}\n" \
+                    "    # #{opt.name}: #{opt.default}\n"
+            expect(config_text).to include block
+          end
+        end
+      end
+    end
 
-          File.exist?(mongoid_config_file).should be false
-          check_call(%w(rails g mongoid:config), env: clean_env)
-          File.exist?(mongoid_config_file).should be true
+    it 'generates Mongoid initializer' do
+      prepare_new_rails_app 'mongoid-test-init' do
+        mongoid_initializer = File.join(TMP_BASE, 'mongoid-test-init/config/initializers/mongoid.rb')
 
-          config_text = File.read(mongoid_config_file)
-          config_text.should =~ /mongoid_test_config_development/
-          config_text.should =~ /mongoid_test_config_test/
-        end
+        File.exist?(mongoid_initializer).should be false
+        check_call(%w(rails g mongoid:config), env: clean_env)
+        File.exist?(mongoid_initializer).should be true
       end
     end
   end
@@ -272,7 +305,7 @@ describe 'Mongoid application tests' do
     gemfile_lines << "gem 'mongoid', path: '#{File.expand_path(BASE)}'\n"
     if rails_version
       gemfile_lines.delete_if do |line|
-        line =~ /rails/
+        line =~ /gem ['"]rails['"]/
       end
       if rails_version == 'master'
         gemfile_lines << "gem 'rails', git: 'https://github.com/rails/rails'\n"

data/spec/integration/associations/belongs_to_spec.rb

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

data/spec/integration/associations/embedded_dirty_spec.rb

@@ -1,4 +1,5 @@
 # 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,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 require_relative '../../mongoid/association/embedded/embeds_many_models'
@@ -178,8 +179,6 @@ describe 'embedded associations' do
         let(:parent) { EomParent.create! }
 
         it 'updates' do
-          pending 'https://jira.mongodb.org/browse/MONGOID-3252'
-
           first_updated_at = parent.updated_at
 
           parent.child = EomChild.new
@@ -193,8 +192,6 @@ describe 'embedded associations' do
         let(:parent) { EmmCongress.create! }
 
         it 'updates' do
-          pending 'https://jira.mongodb.org/browse/MONGOID-3252'
-
           first_updated_at = parent.updated_at
 
           parent.legislators << EmmLegislator.new
@@ -238,8 +235,6 @@ describe 'embedded associations' do
         let(:parent) { EomParent.create!(child: EomChild.new) }
 
         it 'updates' do
-          pending 'https://jira.mongodb.org/browse/MONGOID-3252'
-
           first_updated_at = parent.updated_at
 
           parent.child = nil
@@ -280,4 +275,78 @@ describe 'embedded associations' do
       expect(user.orders.sum(:amount)).to eq(500)
     end
   end
+
+  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),
+      ])
+    end
+
+    context 'when modifying first and removing second' do
+      it 'works correctly' do
+        user.orders[1].assign_attributes(amount: 10)
+        user.orders[0].destroy
+        user.save!
+        user.reload
+
+        user.orders.map do
+          |order| [order.sku, order.amount]
+        end.should == [[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(amount: 20)
+        user.save!
+        user.reload
+
+        user.orders.map do
+          |order| [order.sku, order.amount]
+        end.should == [[1, 1], [2, 20]]
+      end
+    end
+  end
+
+  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)]),
+      ])
+    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[0].destroy
+        user.save!
+        user.reload
+
+        user.orders.map do
+          |order| [order.sku, order.surcharges.first.amount]
+        end.should == [[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.save!
+        user.reload
+
+        user.orders.map do
+          |order| [order.sku, order.surcharges.first.amount]
+        end.should == [[1, 1], [2, 20]]
+      end
+    end
+  end
 end

data/spec/integration/associations/embeds_many_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/associations/embeds_one_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/associations/foreign_key_spec.rb

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

data/spec/integration/associations/foreign_key_spec_models.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module ForeignKeySpec
   class Company

data/spec/integration/associations/has_and_belongs_to_many_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/associations/has_many_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 require 'mongoid/association/referenced/has_many_models'

data/spec/integration/associations/has_one_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 require 'mongoid/association/referenced/has_one_models'

data/spec/integration/associations/nested_attributes_assignment_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/associations/reverse_population_spec.rb

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

data/spec/integration/associations/reverse_population_spec_models.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 module ReversePopulationSpec
   class Company

data/spec/integration/associations/scope_option_spec.rb

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

data/spec/integration/atomic/modifiers_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 

data/spec/integration/bson_regexp_raw_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/callbacks_models.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 class Galaxy
   include Mongoid::Document
   include Mongoid::Timestamps
@@ -23,7 +24,7 @@ class Star
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  embedded_in :galaxy
+  embedded_in :galaxy, touch: true
 
   field :age, type: Integer
   field :was_touched_after_parent, type: Mongoid::Boolean, default: false
@@ -47,7 +48,7 @@ class Planet
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  embedded_in :star
+  embedded_in :star, touch: true
 
   field :age, type: Integer
   field :was_touched_after_parent, type: Mongoid::Boolean, default: false

data/spec/integration/callbacks_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 require_relative './callbacks_models'
@@ -585,7 +586,7 @@ describe 'callbacks integration tests' do
 
   context 'cascade callbacks' do
     ruby_version_gte '3.0'
-    config_override :around_callbacks_for_embeds, false
+    require_mri
 
     let(:book) do
       Book.new

data/spec/integration/contextual/empty_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/criteria/alias_query_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -24,59 +25,27 @@ describe 'distinct on aliased fields' do
 
   let(:command) { event.command }
 
-  context 'when broken_alias_handling is not set' do
-    config_override :broken_alias_handling, false
-
-    context 'top level field' do
-      let(:query) do
-        Person.distinct(:test)
-      end
-
-      it 'expands the alias' do
-        query
-
-        command['key'].should == 't'
-      end
+  context 'top level field' do
+    let(:query) do
+      Person.distinct(:test)
     end
 
-    context 'embedded document field' do
-      let(:query) do
-        Person.distinct('phone_numbers.extension')
-      end
-
-      it 'expands the alias' do
-        query
+    it 'expands the alias' do
+      query
 
-        command['key'].should == 'phone_numbers.ext'
-      end
+      command['key'].should == 't'
     end
   end
 
-  context 'when broken_alias_handling is set' do
-    config_override :broken_alias_handling, true
-
-    context 'top level field' do
-      let(:query) do
-        Person.distinct(:test)
-      end
-
-      it 'expands the alias' do
-        query
-
-        command['key'].should == 't'
-      end
+  context 'embedded document field' do
+    let(:query) do
+      Person.distinct('phone_numbers.extension')
     end
 
-    context 'embedded document field' do
-      let(:query) do
-        Person.distinct('phone_numbers.extension')
-      end
-
-      it 'deos not expands the alias' do
-        query
+    it 'expands the alias' do
+      query
 
-        command['key'].should == 'phone_numbers.extension'
-      end
+      command['key'].should == 'phone_numbers.ext'
     end
   end
 end
@@ -103,59 +72,27 @@ describe 'pluck on aliased fields' do
 
   let(:command) { event.command }
 
-  context 'when broken_alias_handling is not set' do
-    config_override :broken_alias_handling, false
-
-    context 'top level field' do
-      let(:query) do
-        Person.pluck(:test)
-      end
-
-      it 'expands the alias' do
-        query
-
-        command['projection'].should == {'t' => true}
-      end
+  context 'top level field' do
+    let(:query) do
+      Person.pluck(:test)
     end
 
-    context 'embedded document field' do
-      let(:query) do
-        Person.pluck('phone_numbers.extension')
-      end
-
-      it 'expands the alias' do
-        query
+    it 'expands the alias' do
+      query
 
-        command['projection'].should == {'phone_numbers.ext' => true}
-      end
+      command['projection'].should == {'t' => true}
     end
   end
 
-  context 'when broken_alias_handling is set' do
-    config_override :broken_alias_handling, true
-
-    context 'top level field' do
-      let(:query) do
-        Person.pluck(:test)
-      end
-
-      it 'expands the alias' do
-        query
-
-        command['projection'].should == {'t' => true}
-      end
+  context 'embedded document field' do
+    let(:query) do
+      Person.pluck('phone_numbers.extension')
     end
 
-    context 'embedded document field' do
-      let(:query) do
-        Person.pluck('phone_numbers.extension')
-      end
-
-      it 'does not expand the alias' do
-        query
+    it 'expands the alias' do
+      query
 
-        command['projection'].should == {'phone_numbers.extension' => true}
-      end
+      command['projection'].should == {'phone_numbers.ext' => true}
     end
   end
 end

data/spec/integration/criteria/date_field_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/integration/criteria/default_scope_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 require 'spec_helper'
 
 describe 'Criteria and default scope' do

data/spec/integration/criteria/logical_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 require 'spec_helper'
 
 describe 'Criteria logical operations' do
@@ -26,34 +27,15 @@ describe 'Criteria logical operations' do
       expect(bands.to_a).to eq([sp])
     end
 
-    context "when broken_and feature flag is not set" do
-      config_override :broken_and, false
-
-      it 'combines existing `$and` clause in query and `where` condition' do
-        bands = Band.where(id: 1).and({year: {'$in' => [2020]}}, {year: {'$in' => [2021]}}).where(id: 2)
-        expect(bands.selector).to eq(
-          {
-            "_id"=>1,
-            "year"=>{"$in"=>[2020]},
-            "$and"=>[{"year"=>{"$in"=>[2021]}}, {"_id"=>2}]
-          }
-        )
-      end
-    end
-
-    context "when broken_and feature flag is set" do
-      config_override :broken_and, true
-
-      it 'combines existing `$and` clause in query and `where` condition' do
-        bands = Band.where(id: 1).and({year: {'$in' => [2020]}}, {year: {'$in' => [2021]}}).where(id: 2)
-        expect(bands.selector).to eq(
-          {
-            "_id"=>1,
-            "year"=>{"$in"=>[2020]},
-            "$and"=>[{"_id"=>2}]
-          }
-        )
-      end
+    it 'combines existing `$and` clause in query and `where` condition' do
+      bands = Band.where(id: 1).and({year: {'$in' => [2020]}}, {year: {'$in' => [2021]}}).where(id: 2)
+      expect(bands.selector).to eq(
+        {
+          "_id"=>1,
+          "year"=>{"$in"=>[2020]},
+          "$and"=>[{"year"=>{"$in"=>[2021]}}, {"_id"=>2}]
+        }
+      )
     end
   end
 

data/spec/integration/criteria/range_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -346,8 +347,6 @@ describe 'Queries with Range criteria' do
       end
     end
 
-    config_override :broken_alias_handling, false
-
     it 'returns objects within the range' do
       expect(Person.where("passport.passport_pages.num_stamps" => 10..18).to_a).to eq [person]
     end