mongo 2.13.2 → 2.14.0.rc1

data/spec/mongo/server/app_metadata_shared.rb

@@ -10,7 +10,7 @@ shared_examples 'app metadata document' do
 
   it 'includes operating system information' do
     document[:client][:os][:type].should == 'linux'
-    if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
+    if BSON::Environment.jruby?
       document[:client][:os][:name].should == 'linux'
     else
       document[:client][:os][:name].should == 'linux-gnu'

data/spec/mongo/server/connection_pool_spec.rb

@@ -5,9 +5,13 @@ describe Mongo::Server::ConnectionPool do
   let(:options) { {} }
 
   let(:server_options) do
-    SpecConfig.instance.ssl_options.merge(SpecConfig.instance.compressor_options)
-      .merge(SpecConfig.instance.retry_writes_options).merge(SpecConfig.instance.auth_options)
-      .merge(options)
+    Mongo::Utils.shallow_symbolize_keys(Mongo::Client.canonicalize_ruby_options(
+      SpecConfig.instance.all_test_options,
+    )).tap do |opts|
+      opts.delete(:min_pool_size)
+      opts.delete(:max_pool_size)
+      opts.delete(:wait_queue_timeout)
+    end.update(options)
   end
 
   let(:address) do

data/spec/mongo/server/connection_spec.rb

@@ -158,6 +158,8 @@ describe Mongo::Server::Connection do
       end
 
       shared_examples_for 'logs a warning' do
+        require_warning_clean
+
         it 'logs a warning' do
           messages = []
           expect(Mongo::Logger.logger).to receive(:warn) do |msg|
@@ -172,6 +174,8 @@ describe Mongo::Server::Connection do
       end
 
       shared_examples_for 'adds server diagnostics' do
+        require_warning_clean
+
         it 'adds server diagnostics' do
           messages = []
           expect(Mongo::Logger.logger).to receive(:warn) do |msg|
@@ -248,8 +252,9 @@ describe Mongo::Server::Connection do
         require_auth
 
         let(:server_options) do
-          SpecConfig.instance.test_options.merge(monitoring_io: false).
-            merge(SpecConfig.instance.auth_options)
+          Mongo::Client.canonicalize_ruby_options(
+            SpecConfig.instance.all_test_options,
+          ).update(monitoring_io: false)
         end
 
         let(:exception) do
@@ -589,10 +594,12 @@ describe Mongo::Server::Connection do
         server,
         SpecConfig.instance.test_options.merge(
           :database => SpecConfig.instance.test_user.database,
-        ).merge(SpecConfig.instance.credentials_or_external_user(
-          user: SpecConfig.instance.test_user.name,
-          password: SpecConfig.instance.test_user.password,
-        ))
+        ).merge(Mongo::Utils.shallow_symbolize_keys(Mongo::Client.canonicalize_ruby_options(
+          SpecConfig.instance.credentials_or_external_user(
+            user: SpecConfig.instance.test_user.name,
+            password: SpecConfig.instance.test_user.password,
+          ),
+        )))
       ).tap do |connection|
         connection.connect!
       end
@@ -1099,7 +1106,7 @@ describe Mongo::Server::Connection do
           :user => SpecConfig.instance.test_user.name,
           :password => SpecConfig.instance.test_user.password,
           :database => SpecConfig.instance.test_db,
-          :auth_mech => :mongodb_cr
+          :auth_mech => :mongodb_cr,
         )
       end
 

data/spec/mongo/socket/ssl_spec.rb

@@ -246,7 +246,7 @@ describe Mongo::Socket::SSL, retry: 3 do
         it 'raises an error' do
           lambda do
             socket
-          end.should raise_error(Mongo::Error::SocketError, /SSL handshake failed due to a hostname mismatch/)
+          end.should raise_error(Mongo::Error::SocketError, /TLS handshake failed due to a hostname mismatch/)
         end
       end
 

data/spec/mongo/socket_spec.rb

@@ -48,7 +48,7 @@ describe Mongo::Socket do
         socket.send(:map_exceptions) do
           raise OpenSSL::SSL::SSLError.new('Test error')
         end
-      end.to raise_error(Mongo::Error::SocketError, 'OpenSSL::SSL::SSLError: Test error (for fake-address) (MongoDB may not be configured with SSL support)')
+      end.to raise_error(Mongo::Error::SocketError, 'OpenSSL::SSL::SSLError: Test error (for fake-address) (MongoDB may not be configured with TLS support)')
     end
   end
 

data/spec/mongo/uri/srv_protocol_spec.rb

@@ -567,8 +567,8 @@ describe Mongo::URI::SRVProtocol do
               'readPreference=secondary&maxStalenessSeconds=89'
             end
 
