mongoid 8.1.5 → 9.0.0

data/spec/integration/matcher_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -28,87 +29,41 @@ describe 'Matcher operators' do
     context 'comparing millisecond precision' do
       let(:time_millis) {Time.utc(2021, 10, 25, 10, 30, 30, 581774)}
 
-      context "when compare_time_by_ms feature flag is set" do
-        config_override :compare_time_by_ms, true
-
-        context 'with exact match' do
-          let(:query) do
-            {'started_at' => time_millis}
-          end
-
-          it_behaves_like 'is true'
-
-          context 'and query has different timezone' do
-            let(:time_millis) do
-              Time.utc(2021, 10, 25, 10, 30, 30, 581345).in_time_zone("Stockholm")
-            end
-
-            it_behaves_like 'is true'
-          end
+      context 'with exact match' do
+        let(:query) do
+          {'started_at' => time_millis}
         end
 
-        context 'with $in' do
-          let(:query) do
-            {'started_at' => {:$in => [time_millis]}}
-          end
-
-          it_behaves_like 'is true'
-        end
+        it_behaves_like 'is true'
 
-        context 'when matching an element in an array' do
-          let(:document) do
-            Mop.new(:array_field => [time])
+        context 'and query has different timezone' do
+          let(:time_millis) do
+            Time.utc(2021, 10, 25, 10, 30, 30, 581345).in_time_zone("Stockholm")
           end
 
-          context 'with equals match' do
-            let(:query) do
-              {'array_field' => time_millis}
-            end
-
-            it_behaves_like 'is true'
-          end
+          it_behaves_like 'is true'
         end
       end
 
-      context "when compare_time_by_ms feature flag is not set" do
-        config_override :compare_time_by_ms, false
-
-        context 'with exact match' do
-          let(:query) do
-            {'started_at' => time_millis}
-          end
-
-          it_behaves_like 'is false'
-
-          context 'and query has different timezone' do
-            let(:time_millis) do
-              Time.utc(2021, 10, 25, 10, 30, 30, 581345).in_time_zone("Stockholm")
-            end
-
-            it_behaves_like 'is true'
-          end
+      context 'with $in' do
+        let(:query) do
+          {'started_at' => {:$in => [time_millis]}}
         end
 
-        context 'with $in' do
-          let(:query) do
-            {'started_at' => {:$in => [time_millis]}}
-          end
+        it_behaves_like 'is true'
+      end
 
-          it_behaves_like 'is false'
+      context 'when matching an element in an array' do
+        let(:document) do
+          Mop.new(:array_field => [time])
         end
 
-        context 'when matching an element in an array' do
-          let(:document) do
-            Mop.new(:array_field => [time])
+        context 'with equals match' do
+          let(:query) do
+            {'array_field' => time_millis}
           end
 
-          context 'with equals match' do
-            let(:query) do
-              {'array_field' => time_millis}
-            end
-
-            it_behaves_like 'is false'
-          end
+          it_behaves_like 'is true'
         end
       end
     end

data/spec/integration/persistence/range_field_spec.rb

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

data/spec/integration/server_query_spec.rb

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

data/spec/integration/shardable_spec.rb

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

data/spec/integration/stringified_symbol_field_spec.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 require "spec_helper"
 
 describe "StringifiedSymbol fields" do

data/spec/lite_spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
@@ -50,6 +51,28 @@ else
   TimeoutInterrupt = Timeout
 end
 
+STANDARD_TIMEOUTS = {
+  app: 500, # App tests under JRuby take a REALLY long time (over 5 minutes per test).
+  default: 30,
+}.freeze
+
+def timeout_type
+  if ENV['EXAMPLE_TIMEOUT'].to_i > 0
+    :custom
+  elsif SpecConfig.instance.app_tests?
+    :app
+  else
+    :default
+  end
+end
+
+def example_timeout_seconds
+  STANDARD_TIMEOUTS.fetch(
+    timeout_type,
+    (ENV['EXAMPLE_TIMEOUT'] || STANDARD_TIMEOUTS[:default]).to_i
+  )
+end
+
 RSpec.configure do |config|
   config.expect_with(:rspec) do |c|
     c.syntax = [:should, :expect]
@@ -60,22 +83,25 @@ RSpec.configure do |config|
   end
 
   if SpecConfig.instance.ci? && !%w(1 true yes).include?(ENV['INTERACTIVE']&.downcase)
-    timeout = if SpecConfig.instance.app_tests?
-      # 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
-      # we have some that run for more than 10 seconds in CI.
-      30
-    end
     config.around(:each) do |example|
-      TimeoutInterrupt.timeout(timeout) do
+      TimeoutInterrupt.timeout(example_timeout_seconds) do
         example.run
       end
     end
   end
 
