mongoid 7.0.7 → 7.0.8

data/spec/integration/associations/embedded_spec.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+require_relative '../../mongoid/association/embedded/embeds_many_models'
+require_relative '../../mongoid/association/embedded/embeds_one_models'
+
+describe 'embedded associations' do
+
+  describe 'parent association' do
+    let(:parent) do
+      parent_cls.new
+    end
+
+    context 'embeds_one' do
+
+      shared_examples 'is set' do
+        it 'is set' do
+          parent.child = child_cls.new
+          parent.child.parent.should == parent
+        end
+      end
+
+      context 'class_name set without leading ::' do
+        let(:parent_cls) { EomParent }
+        let(:child_cls) { EomChild }
+
+        it_behaves_like 'is set'
+      end
+
+      context 'class_name set with leading ::' do
+        let(:parent_cls) { EomCcParent }
+        let(:child_cls) { EomCcChild }
+
+        it_behaves_like 'is set'
+      end
+    end
+
+    context 'embeds_many' do
+
+      let(:child) { parent.legislators.new }
+
+      shared_examples 'is set' do
+        it 'is set' do
+          child.congress.should == parent
+        end
+      end
+
+      context 'class_name set without leading ::' do
+        let(:parent_cls) { EmmCongress }
+
+        it_behaves_like 'is set'
+      end
+
+      context 'class_name set with leading ::' do
+        let(:parent_cls) { EmmCcCongress }
+
+        it_behaves_like 'is set'
+      end
+    end
+  end
+end

data/spec/integration/document_spec.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mongoid::Document do
+  context 'when including class uses delegate' do
+    let(:patient) do
+      DelegatingPatient.new(
+        email: Email.new(address: 'test@example.com'),
+      )
+    end
+
+    it 'works for instance level delegation' do
+      patient.address.should == 'test@example.com'
+    end
+
+    it 'works for class level delegation' do
+      DelegatingPatient.default_client.should be Mongoid.default_client
+    end
+  end
+end

data/spec/lite_spec_helper.rb

@@ -44,11 +44,18 @@ RSpec.configure do |config|
   end
 
   if SpecConfig.instance.ci?
-    # 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.
+    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
+    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(30) do
+      TimeoutInterrupt.timeout(timeout) do
         example.run
       end
     end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class EmmCongress
+  include Mongoid::Document
+
+  embeds_many :legislators, class_name: 'EmmLegislator'
+
+  field :name, type: String
+end
+
+class EmmLegislator
+  include Mongoid::Document
+
+  embedded_in :congress, class_name: 'EmmCongress'
+
+  field :a, type: Integer, default: 0
+  field :b, type: Integer, default: 0
+end
+
+# Models with associations with :class_name as a :: prefixed string
+
+class EmmCcCongress
+  include Mongoid::Document
+
+  embeds_many :legislators, class_name: '::EmmCcLegislator'
+
+  field :name, type: String
+end
+
+class EmmCcLegislator
+  include Mongoid::Document
+
+  embedded_in :congress, class_name: '::EmmCcCongress'
+
+  field :a, type: Integer, default: 0
+  field :b, type: Integer, default: 0
+end
+
+class EmmManufactory
+  include Mongoid::Document
+
+  embeds_many :products, order: :id.desc, class_name: 'EmmProduct'
+end
+
+
+class EmmProduct
+  include Mongoid::Document
+
+  embedded_in :manufactory, class_name: 'EmmManufactory'
+
+  field :name, type: String
+end

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

@@ -646,6 +646,16 @@ describe Mongoid::Association::Embedded::EmbedsMany do
       it 'returns the class name option' do
         expect(association.klass).to eq(_class)
       end
+
+      context 'when the class name is prefixed with ::' do
+        let(:options) do
+          { class_name: '::OtherEmbeddedObject' }
+        end
+
+        it 'returns the class name option' do
+          expect(association.klass).to eq(_class)
+        end
+      end
     end
 
     context 'when the class_name option is not specified' do

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

@@ -453,8 +453,6 @@ describe Mongoid::Association::Embedded::EmbedsOne do
             end
 
             it 'returns the inverse in an array' do
-              pending 'MONGOID-4751'
-
               inverses = association.inverses
               expect(inverses).to eq([:parent])
             end

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

@@ -2686,7 +2686,8 @@ describe Mongoid::Association::Referenced::HasAndBelongsToMany::Proxy do
         expect(preferences).to eq([ preference_one ])
       end
 
-      context 'when providing a collation', if: collation_supported? do
+      context 'when providing a collation' do
+        min_server_version '3.4'
 
         let(:preferences) do
           person.preferences.where(name: "FIRST").collation(locale: 'en_US', strength: 2).to_a

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

