mongoid 8.0.13 → 8.1.0

data/spec/mongoid/config_spec.rb

@@ -224,6 +224,79 @@ describe Mongoid::Config do
     end
   end
 
+  context 'async_query_executor option' do
+    let(:option) { :async_query_executor }
+
+    before do
+      Mongoid::Config.reset
+      Mongoid.configure do |config|
+        config.load_configuration(conf)
+      end
+    end
+
+    context "when it is not set in the config" do
+
+      let(:conf) { CONFIG }
+
+      it "it is set to its default" do
+        expect(Mongoid.send(option)).to eq(:immediate)
+      end
+    end
+
+    context 'when the value is :immediate' do
+
+      let(:conf) do
+        CONFIG.merge(options: { option => :immediate })
+      end
+
+      it "is set to false" do
+        expect(Mongoid.send(option)).to be(:immediate)
+      end
+    end
+
+    context 'when the value is :global_thread_pool' do
+
+      let(:conf) do
+        CONFIG.merge(options: { option => :global_thread_pool })
+      end
+
+      it "is set to false" do
+        expect(Mongoid.send(option)).to be(:global_thread_pool)
+      end
+    end
+  end
+
+  context 'global_executor_concurrency option' do
+    let(:option) { :global_executor_concurrency }
+
+    before do
+      Mongoid::Config.reset
+      Mongoid.configure do |config|
+        config.load_configuration(conf)
+      end
+    end
+
+    context "when it is not set in the config" do
+
+      let(:conf) { CONFIG }
+
+      it "it is set to its default" do
+        expect(Mongoid.send(option)).to eq(nil)
+      end
+    end
+
+    context 'when the value is set to a number' do
+
+      let(:conf) do
+        CONFIG.merge(options: { option => 5 })
+      end
+
+      it "is set to the number" do
+        expect(Mongoid.send(option)).to be(5)
+      end
+    end
+  end
+
   shared_examples "a config option" do
 
     before do
@@ -272,15 +345,6 @@ describe Mongoid::Config do
     it_behaves_like "a config option"
   end
 
-  context 'when setting the allow_bson5_decimal128 option in the config' do
-    min_bson_version '5.0'
-
-    let(:option) { :allow_bson5_decimal128 }
-    let(:default) { false }
-
-    it_behaves_like "a config option"
-  end
-
   context 'when setting the broken_updates option in the config' do
     let(:option) { :broken_updates }
     let(:default) { false }
@@ -358,6 +422,13 @@ describe Mongoid::Config do
     it_behaves_like "a config option"
   end
 
+  context 'when setting the legacy_readonly option in the config' do
+    let(:option) { :legacy_readonly }
+    let(:default) { true }
+
+    it_behaves_like "a config option"
+  end
+
   describe "#load!" do
 
     before(:all) do
@@ -608,24 +679,26 @@ describe Mongoid::Config do
 
       it 'passes uuid to driver' do
         Mongo::Client.should receive(:new).with(SpecConfig.instance.addresses,
-          { auto_encryption_options: {
-            'key_vault_namespace' => 'admin.datakeys',
-            'kms_providers' => {'local' => {'key' => 'z7iYiYKLuYymEWtk4kfny1ESBwwFdA58qMqff96A8ghiOcIK75lJGPUIocku8LOFjQuEgeIP4xlln3s7r93FV9J5sAE7zg8U'}},
-            'schema_map' => {'blog_development.comments' => {
-              'bsonType' => 'object',
-              'properties' => {
-                'message' => {'encrypt' => {
-                  'algorithm' => 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic',
-                  'bsonType' => 'string',
-                  'keyId' => [BSON::Binary.new("G\xF0 5\xCC@HX\xA2%b\x97\xA9a\xA8\xE7", :uuid)],
-                }},
-              },
-            }}},
-          database: 'mongoid_test',
-          platform: "mongoid-#{Mongoid::VERSION}",
-          wrapping_libraries: [
-            {'name' => 'Mongoid', 'version' => Mongoid::VERSION},
-          ]},
+          {
+            auto_encryption_options: {
+              'key_vault_namespace' => 'admin.datakeys',
+              'kms_providers' => { 'local' => { 'key' => 'z7iYiYKLuYymEWtk4kfny1ESBwwFdA58qMqff96A8ghiOcIK75lJGPUIocku8LOFjQuEgeIP4xlln3s7r93FV9J5sAE7zg8U' } },
+              'schema_map' => { 'blog_development.comments' => {
+                'bsonType' => 'object',
+                'properties' => {
+                  'message' => { 'encrypt' => {
+                    'algorithm' => 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic',
+                    'bsonType' => 'string',
+                    'keyId' => [BSON::Binary.new("G\xF0 5\xCC@HX\xA2%b\x97\xA9a\xA8\xE7", :uuid)],
+                  } },
+                },
+              } } },
+            database: 'mongoid_test',
+            platform: "mongoid-#{Mongoid::VERSION}",
+            wrapping_libraries: [
+              { 'name' => 'Mongoid', 'version' => Mongoid::VERSION },
+            ],
+          }
         )
 
         client