-            it 'does not raise an exception until the read preference is used' do
-              expect(client.read_preference).to eq(BSON::Document.new(mode: :secondary, max_staleness: 89))
+            it 'does not raise an exception and is omitted' do
+              expect(client.read_preference).to eq(BSON::Document.new(mode: :secondary))
             end
           end
         end
@@ -715,83 +715,114 @@ describe Mongo::URI::SRVProtocol do
         end
       end
 
+      # This context exactly duplicates the same one in uri_spec.rb
       context 'auth mechanism properties provided' do
 
+        shared_examples 'sets options in the expected manner' do
+          it 'preserves case in auth mechanism properties returned from URI' do
+            expect(uri.uri_options[:auth_mech_properties]).to eq(expected_uri_options)
+          end
+
+          it 'downcases auth mechanism properties keys in client options' do
+            client = new_local_client_nmio(string)
+            expect(client.options[:auth_mech_properties]).to eq(expected_client_options)
+          end
+        end
+
         context 'service_name' do
           let(:options) do
-            "authMechanismProperties=SERVICE_NAME:#{service_name}"
+            "authMechanismProperties=SERVICE_name:#{service_name}"
           end
 
           let(:service_name) { 'foo' }
-          let(:expected) { Mongo::Options::Redacted.new({ service_name: service_name }) }
 
-          it 'sets the auth mechanism properties' do
-            expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+          let(:expected_uri_options) do
+            Mongo::Options::Redacted.new(
+              SERVICE_name: service_name,
+            )
           end
 
-          it 'sets the options on a client created with the uri' do
-            expect(client.options[:auth_mech_properties]).to eq(expected)
+          let(:expected_client_options) do
+            Mongo::Options::Redacted.new(
+              service_name: service_name,
+            )
           end
+
+          include_examples 'sets options in the expected manner'
         end
 
         context 'canonicalize_host_name' do
           let(:options) do
-            "authMechanismProperties=CANONICALIZE_HOST_NAME:#{canonicalize_host_name}"
+            "authMechanismProperties=CANONICALIZE_HOST_name:#{canonicalize_host_name}"
           end
+
           let(:canonicalize_host_name) { 'true' }
-          let(:expected) { Mongo::Options::Redacted.new({ canonicalize_host_name: true }) }
 
-          it 'sets the auth mechanism properties' do
-            expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+          let(:expected_uri_options) do
+            Mongo::Options::Redacted.new(
+              CANONICALIZE_HOST_name: true,
+            )
           end
 
-          it 'sets the options on a client created with the uri' do
-            expect(client.options[:auth_mech_properties]).to eq(expected)
+          let(:expected_client_options) do
+            Mongo::Options::Redacted.new(
+              canonicalize_host_name: true,
+            )
           end
+
+          include_examples 'sets options in the expected manner'
         end
 
         context 'service_realm' do
           let(:options) do
-            "authMechanismProperties=SERVICE_REALM:#{service_realm}"
+            "authMechanismProperties=SERVICE_realm:#{service_realm}"
           end
 
           let(:service_realm) { 'dumdum' }
-          let(:expected) { Mongo::Options::Redacted.new({ service_realm: service_realm }) }
 
-
-          it 'sets the auth mechanism properties' do
-            expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+          let(:expected_uri_options) do
+            Mongo::Options::Redacted.new(
+              SERVICE_realm: service_realm,
+            )
           end
 
-          it 'sets the options on a client created with the uri' do
-            expect(client.options[:auth_mech_properties]).to eq(expected)
+          let(:expected_client_options) do
+            Mongo::Options::Redacted.new(
+              service_realm: service_realm,
+            )
           end
+
+          include_examples 'sets options in the expected manner'
         end
 
         context 'multiple properties' do
           let(:options) do
-            "authMechanismProperties=SERVICE_REALM:#{service_realm}," +
-                "CANONICALIZE_HOST_NAME:#{canonicalize_host_name}," +
-                "SERVICE_NAME:#{service_name}"
+            "authMechanismProperties=SERVICE_realm:#{service_realm}," +
+              "CANONICALIZE_HOST_name:#{canonicalize_host_name}," +
+              "SERVICE_name:#{service_name}"
           end
 
           let(:service_name) { 'foo' }
           let(:canonicalize_host_name) { 'true' }
           let(:service_realm) { 'dumdum' }
 
-          let(:expected) do
-            Mongo::Options::Redacted.new({ service_name: service_name,
-                                           canonicalize_host_name: true,
-                                           service_realm: service_realm })
+          let(:expected_uri_options) do
+            Mongo::Options::Redacted.new(
+              SERVICE_name: service_name,
+              CANONICALIZE_HOST_name: true,
+              SERVICE_realm: service_realm,
+            )
           end
 
