mongoid 7.2.1 → 9.0.0

data/spec/mongoid/clients/factory_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -37,6 +37,7 @@ describe Mongoid::Clients::Factory do
       context "when the configuration exists" do
 
         context "when the configuration is standard" do
+          restore_config_clients
 
           let(:config) do
             {
@@ -65,9 +66,12 @@ describe Mongoid::Clients::Factory do
             expect(client).to be_a(Mongo::Client)
           end
 
-          it 'does not produce driver warnings' do
-            Mongo::Logger.logger.should_not receive(:warn)
-            client
+          context 'on driver versions that do not report spurious EOF errors' do
+
+            it 'does not produce driver warnings' do
+              Mongo::Logger.logger.should_not receive(:warn)
+              client
+            end
           end
 
           let(:cluster_addresses) do
@@ -80,40 +84,37 @@ describe Mongoid::Clients::Factory do
             expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
           end
 
-          context 'driver 2.13+' do
-            min_driver_version '2.13'
+          it 'sets Mongoid as a wrapping library' do
+            client.options[:wrapping_libraries].should == [BSON::Document.new(
+              Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY)]
+          end
 
-            it 'sets Mongoid as a wrapping library' do
-              client.options[:wrapping_libraries].should == [BSON::Document.new(
-                Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY)]
-            end
+          context 'when configuration specifies a wrapping library' do
 
-            context 'when configuration specifies a wrapping library' do
-
-              let(:config) do
-                {
-                  default: { hosts: SpecConfig.instance.addresses, database: database_id },
-                  analytics: {
-                    hosts: SpecConfig.instance.addresses,
-                    database: database_id,
-                    options: {
-                      wrapping_libraries: [{name: 'Foo'}],
-                    },
-                  }
+            let(:config) do
+              {
+                default: { hosts: SpecConfig.instance.addresses, database: database_id },
+                analytics: {
+                  hosts: SpecConfig.instance.addresses,
+                  database: database_id,
+                  options: {
+                    wrapping_libraries: [{name: 'Foo'}],
+                  },
                 }
-              end
-
-              it 'adds Mongoid as another wrapping library' do
-                client.options[:wrapping_libraries].should == [
-                  BSON::Document.new(Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY),
-                  {'name' => 'Foo'},
-                ]
-              end
+              }
+            end
+
+            it 'adds Mongoid as another wrapping library' do
+              client.options[:wrapping_libraries].should == [
+                BSON::Document.new(Mongoid::Clients::Factory::MONGOID_WRAPPING_LIBRARY),
+                {'name' => 'Foo'},
+              ]
             end
           end
         end
 
         context "when the configuration has no ports" do
+          restore_config_clients
 
           let(:config) do
             {
@@ -158,6 +159,7 @@ describe Mongoid::Clients::Factory do
         context "when configured via a uri" do
 
           context "when the uri has a single host:port" do
+            restore_config_clients
 
             let(:config) do
               {
@@ -196,6 +198,7 @@ describe Mongoid::Clients::Factory do
           end
 
           context "when the uri has multiple host:port pairs" do
+            restore_config_clients
 
             let(:config) do
               {
@@ -243,9 +246,86 @@ 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
+      restore_config_clients
 
       let(:config) do
         { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
@@ -279,6 +359,7 @@ describe Mongoid::Clients::Factory do
     end
 
     context "when nil is provided and no default config" do
+      restore_config_clients
 
       let(:config) { nil }
 
@@ -293,6 +374,7 @@ describe Mongoid::Clients::Factory do
   end
 
   describe ".default" do
+    restore_config_clients
 
     let(:config) do
       { default: { hosts: SpecConfig.instance.addresses, database: database_id }}
@@ -326,6 +408,7 @@ describe Mongoid::Clients::Factory do
   end
 
   context "when options are provided with string keys" do
+    restore_config_clients
 
     let(:config) do
       {
@@ -378,4 +461,43 @@ describe Mongoid::Clients::Factory do
       expect(client.options[:platform]).to eq(Mongoid::PLATFORM_DETAILS)
     end
   end
+
+  context "unexpected config options" do
+    restore_config_clients
+
+    let(:unknown_opts) do
+      {
+        bad_one: 1,
+        another_one: "here"
+      }
+    end
+
+    let(:config) do
+      {
+        default: { hosts: SpecConfig.instance.addresses, database: database_id },
+        good_one: { hosts: [ "127.0.0.1:1234" ], database: database_id},
+        bad_one: { hosts: [ "127.0.0.1:1234" ], database: database_id}.merge(unknown_opts),
+        good_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" },
+        bad_two: { uri: "mongodb://127.0.0.1:1234,127.0.0.1:5678/#{database_id}" }.merge(unknown_opts)
+      }
+    end
+
+    before do
+      Mongoid::Config.send(:clients=, config)
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'does not log a warning if none' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+
+    [:bad_one, :bad_two].each do |env|
+      it 'logs a warning if some' do
+        expect(described_class.send(:default_logger)).not_to receive(:warn)
+        described_class.create(env).close
+      end
+    end
+  end
 end

data/spec/mongoid/clients/options_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require "spec_helper"
 
@@ -83,9 +83,11 @@ describe Mongoid::Clients::Options, retry: 3 do
 
         let!(:connections_and_cluster_during) do
           connections = nil
-          cluster = Minim.with(options) do |klass|
+          cluster = nil
+          Minim.with(options) do |klass|
             klass.where(name: 'emily').to_a
             connections = Minim.mongo_client.database.command(serverStatus: 1).first['connections']['current']
+            cluster = Minim.collection.cluster
           end
           [ connections, cluster ]
         end
@@ -124,7 +126,10 @@ describe Mongoid::Clients::Options, retry: 3 do
           end
 
           it 'disconnects the new cluster when the block exits' do
-            expect(connections_before).to eq(connections_after)
+            expect(cluster_after).not_to be(cluster_during)
+
+            cluster_during.connected?.should be false
+            cluster_before.connected?.should be true
           end
         end
 
@@ -137,12 +142,16 @@ 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
 
           it 'does not disconnect the original cluster' do
-            expect(connections_after).to eq(connections_before)
             expect(cluster_before).to be(cluster_after)
+
+            cluster_before.connected?.should be true
           end
         end
 
@@ -238,11 +247,11 @@ describe Mongoid::Clients::Options, retry: 3 do
             threads << Thread.new do
               if i % 2 == 0
                 NameOnly.with(collection: 'British') do |klass|
-                  klass.create(name: 'realised')
+                  klass.create!(name: 'realised')
                 end
               else
                 NameOnly.with(collection: 'American') do |klass|
-                  klass.create(name: 'realized')
+                  klass.create!(name: 'realized')
                 end
               end
             end
@@ -300,7 +309,7 @@ describe Mongoid::Clients::Options, retry: 3 do
       end
 
       let(:test_model) do
-        Minim.create
+        Minim.create!
       end
 
       let(:persistence_context) do
@@ -335,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
 
@@ -418,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
 
@@ -430,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
@@ -456,7 +468,7 @@ describe Mongoid::Clients::Options, retry: 3 do
         before do
           threads = []
           100.times do |i|
-            test_model = NameOnly.create
+            test_model = NameOnly.create!
             threads << Thread.new do
               if i % 2 == 0
                 test_model.with(collection: 'British') do |b|

data/spec/mongoid/clients/sessions_spec.rb

@@ -1,9 +1,19 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# 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
@@ -39,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)
@@ -54,10 +63,10 @@ describe Mongoid::Clients::Sessions do
 
         let!(:last_use_diff) do
           Person.with_session do |session|
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
             last_use = session.instance_variable_get(:@server_session).last_use
-            Thread.new { Person.create }.value
+            Thread.new { Person.create! }.value
             session.instance_variable_get(:@server_session).last_use - last_use
           end
         end
@@ -76,8 +85,8 @@ describe Mongoid::Clients::Sessions do
 
         before do
           Person.with_session do
-            Person.create
-            Person.create
+            Person.create!
+            Person.create!
           end
         end
 
@@ -96,9 +105,9 @@ describe Mongoid::Clients::Sessions do
           before do
             Post.with(client: :other) do
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             end
           end
@@ -117,9 +126,9 @@ describe Mongoid::Clients::Sessions do
             e = nil
             begin
               Person.with_session do
-                Person.create
-                Person.create
-                Post.create
+                Person.create!
+                Person.create!
+                Post.create!
               end
             rescue => ex
                 e = ex
@@ -127,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
@@ -146,8 +155,8 @@ describe Mongoid::Clients::Sessions do
             begin
               Person.with_session do
                 Person.with_session do
-                  Person.create
-                  Post.create
+                  Person.create!
+                  Post.create!
                 end
               end
             rescue => ex
@@ -157,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
@@ -167,37 +176,17 @@ describe Mongoid::Clients::Sessions do
         end
       end
     end
-
-    context 'when sessions are not supported' do
-      max_server_version '3.4'
-
-      let!(:error) do
-        e = nil
-        begin
-          Person.with_session {}
-        rescue => ex
-          e = ex
-        end
-        e
-      end
-
-      it 'raises a sessions not supported error' do
-        expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
-        expect(error.message).to include('not supported')
-      end
-    end
   end
 
   context 'when a session is used on a model instance' do
 
     let!(:person) do
       Person.with(client: :other) do |klass|
-        klass.create
+        klass.create!
       end
     end
 
     context 'when sessions are supported' do
-      min_server_version '3.6'
 
       around do |example|
         Mongoid::Clients.with_name(:other).database.collections.each(&:drop)
@@ -213,9 +202,9 @@ describe Mongoid::Clients::Sessions do
         before do
           person.with_session do
             person.username = 'Emily'
-            person.save
+            person.save!
             person.age = 80
-            person.save
+            person.save!
           end
         end
 
@@ -236,8 +225,8 @@ describe Mongoid::Clients::Sessions do
             Post.with(client: :other) do
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             end
           end
@@ -253,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
@@ -262,8 +255,8 @@ describe Mongoid::Clients::Sessions do
             begin
               person.with_session do
                 person.username = 'Emily'
-                person.save
-                person.posts << Post.create
+                person.save!
+                person.posts << Post.create!
               end
             rescue => ex
               e = ex
@@ -271,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
 
@@ -291,8 +288,8 @@ describe Mongoid::Clients::Sessions do
               person.with_session do
                 person.with_session do
                   person.username = 'Emily'
-                  person.save
-                  person.posts << Post.create
+                  person.save!
+                  person.posts << Post.create!
                 end
               end
             rescue => ex
@@ -302,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
@@ -313,24 +310,5 @@ describe Mongoid::Clients::Sessions do
         end
       end
     end
-
-    context 'when sessions are not supported' do
-      max_server_version '3.4'
-
-      let!(:error) do
-        e = nil
-        begin
-          person.with_session {}
-        rescue => ex
-          e = ex
-        end
-        e
-      end
-
-      it 'raises a sessions not supported error' do
-        expect(error).to be_a(Mongoid::Errors::InvalidSessionUse)
-        expect(error.message).to include('not supported')
-      end
-    end
   end
 end