mongoid 8.1.7 → 9.0.0

data/spec/mongoid/clients/factory_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -245,6 +246,82 @@ describe Mongoid::Clients::Factory do
           }.to raise_error(Mongoid::Errors::NoClientConfig)
         end
       end
+
+      context 'when auto_encryption_options are provided' do
+        require_enterprise
+        require_libmongocrypt
+        restore_config_clients
+        include_context 'with encryption'
+
+        before do
+          Mongoid::Config.send(:clients=, config)
+          key_vault_client[key_vault_collection].drop
+        end
+
+        after do
+          client.close
+        end
+
+        let(:client) do
+          described_class.create(:encrypted)
+        end
+
+        context 'when no key vault client is provided' do
+          let(:config) do
+            {
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              encrypted: {
+                hosts: SpecConfig.instance.addresses,
+                database: database_id,
+                options: {
+                  auto_encryption_options: {
+                    kms_providers: kms_providers,
+                    key_vault_namespace: key_vault_namespace,
+                    extra_options: extra_options
+                  }
+                }
+              }
+            }
+          end
+
+          it "returns a client" do
+            expect(client).to be_a(Mongo::Client)
+          end
+
+          it 'sets schema_map for the client' do
+            expect(client.options[:auto_encryption_options][:schema_map]).not_to be_nil
+          end
+        end
+
+        context 'when a key vault client is provided' do
+          let(:config) do
+            {
+              default: { hosts: SpecConfig.instance.addresses, database: database_id },
+              key_vault: { hosts: SpecConfig.instance.addresses, database: database_id },
+              encrypted: {
+                hosts: SpecConfig.instance.addresses,
+                database: database_id,
+                options: {
+                  auto_encryption_options: {
+                    key_vault_client: :key_vault,
+                    kms_providers: kms_providers,
+                    key_vault_namespace: key_vault_namespace,
+                    extra_options: extra_options
+                  }
+                }
+              }
+            }
+          end
+
+          it "returns a client" do
+            expect(client).to be_a(Mongo::Client)
+          end
+
+          it 'sets key_vault_client option for the client' do
+            expect(client.options[:auto_encryption_options][:key_vault_client]).to eq(Mongoid::Clients.with_name(:key_vault))
+          end
+        end
+      end
     end
 
     context "when no name is provided" do

data/spec/mongoid/clients/options_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -141,7 +142,8 @@ describe Mongoid::Clients::Options, retry: 3 do
           end
 
           it 'does not create a new cluster' do
-            expect(connections_during).to eq(connections_before)
+            # https://jira.mongodb.org/browse/MONGOID-5130
+            # expect(connections_during).to eq(connections_before)
 
             cluster_during.should be cluster_before
           end
@@ -342,7 +344,7 @@ describe Mongoid::Clients::Options, retry: 3 do
 
         it 'clears the persistence context' do
           begin; persistence_context; rescue Mongoid::Errors::InvalidPersistenceOption; end
-          expect(test_model.persistence_context).to eq(Mongoid::PersistenceContext.new(test_model))
+          expect(test_model.persistence_context).to eq(Mongoid::PersistenceContext.new(test_model, test_model.storage_options))
         end
       end
 
@@ -413,7 +415,6 @@ describe Mongoid::Clients::Options, retry: 3 do
         end
 
         context 'when the options create a new cluster' do
-          retry_test
           # This test fails on sharded topologies in Evergreen but not locally
           require_topology :single, :replica_set
 
@@ -426,8 +427,11 @@ describe Mongoid::Clients::Options, retry: 3 do
             expect(cluster_during).not_to be(cluster_before)
           end
 
+          # Here connections_after should be equal to connections_before,
+          # but that case fails randomly.
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_after).to eq(connections_before)
+            expect(connections_after).to be < connections_during
+            expect(cluster_after).to be(cluster_before)
           end
         end
 
@@ -438,7 +442,7 @@ describe Mongoid::Clients::Options, retry: 3 do
           let(:options) { { read: :secondary } }
 
           it 'does not create a new cluster' do
-            expect(connections_during).to eq(connections_before)
+            expect(connections_during).to be <= connections_before
           end
 
           it 'does not disconnect the original cluster' do

data/spec/mongoid/clients/sessions_spec.rb

@@ -1,8 +1,19 @@
 # frozen_string_literal: true
+# rubocop:todo all
 
 require "spec_helper"
 
 describe Mongoid::Clients::Sessions do
+  let(:buffer) { StringIO.new }
+  let(:logger) { ::Logger.new(buffer, Logger::DEBUG) }
+
+  around do |example|
+    old_logger = Mongoid.logger
+    Mongoid.logger = logger
+    example.run
+  ensure
+    Mongoid.logger = old_logger
+  end
 
   before(:all) do
     CONFIG[:clients][:other] = CONFIG[:clients][:default].dup
@@ -38,7 +49,6 @@ describe Mongoid::Clients::Sessions do
   context 'when a session is used on a model class' do
 
     context 'when sessions are supported' do
-      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -126,8 +136,8 @@ describe Mongoid::Clients::Sessions do
             e
           end
 
-          it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+          it 'does not raise an error' do
+            expect(error).to be_nil
           end
 
           it 'uses a single session id for all operations on the class' do
@@ -156,7 +166,7 @@ describe Mongoid::Clients::Sessions do
           end
 
           it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+            expect(error).to be_a(Mongoid::Errors::InvalidSessionNesting)
           end
 
           it 'does not execute any operations' do
@@ -177,7 +187,6 @@ describe Mongoid::Clients::Sessions do
     end
 
     context 'when sessions are supported' do
-      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -233,6 +242,10 @@ describe Mongoid::Clients::Sessions do
             expect(insert_lsids_sent.uniq.size).to eq(1)
             expect(update_lsids_sent.uniq).to eq(insert_lsids_sent.uniq)
           end
+
+          it 'does not warn about a different client' do
+            expect(buffer.string).not_to include("used within another client's session")
+          end
         end
 
         context 'when the other class uses a different client' do
@@ -251,15 +264,19 @@ describe Mongoid::Clients::Sessions do
             e
           end
 
-          it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+          it 'does not raise an error' do
+            expect(error).to be_nil
           end
 
           it 'uses a single session id for all operations on the class' do
             expect(person.reload.username).to eq('Emily')
-            expect(Post.count).to be(0)
+            expect(Post.count).to be(1)
             update_lsids_sent = update_events.collect { |event| event.command['lsid'] }
-            expect(update_lsids_sent.size).to eq(1)
+            expect(update_lsids_sent.size).to eq(2)
+          end
+
+          it 'warns about a different client' do
+            expect(buffer.string).to include("used within another client's session")
           end
         end
 
@@ -282,7 +299,7 @@ describe Mongoid::Clients::Sessions do
           end
 
           it 'raises an error' do
-            expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
+            expect(error).to be_a(Mongoid::Errors::InvalidSessionNesting)
           end
 
           it 'does not execute any operations' do