@@ -2904,7 +2904,8 @@ describe Mongoid::Association::Referenced::HasMany::Proxy do
         expect(posts).to eq([ post_one ])
       end
 
-      context 'when providing a collation', if: collation_supported? do
+      context 'when providing a collation' do
+        min_server_version '3.4'
 
         let(:posts) do
           person.posts.where(title: "FIRST").collation(locale: 'en_US', strength: 2)

data/spec/mongoid/clients/options_spec.rb

@@ -11,7 +11,7 @@ describe Mongoid::Clients::Options do
     Mongoid::Clients.clients.clear
   end
 
-  describe '#with', if: non_legacy_server? do
+  describe '#with' do
 
     context 'when passing some options' do
 
@@ -72,7 +72,7 @@ describe Mongoid::Clients::Options do
         end
       end
 
-      context 'when passing a block', if: testing_locally? do
+      context 'when passing a block' do
 
         let!(:connections_before) do
           Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
@@ -284,7 +284,7 @@ describe Mongoid::Clients::Options do
     end
   end
 
-  describe '.with', if: non_legacy_server? do
+  describe '.with' do
 
     context 'when passing some options' do
 
@@ -362,7 +362,7 @@ describe Mongoid::Clients::Options do
         end
       end
 
-      context 'when passing a block', if: testing_locally? do
+      context 'when passing a block' do
 
         let!(:connections_before) do
           test_model.mongo_client.database.command(serverStatus: 1).first['connections']['current']

data/spec/mongoid/clients/sessions_spec.rb

@@ -40,7 +40,8 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a session is used on a model class' do
 
-    context 'when sessions are supported', if: sessions_supported? do
+    context 'when sessions are supported' do
+      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -169,7 +170,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported', unless: sessions_supported? do
+    context 'when sessions are not supported' do
+      max_server_version '3.4'
 
       let!(:error) do
         e = nil
@@ -196,7 +198,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported', if: sessions_supported? do
+    context 'when sessions are supported' do
+      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -313,7 +316,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are not supported', unless: sessions_supported? do
+    context 'when sessions are not supported' do
+      max_server_version '3.4'
 
       let!(:error) do
         e = nil

data/spec/mongoid/clients/transactions_spec.rb

@@ -52,7 +52,8 @@ describe Mongoid::Clients::Sessions do
 
   context 'when a transaction is used on a model class' do
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -188,7 +189,10 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       let!(:error) do
         e = nil
@@ -219,7 +223,8 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when transactions are supported', if: testing_transactions? do
+    context 'when transactions are supported' do
+      require_transaction_support
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -342,16 +347,23 @@ describe Mongoid::Clients::Sessions do
       end
     end
 
-    context 'when sessions are supported but transactions are not', if: sessions_supported? && !testing_transactions? do
+    context 'when sessions are supported but transactions are not' do
+      min_server_version '3.6'
+      # Could also test 4.0 in sharded cluster
+      max_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         Mongoid::Clients.with_name(:other).command(create: :people)
-        subscriber.clear_events!
-        person.with(client: :other) do
-          example.run
+
+        begin
+          subscriber.clear_events!
+          person.with(client: :other) do
+            example.run
+          end
+        ensure
+          Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
         end
-        Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
       end
 
       let!(:error) do

data/spec/mongoid/clients_spec.rb

@@ -725,7 +725,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".store_in", if: non_legacy_server? do
+  describe ".store_in" do
 
     context "when provided a non hash" do
 
@@ -762,7 +762,7 @@ describe Mongoid::Clients do
     end
   end
 
-  describe ".with", if: non_legacy_server? do
+  describe ".with" do
 
     context "when changing write concern options" do
 

data/spec/mongoid/contextual/atomic_spec.rb

@@ -74,7 +74,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let(:criteria) do
         Band.where(members: [ "DAVE" ]).collation(locale: 'en_US', strength: 2)
@@ -145,7 +146,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ], likes: 60)
@@ -224,7 +226,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -296,7 +299,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -350,7 +354,8 @@ describe Mongoid::Contextual::Atomic do
       expect(smiths.reload.members).to be_nil
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -407,7 +412,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave", "Alan", "Fletch" ])
@@ -464,7 +470,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -529,7 +536,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -590,7 +598,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(members: [ "Dave" ])
@@ -749,7 +758,8 @@ describe Mongoid::Contextual::Atomic do
       end
     end
 
-    context 'when the criteria has a collation', if: collation_supported? do
+    context 'when the criteria has a collation' do
+      min_server_version '3.4'
 
       let!(:depeche_mode) do
         Band.create(name: "Depeche Mode", years: 10)