-          it 'sets the auth mechanism properties' do
-            expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+          let(:expected_client_options) do
+            Mongo::Options::Redacted.new(
+              service_name: service_name,
+              canonicalize_host_name: true,
+              service_realm: service_realm,
+            )
           end
 
-          it 'sets the options on a client created with the uri' do
-            expect(client.options[:auth_mech_properties]).to eq(expected)
-          end
+          include_examples 'sets options in the expected manner'
         end
       end
 

data/spec/mongo/uri_option_parsing_spec.rb

@@ -199,37 +199,37 @@ describe Mongo::URI do
 
   context 'authMechanismProperties' do
 
-    let(:string) { 'mongodb://example.com/?authmechanismproperties=SERVICE_REALM:foo,CANONICALIZE_HOST_NAME:TRUE' }
+    let(:string) { 'mongodb://example.com/?authmechanismproperties=SERVICE_realm:foo,CANONICALIZE_HOST_name:TRUE' }
 
     it_behaves_like 'parses successfully'
 
     it 'parses correctly' do
       expect(uri.uri_options[:auth_mech_properties]).to eq(BSON::Document.new(
-        service_realm: 'foo',
-        canonicalize_host_name: true,
+        SERVICE_realm: 'foo',
+        CANONICALIZE_HOST_name: true,
       ))
     end
 
     context 'canonicalize host name is false' do
 
-      let(:string) { 'mongodb://example.com/?authmechanismproperties=SERVICE_REALM:foo,CANONICALIZE_HOST_NAME:false' }
+      let(:string) { 'mongodb://example.com/?authmechanismproperties=SERVICE_realm:foo,CANONICALIZE_HOST_name:false' }
 
       it 'parses correctly' do
         expect(uri.uri_options[:auth_mech_properties]).to eq(BSON::Document.new(
-          service_realm: 'foo',
-          canonicalize_host_name: false,
+          SERVICE_realm: 'foo',
+          CANONICALIZE_HOST_name: false,
         ))
       end
     end
 
     context 'canonicalize host name is true in mixed case' do
 
-      let(:string) { 'mongodb://example.com/?authmechanismproperties=SERVICE_REALM:foo,CANONICALIZE_HOST_NAME:TrUe' }
+      let(:string) { 'mongodb://example.com/?authmechanismproperties=SERVICE_realm:foo,CANONICALIZE_HOST_name:TrUe' }
 
       it 'parses correctly' do
         expect(uri.uri_options[:auth_mech_properties]).to eq(BSON::Document.new(
-          service_realm: 'foo',
-          canonicalize_host_name: true,
+          SERVICE_realm: 'foo',
+          CANONICALIZE_HOST_name: true,
         ))
       end
     end
@@ -350,8 +350,8 @@ describe Mongo::URI do
 
       it_behaves_like 'parses successfully'
 
-      it 'is converted to nil' do
-        expect(uri.uri_options[:read]).to eq(BSON::Document.new(max_staleness: nil))
+      it 'is omitted' do
+        uri.uri_options.should_not have_key(:read)
       end
     end
   end

data/spec/mongo/uri_spec.rb

@@ -727,9 +727,9 @@ describe Mongo::URI do
             'readPreference=secondary&maxStalenessSeconds=89'
           end
 
-          it 'does not raise an exception until the read preference is used' do
+          it 'does not raise an exception and drops the option' do
             client = new_local_client_nmio(string)
-            expect(client.read_preference).to eq(BSON::Document.new(mode: :secondary, max_staleness: 89))
+            expect(client.read_preference).to eq(BSON::Document.new(mode: :secondary))
           end
         end
       end
@@ -854,16 +854,16 @@ describe Mongo::URI do
           context 'when a mapping value is missing' do
             let(:options) { "authMechanism=#{mechanism}&authMechanismProperties=SERVICE_NAME:,CANONICALIZE_HOST_NAME:" }
 
-            it 'sets the options on a client created with the uri' do
-              expect(client.options[:auth_mech_properties]).to eq({ 'canonicalize_host_name' => nil, 'service_name' => nil })
+            it 'sets the options to defaults' do
+              expect(client.options[:auth_mech_properties]).to eq({ 'service_name' => 'mongodb' })
             end
           end
 
           context 'when a mapping value is missing but another is present' do
             let(:options) { "authMechanism=#{mechanism}&authMechanismProperties=SERVICE_NAME:foo,CANONICALIZE_HOST_NAME:" }
 
-            it 'sets the options on a client created with the uri' do
-              expect(client.options[:auth_mech_properties]).to eq({ 'canonicalize_host_name' => nil, 'service_name' => 'foo' })
+            it 'only sets the present value' do
+              expect(client.options[:auth_mech_properties]).to eq({ 'service_name' => 'foo' })
             end
           end
         end
@@ -1013,84 +1013,111 @@ describe Mongo::URI do
 
     context 'auth mechanism properties provided' do
 