+  def local_env(env = nil, &block)
+    around do |example|
+      env ||= block.call
+      saved_env = ENV.to_h
+      ENV.update(env)
+
+      example.run
+    ensure
+      ENV.replace(saved_env) if saved_env
+    end
+  end
+
   config.extend(Mrss::LiteConstraints)
 end
 

data/spec/mongoid/association/accessors_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -168,32 +169,14 @@ describe Mongoid::Association::Accessors do
       end
 
       context "when the association is set to nil first" do
-        context "when broken_updates feature flag is not set" do
-          config_override :broken_updates, false
-
-          let!(:name) do
-            person.build_name
-          end
-
-          it "returns true" do
-            person.name = nil
-            person.name = name
-            expect(person).to have_name
-          end
+        let!(:name) do
+          person.build_name
         end
 
-        context "when broken_updates feature flag is set" do
-          config_override :broken_updates, true
-
-          let!(:name) do
-            person.build_name
-          end
-
-          it "returns true" do
-            person.name = nil
-            person.name = name
-            expect(person).to have_name
-          end
+        it "returns true" do
+          person.name = nil
+          person.name = name
+          expect(person).to have_name
         end
       end
     end
@@ -625,7 +608,7 @@ describe Mongoid::Association::Accessors do
           it 'does not create an accessor for another field on the embedded document' do
             expect do
               persisted_person.passport.country
-            end.to raise_error(ActiveModel::MissingAttributeError)
+            end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'country' on Passport which was not loaded/)
           end
         end
 
@@ -655,7 +638,7 @@ describe Mongoid::Association::Accessors do
               it 'does not create an accessor for another field on the embedded document' do
                 expect do
                   persisted_person.passport.country
-                end.to raise_error(ActiveModel::MissingAttributeError)
+                end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'country' on Passport which was not loaded/)
               end
             end
 
@@ -717,7 +700,7 @@ describe Mongoid::Association::Accessors do
           it 'does not create an accessor for another field on the embedded document' do
             expect do
               persisted_person.phone_numbers.first.landline
-            end.to raise_error(ActiveModel::MissingAttributeError)
+            end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'landline' on Phone which was not loaded/)
           end
         end
 
@@ -746,7 +729,7 @@ describe Mongoid::Association::Accessors do
               it 'does not create an accessor for another field on the embedded document' do
                 expect do
                   persisted_person.phone_numbers.first.landline
-                end.to raise_error(ActiveModel::MissingAttributeError)
+                end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'landline' on Phone which was not loaded/)
               end
 
             end

data/spec/mongoid/association/auto_save_spec.rb

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

data/spec/mongoid/association/builders_spec.rb

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

data/spec/mongoid/association/constrainable_spec.rb

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

data/spec/mongoid/association/counter_cache_spec.rb

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

data/spec/mongoid/association/depending_spec.rb

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

data/spec/mongoid/association/eager_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -249,6 +250,55 @@ describe Mongoid::Association::EagerLoadable do
         context.eager_load(docs)
       end
     end
+
+    context "when including an embedded_in relation" do
+      let!(:account) { Account.create(name: "home", memberships: memberships) }
+      let(:memberships) { [ Membership.new(name: "his"), Membership.new(name: "hers") ] }
+      let(:criteria) { Account.includes(memberships: :account) }
+
+      it "loads the parent document" do
+        result = criteria.find_by(name: "home")
+        expect(result).to eq(account)
+        expect(result.memberships.first.account).to eq(account)
+      end
+    end
+
+    context "when including an embeds_many relation" do
+      let!(:account) { Account.create(name: "home", memberships: memberships) }
+      let(:memberships) { [ Membership.new(name: "his"), Membership.new(name: "hers") ] }
+      let(:criteria) { Account.includes(:memberships) }
+
+      it "loads the subdocuments" do
+        result = criteria.find_by(name: "home")
+        expect(result).to eq(account)
+        expect(result.memberships.count).to eq(2)
+      end
+    end
+
+    context "when including an embeds_one relation" do
+      let!(:person) { Person.create(username: "test", pet: pet) }
+      let(:pet) { Animal.new(name: "fido") }
+      let(:criteria) { Person.includes(:pet) }
+
+      it "loads the subdocument" do
+        result = criteria.find_by(username: "test")
+        expect(result).to eq(person)
+        expect(result.pet).to eq(pet)
+      end
+    end
+
+    context "when chaining a referenced association from an embedded relation" do
+      let!(:person) { Person.create(username: "test", messages: [ message ]) }
+      let!(:post) { Post.create(title: "notice", posteable: message) }
+      let(:message) { Message.new(body: "hello") }
+      let(:criteria) { Person.includes(messages: :post) }
+
+      it "loads the referenced association" do
+        result = criteria.find_by(username: "test")
+        expect(result).to eq(person)
+        expect(result.messages.first.post).to eq(post)
+      end
+    end
   end
 
   describe ".eager_loadable?" do

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './embeds_one_models'
@@ -156,20 +157,27 @@ describe Mongoid::Association::Embedded::EmbeddedIn do
   describe '#touchable?' do
 
     context 'when :touch is in the options' do