@@ -654,6 +727,17 @@ describe Mongoid::Config do
         }.to raise_error(Mongoid::Errors::InvalidConfigOption)
       end
     end
+
+    context 'when invalid global_executor_concurrency option provided' do
+      it "raises an error" do
+        expect do
+          described_class.options = {
+            async_query_executor: :immediate,
+            global_executor_concurrency: 5
+          }
+        end.to raise_error(Mongoid::Errors::InvalidGlobalExecutorConcurrency)
+      end
+    end
   end
 
   describe "#clients=" do
@@ -854,4 +938,47 @@ describe Mongoid::Config do
       end
     end
   end
+
+  describe 'deprecations' do
+    { use_activesupport_time_zone: true,
+      broken_aggregables: false,
+      broken_alias_handling: false,
+      broken_and: false,
+      broken_scoping: false,
+      broken_updates: false,
+      compare_time_by_ms: true,
+      legacy_attributes: false,
+      legacy_pluck_distinct: false,
+      legacy_triple_equals: false,
+      object_id_as_json_oid: false,
+      overwrite_chained_operators: false }.each do |option, default|
+
+      context ":#{option} option" do
+
+        before do
+          Mongoid::Warnings.class_eval do
+            instance_variable_set(:"@#{option}_deprecated", false)
+          end
+        end
+
+        let(:matcher) do
+          /Config option :#{option}.+\. It will always be #{default} beginning in Mongoid 9\.0\./
+        end
+
+        context 'when set to true' do
+          it 'gives a deprecation warning' do
+            expect(Mongoid.logger).to receive(:warn).with(matcher)
+            described_class.send(:"#{option}=", true)
+          end
+        end
+
+        context 'when set to false' do
+          it 'gives a deprecation warning' do
+            expect(Mongoid.logger).to receive(:warn).with(matcher)
+            described_class.send(:"#{option}=", false)
+          end
+        end
+      end
+    end
+  end
 end

data/spec/mongoid/contextual/aggregable/memory_spec.rb

@@ -570,95 +570,4 @@ describe Mongoid::Contextual::Aggregable::Memory do
       end
     end
   end
-
-  context 'when the field name is a method name' do
-    let!(:depeche) do
-      Band.create!(name: 'Depeche Mode', likes: 1000)
-    end
-
-    let(:criteria) do
-      Band.all.tap do |crit|
-        crit.documents = [ depeche ]
-      end
-    end
-
-    it 'does not call the method for sum' do
-      expect(depeche).not_to receive(:delete)
-      expect(context.sum(:delete)).to eq(0)
-    end
-
-    it 'does not call the method for min' do
-      expect(depeche).not_to receive(:delete)
-      expect(context.min(:delete)).to be_nil
-    end
-
-    it 'does not call the method for max' do
-      expect(depeche).not_to receive(:delete)
-      expect(context.max(:delete)).to be_nil
-    end
-
-    it 'does not call the method for avg' do
-      expect(depeche).not_to receive(:delete)
-      expect(context.avg(:delete)).to be_nil
-    end
-
-    it 'does not call the method for aggregates' do
-      expect(depeche).not_to receive(:delete)
-      expect(context.aggregates(:delete))
-        .to eq('count' => 0, 'avg' => nil, 'max' => nil, 'min' => nil, 'sum' => 0)
-    end
-
-    it 'does not call a private method for avg' do
-      expect(depeche).not_to receive(:exit)
-      expect(context.avg(:exit)).to be_nil
-    end
-  end
-
-  context 'when the field is not defined' do
-    let!(:depeche) do
-      Band.create!(name: 'Depeche Mode', likes: 1000)
-    end
-
-    let(:criteria) do
-      Band.all.tap do |crit|
-        crit.documents = [ depeche ]
-      end
-    end
-
-    it 'returns zero for sum' do
-      expect(context.sum(:not_a_field)).to eq(0)
-    end
-
-    it 'returns nil for min' do
-      expect(context.min(:not_a_field)).to be_nil
-    end
-
-    it 'returns nil for max' do
-      expect(context.max(:not_a_field)).to be_nil
-    end
-
-    it 'returns nil for avg' do
-      expect(context.avg(:not_a_field)).to be_nil
-    end
-  end
-
-  context 'when the field is the foreign key of a many to many association' do
-    let!(:preference) do
-      Preference.create!(name: 'nature')
-    end
-
-    let!(:person) do
-      Person.new(preferences: [ preference ])
-    end
-
-    let(:criteria) do
-      Person.all.tap do |crit|
-        crit.documents = [ person ]
-      end
-    end
-
-    it 'aggregates the stored ids' do
-      expect(context.max(:preference_ids)).to eq([ preference.id ])
-    end
-  end
 end