+      shared_examples 'sets options in the expected manner' do
+        it 'preserves case in auth mechanism properties returned from URI' do
+          expect(uri.uri_options[:auth_mech_properties]).to eq(expected_uri_options)
+        end
+
+        it 'downcases auth mechanism properties keys in client options' do
+          client = new_local_client_nmio(string)
+          expect(client.options[:auth_mech_properties]).to eq(expected_client_options)
+        end
+      end
+
       context 'service_name' do
         let(:options) do
-          "authMechanismProperties=SERVICE_NAME:#{service_name}"
+          "authMechanismProperties=SERVICE_name:#{service_name}"
         end
+
         let(:service_name) { 'foo' }
-        let(:expected) { Mongo::Options::Redacted.new({ service_name: service_name }) }
 
-        it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        let(:expected_uri_options) do
+          Mongo::Options::Redacted.new(
+            SERVICE_name: service_name,
+          )
         end
 
-        it 'sets the options on a client created with the uri' do
-          client = new_local_client_nmio(string)
-          expect(client.options[:auth_mech_properties]).to eq(expected)
+        let(:expected_client_options) do
+          Mongo::Options::Redacted.new(
+            service_name: service_name,
+          )
         end
+
+        include_examples 'sets options in the expected manner'
       end
 
       context 'canonicalize_host_name' do
         let(:options) do
-          "authMechanismProperties=CANONICALIZE_HOST_NAME:#{canonicalize_host_name}"
+          "authMechanismProperties=CANONICALIZE_HOST_name:#{canonicalize_host_name}"
         end
+
         let(:canonicalize_host_name) { 'true' }
-        let(:expected) { Mongo::Options::Redacted.new({ canonicalize_host_name: true }) }
 
-        it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        let(:expected_uri_options) do
+          Mongo::Options::Redacted.new(
+            CANONICALIZE_HOST_name: true,
+          )
         end
 
-        it 'sets the options on a client created with the uri' do
-          client = new_local_client_nmio(string)
-          expect(client.options[:auth_mech_properties]).to eq(expected)
+        let(:expected_client_options) do
+          Mongo::Options::Redacted.new(
+            canonicalize_host_name: true,
+          )
         end
+
+        include_examples 'sets options in the expected manner'
       end
 
       context 'service_realm' do
         let(:options) do
-          "authMechanismProperties=SERVICE_REALM:#{service_realm}"
+          "authMechanismProperties=SERVICE_realm:#{service_realm}"
         end
 
         let(:service_realm) { 'dumdum' }
-        let(:expected) { Mongo::Options::Redacted.new({ service_realm: service_realm }) }
 
-
-        it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        let(:expected_uri_options) do
+          Mongo::Options::Redacted.new(
+            SERVICE_realm: service_realm,
+          )
         end
 
-        it 'sets the options on a client created with the uri' do
-          client = new_local_client_nmio(string)
-          expect(client.options[:auth_mech_properties]).to eq(expected)
+        let(:expected_client_options) do
+          Mongo::Options::Redacted.new(
+            service_realm: service_realm,
+          )
         end
+
+        include_examples 'sets options in the expected manner'
       end
 
       context 'multiple properties' do
         let(:options) do
-          "authMechanismProperties=SERVICE_REALM:#{service_realm}," +
-            "CANONICALIZE_HOST_NAME:#{canonicalize_host_name}," +
-            "SERVICE_NAME:#{service_name}"
+          "authMechanismProperties=SERVICE_realm:#{service_realm}," +
+            "CANONICALIZE_HOST_name:#{canonicalize_host_name}," +
+            "SERVICE_name:#{service_name}"
         end
 
         let(:service_name) { 'foo' }
         let(:canonicalize_host_name) { 'true' }
         let(:service_realm) { 'dumdum' }
 
-        let(:expected) do
-          Mongo::Options::Redacted.new({ service_name: service_name,
-                                         canonicalize_host_name: true,
-                                         service_realm: service_realm })
+        let(:expected_uri_options) do
+          Mongo::Options::Redacted.new(
+            SERVICE_name: service_name,
+            CANONICALIZE_HOST_name: true,
+            SERVICE_realm: service_realm,
+          )
         end
 
-        it 'sets the auth mechanism properties' do
-          expect(uri.uri_options[:auth_mech_properties]).to eq(expected)
+        let(:expected_client_options) do
+          Mongo::Options::Redacted.new(
+            service_name: service_name,
+            canonicalize_host_name: true,
+            service_realm: service_realm,
+          )
         end
 
-        it 'sets the options on a client created with the uri' do
-          client = new_local_client_nmio(string)
-          expect(client.options[:auth_mech_properties]).to eq(expected)
-        end
+        include_examples 'sets options in the expected manner'
       end
     end