+      shared_examples_for ':touch is in the options' do
+        it 'returns the value in the options' do
+          expect(association.send(:touchable?)).to be(options[:touch])
+        end
+      end
 
-      let(:options) do
-        { touch: true}
+      context 'when the option is true' do
+        let(:options) { { touch: true } }
+        it_behaves_like ':touch is in the options'
       end
 
-      it 'returns true' do
-        expect(association.send(:touchable?)).to be(true)
+      context 'when the option is false' do
+        let(:options) { { touch: false } }
+        it_behaves_like ':touch is in the options'
       end
     end
 
     context 'when :touch is not in the options' do
 
-      it 'return false' do
-        expect(association.send(:touchable?)).to be(false)
+      it 'return the default value' do
+        expect(association.send(:touchable?)).to be(true)
       end
     end
   end
@@ -582,7 +590,11 @@ describe Mongoid::Association::Embedded::EmbeddedIn do
     context 'when the :class_name option is specified' do
 
       let(:options) do
-        { class_name: 'OtherContainer' }
+        # `touch: true` is the default (see MONGOID-5016), which means by
+        # default, callbacks are added to the referenced class. In this case,
+        # the class does not exist, so we must explicitly set `touch: false`
+        # to prevent Mongoid from attempting to load the bogus class.
+        { touch: false, class_name: 'OtherContainer' }
       end
 
       it 'returns the class name option' do

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

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

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

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

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 class EmmCongress
   include Mongoid::Document
@@ -104,6 +105,17 @@ class EmmOrder
   field :amount, type: Integer
 
   embedded_in :user, class_name: 'EmmUser'
+
+  embeds_many :surcharges, class_name: 'EmmSurcharge'
+end
+
+class EmmSurcharge
+  include Mongoid::Document
+
+  field :sku
+  field :amount, type: Integer
+
+  embedded_in :order, class_name: 'EmmOrder'
 end
 
 module EmmSpec
@@ -161,7 +173,11 @@ class EmmHatch
   include Mongoid::Document
 
   # No :class_name option on this association intentionally.
-  embedded_in :tank
+  # Also, re: MONGOID-5016, `touch: true` is the default, which means Mongoid
+  # will try to load the associated class in order to add relevant callbacks.
+  # We must set `touch: false` here to avoid Mongoid trying to load a
+  # non-existent class.
+  embedded_in :tank, touch: false
 end
 
 class EmmPost
@@ -224,4 +240,3 @@ class EmmChild
   field :order, type: Integer
   field :t
 end
-

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './embeds_many_models'
@@ -23,7 +24,7 @@ describe Mongoid::Association::Embedded::EmbedsMany do
       # has a default value specified in the model
       expect do
         legislator.b
-      end.to raise_error(ActiveModel::MissingAttributeError)
+      end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'b' on EmmLegislator which was not loaded/)
       expect(legislator.attributes.keys).to eq(['_id', 'a'])
     end
 
@@ -53,10 +54,10 @@ describe Mongoid::Association::Embedded::EmbedsMany do
         EmmCongress.where(name: 'foo').only(:_id).first
       end
 
-      it 'raises a MissingAttributeError' do
+      it 'raises AttributeNotLoaded' do
         expect do
           congress.legislators
-        end.to raise_error(ActiveModel::MissingAttributeError)
+        end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'legislators' on EmmCongress which was not loaded/)
       end
     end
   end

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 class EomParent
   include Mongoid::Document
@@ -50,7 +51,11 @@ class EomDnlChild
   include Mongoid::Document
 
   embedded_in :parent, class_name: 'EomDnlParent'
-  embedded_in :missing_parent, class_name: 'EomDnlMissingParent'
+
+  # `touch: false` is necessary here because Touchable tries to reference the
+  # associated class when it adds the callbacks for touching. See MONGOID-5016
+  # re: `touch: true` as the default for embedded_in associations.
+  embedded_in :missing_parent, touch: false, class_name: 'EomDnlMissingParent'
 end
 
 class EomAddress

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 require_relative './embeds_one_models'
@@ -21,7 +22,7 @@ describe Mongoid::Association::Embedded::EmbedsOne do
       # has a default value specified in the model
       expect do
         parent.child.b
-      end.to raise_error(ActiveModel::MissingAttributeError)
+      end.to raise_error(Mongoid::Errors::AttributeNotLoaded, /Attempted to access attribute 'b' on EomChild which was not loaded/)
       expect(parent.child.attributes.keys).to eq(['_id', 'a'])
     end
   end

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

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

data/spec/mongoid/association/macros_spec.rb

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

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

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

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

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