mongo 2.10.5 → 2.15.1

data/spec/mongo/client_construction_spec.rb

@@ -1,68 +1,14 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Client do
-  before do
-    ClientRegistry.instance.close_all_clients
-  end
-
-  describe '.new' do
-    describe 'options' do
-      describe 'read' do
-        [
-          :primary, :primary_preferred, :secondary, :secondary_preferred,  :nearest
-        ].each do |sym|
-          it "accepts #{sym} as symbol" do
-            client = new_local_client_nmio(['127.0.0.1:27017'],
-              :read => {:mode => sym})
-            # the key got converted to a string here
-            expect(client.read_preference).to eq({'mode' => sym})
-          end
-
-          # string keys are not documented as being allowed
-          # but the code accepts them
-          it "accepts #{sym} as string" do
-            client = new_local_client_nmio(['127.0.0.1:27017'],
-              :read => {:mode => sym.to_s})
-            # the key got converted to a string here
-            # the value remains a string
-            expect(client.read_preference).to eq({'mode' => sym.to_s})
-          end
-        end
-
-        context 'when not linting' do
-          skip_if_linting
-
-          it 'rejects bogus read preference as symbol' do
-            expect do
-              client = new_local_client_nmio(['127.0.0.1:27017'],
-                :read => {:mode => :bogus})
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {"mode"=>:bogus}: mode bogus is not one of recognized modes')
-          end
-
-          it 'rejects bogus read preference as string' do
-            expect do
-              client = new_local_client_nmio(['127.0.0.1:27017'],
-                :read => {:mode => 'bogus'})
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {"mode"=>"bogus"}: mode bogus is not one of recognized modes')
-          end
-
-          it 'rejects read option specified as a string' do
-            expect do
-              client = new_local_client_nmio(['127.0.0.1:27017'],
-                :read => 'primary')
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
-          end
+  clean_slate
 
-          it 'rejects read option specified as a symbol' do
-            expect do
-              client = new_local_client_nmio(['127.0.0.1:27017'],
-                :read => :primary)
-            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
-          end
-        end
-      end
-    end
+  let(:subscriber) { EventSubscriber.new }
 
+  describe '.new' do
     context 'with scan: false' do
       it 'does not perform i/o' do
         allow_any_instance_of(Mongo::Server::Monitor).to receive(:run!)
@@ -87,37 +33,27 @@ describe Mongo::Client do
         # https://github.com/rspec/rspec-mocks/issues/1242.
         #expect_any_instance_of(Mongo::Server::Monitor).to receive(:scan!).
         #  exactly(SpecConfig.instance.addresses.length).times.and_call_original
-        c = ClientRegistry.instance.new_local_client(
+        c = new_local_client(
           SpecConfig.instance.addresses, SpecConfig.instance.test_options)
         expect(c.cluster.servers).not_to be_empty
-        c.close
       end
 
       # This checks the case of all initial seeds being removed from
       # cluster during SDAM
       context 'me mismatch on the only initial seed' do
         let(:address) do
-          address = SpecConfig.instance.addresses.first
-          port = address.sub(/^.*:/, '').to_i
-          address = address.sub(/:.*/, '')
-          case address
-          when '127.0.0.1'
-            'localhost'
-          when /^(\d+\.){3}\d+$/
-            skip 'This test requires a hostname or 127.0.0.1 as address'
-          else
-            # We don't know if mongod is listening on ipv4 or ipv6,
-            # in principle.
-            # Our tests use ipv4, so hardcode that for now.
-            # To support both we need to try both addresses
-            # which will make this test more complicated.
-            resolved_address = Addrinfo.getaddrinfo(address, port, Socket::PF_INET).first.ip_address
-            if resolved_address.include?(':')
-              "[#{resolved_address}]"
-            else
-              resolved_address
-            end + ":#{port}"
-          end
+          ClusterConfig.instance.alternate_address.to_s
+        end
+
+        let(:logger) do
+          Logger.new(STDOUT, level: Logger::DEBUG)
+        end
+
+        let(:subscriber) do
+          Mongo::Monitoring::UnifiedSdamLogSubscriber.new(
+            logger: logger,
+            log_prefix: 'CCS-SDAM',
+          )
         end
 
         let(:client) do
@@ -125,17 +61,44 @@ describe Mongo::Client do
             [address],
             # Specify server selection timeout here because test suite sets
             # one by default and it's fairly low
-            SpecConfig.instance.test_options.merge(server_selection_timeout: 5))
+            SpecConfig.instance.test_options.merge(
+              connect_timeout: 1,
+              socket_timeout: 1,
+              server_selection_timeout: 8,
+              logger: logger,
+              log_prefix: 'CCS-CLIENT',
+              sdam_proc: lambda do |client|
+                subscriber.subscribe(client)
+              end
+            ))
         end
 
         it 'does not wait for server selection timeout' do
-          start_time = Time.now
-          client
-          time_taken = Time.now - start_time
-          expect(time_taken < 3).to be true
+          time_taken = Benchmark.realtime do
+            # Client is created here.
+            client
+          end
+          puts "client_construction_spec.rb: Cluster is: #{client.cluster.summary}"
+
+          # Because the first round of sdam waits for server statuses to change
+          # rather than for server selection semaphore on the cluster which
+          # is signaled after topology is updated, the topology here could be
+          # old (i.e. a monitor thread was just about to update the topology
+          # but hasn't quite gotten to it. Add a small delay to compensate.
+          # This issue doesn't apply to real applications which will wait for
+          # server selection semaphore.
+          sleep 0.1
+
+          actual_class = client.cluster.topology.class
+          expect([
+            Mongo::Cluster::Topology::ReplicaSetWithPrimary,
+            Mongo::Cluster::Topology::Single,
+            Mongo::Cluster::Topology::Sharded,
+          ]).to include(actual_class)
+          expect(time_taken).to be < 5
 
           # run a command to ensure the client is a working one
-          client.database.command(ismaster: 1)
+          client.database.command(ping: 1)
         end
       end
     end
@@ -152,8 +115,310 @@ describe Mongo::Client do
   end
 
   describe '#initialize' do
-
     context 'when providing options' do
+      context 'with auto_encryption_options' do
+        require_libmongocrypt
+
+        include_context 'define shared FLE helpers'
+
+        let(:client) do
+          new_local_client_nmio(
+            SpecConfig.instance.addresses,
+            SpecConfig.instance.test_options.merge(client_opts)
+          )
+        end
+
+        let(:client_opts) { { auto_encryption_options: auto_encryption_options } }
+
+        let(:auto_encryption_options) do
+          {
+            key_vault_client: key_vault_client,
+            key_vault_namespace: key_vault_namespace,
+            kms_providers: kms_providers,
+            schema_map: schema_map,
+            bypass_auto_encryption: bypass_auto_encryption,
+            extra_options: extra_options,
+          }
+        end
+
+        let(:key_vault_client) { new_local_client_nmio(SpecConfig.instance.addresses) }
+
+        let(:bypass_auto_encryption) { true }
+
+        let(:extra_options) do
+          {
+            mongocryptd_uri: mongocryptd_uri,
+            mongocryptd_bypass_spawn: mongocryptd_bypass_spawn,
+            mongocryptd_spawn_path: mongocryptd_spawn_path,
+            mongocryptd_spawn_args: mongocryptd_spawn_args,
+          }
+        end
+
+        let(:mongocryptd_uri) { 'mongodb://localhost:27021' }
+        let(:mongocryptd_bypass_spawn) { true }
+        let(:mongocryptd_spawn_path) { '/spawn/path' }
+        let(:mongocryptd_spawn_args) { ['--idleShutdownTimeoutSecs=100'] }
+
+        shared_examples 'a functioning auto encryption client' do
+          let(:encryption_options) { client.encrypter.options }
+
+          context 'when auto_encrypt_opts are nil' do
+            let(:auto_encryption_options) { nil }
+
+            it 'does not raise an exception' do
+              expect { client }.not_to raise_error
+            end
+          end
+
+          context 'when key_vault_namespace is nil' do
+            let(:key_vault_namespace) { nil }
+
+            it 'raises an exception' do
+              expect { client }.to raise_error(ArgumentError, /key_vault_namespace option cannot be nil/)
+            end
+          end
+
+          context 'when key_vault_namespace is incorrectly formatted' do
+            let(:key_vault_namespace) { 'not.good.formatting' }
+
+            it 'raises an exception' do
+              expect { client }.to raise_error(ArgumentError, /key_vault_namespace option must be in the format database.collection/)
+            end
+          end
+
+          context 'when kms_providers is nil' do
+            let(:kms_providers) { nil }
+
+            it 'raises an exception' do
+              expect { client }.to raise_error(ArgumentError, /kms_providers option must not be nil/)
+            end
+          end
+
+          context 'when kms_providers doesn\'t have local or aws keys' do
+            let(:kms_providers) { { random_key: 'hello' } }
+
+            it 'raises an exception' do
+              expect { client }.to raise_error(ArgumentError, /kms_providers option must have one of the following keys: :aws, :local/)
+            end
+          end
+
+          context 'when local kms_provider is incorrectly formatted' do
+            let(:kms_providers) { { local: { wrong_key: 'hello' } } }
+
+            it 'raises an exception' do
+              expect { client }.to raise_error(ArgumentError, /kms_providers with :local key must be in the format: { local: { key: 'MASTER-KEY' } }/)
+            end
+          end
+
+          context 'when aws kms_provider is incorrectly formatted' do
+            let(:kms_providers) { { aws: { wrong_key: 'hello' } } }
+
+            it 'raises an exception' do
+              expect { client }.to raise_error(ArgumentError, /kms_providers with :aws key must be in the format: { aws: { access_key_id: 'YOUR-ACCESS-KEY-ID', secret_access_key: 'SECRET-ACCESS-KEY' } }/)
+            end
+          end
+
+          context 'with an invalid schema map' do
+            let(:schema_map) { '' }
+
+            it 'raises an exception' do
+              expect { client }.to raise_error(ArgumentError, /schema_map must be a Hash or nil/)
+            end
+          end
+
+          context 'with valid options' do
+            it 'does not raise an exception' do
+              expect { client }.not_to raise_error
+            end
+
+            context 'with a nil schema_map' do
+              let(:schema_map) { nil }
+
+              it 'does not raise an exception' do
+                expect { client }.not_to raise_error
+              end
+            end
+
+            it 'sets options on the client' do
+              expect(encryption_options[:key_vault_client]).to eq(key_vault_client)
+              expect(encryption_options[:key_vault_namespace]).to eq(key_vault_namespace)
+              # Don't explicitly expect kms_providers to avoid accidentally exposing
+              # sensitive data in evergreen logs
+              expect(encryption_options[:kms_providers]).to be_a_kind_of(Hash)
+              expect(encryption_options[:schema_map]).to eq(schema_map)
+              expect(encryption_options[:bypass_auto_encryption]).to eq(bypass_auto_encryption)
+              expect(encryption_options[:extra_options][:mongocryptd_uri]).to eq(mongocryptd_uri)
+              expect(encryption_options[:extra_options][:mongocryptd_bypass_spawn]).to eq(mongocryptd_bypass_spawn)
+              expect(encryption_options[:extra_options][:mongocryptd_spawn_path]).to eq(mongocryptd_spawn_path)
+              expect(encryption_options[:extra_options][:mongocryptd_spawn_args]).to eq(mongocryptd_spawn_args)
+
+              expect(client.encrypter.mongocryptd_client.options[:monitoring_io]).to be false
+            end
+
+            context 'with default extra options' do
+              let(:auto_encryption_options) do
+                {
+                  key_vault_namespace: key_vault_namespace,
+                  kms_providers: kms_providers,
+                  schema_map: schema_map,
+                }
+              end
+
+              it 'sets key_vault_client as a clone of self with no encryption options' do
+                key_vault_client = client.encrypter.key_vault_client
+                expect(key_vault_client).to eq(client)
+              end
+
+              it 'sets bypass_auto_encryption to false' do
+                expect(encryption_options[:bypass_auto_encryption]).to be false
+              end
+
+              it 'sets extra options to defaults' do
+                expect(encryption_options[:extra_options][:mongocryptd_uri]).to eq('mongodb://localhost:27020')
+                expect(encryption_options[:extra_options][:mongocryptd_bypass_spawn]).to be false
+                expect(encryption_options[:extra_options][:mongocryptd_spawn_path]).to eq('mongocryptd')
+                expect(encryption_options[:extra_options][:mongocryptd_spawn_args]).to eq(['--idleShutdownTimeoutSecs=60'])
+              end
+            end
+
+            context 'with mongocryptd_spawn_args that don\'t include idleShutdownTimeoutSecs' do
+              let(:mongocryptd_spawn_args) { ['--otherArgument=true'] }
+
+              it 'adds a default value to mongocryptd_spawn_args' do
+                expect(encryption_options[:extra_options][:mongocryptd_spawn_args]).to eq(mongocryptd_spawn_args + ['--idleShutdownTimeoutSecs=60'])
+              end
+            end
+
+            context 'with mongocryptd_spawn_args that has idleShutdownTimeoutSecs as two arguments' do
+              let(:mongocryptd_spawn_args) { ['--idleShutdownTimeoutSecs', 100] }
+
+              it 'does not modify mongocryptd_spawn_args' do
+                expect(encryption_options[:extra_options][:mongocryptd_spawn_args]).to eq(mongocryptd_spawn_args)
+              end
+            end
+
+            context 'with default key_vault_client' do
+              let(:key_vault_client) { nil }
+
+              it 'creates a key_vault_client' do
+                key_vault_client = encryption_options[:key_vault_client]
+
+                expect(key_vault_client).to be_a_kind_of(Mongo::Client)
+              end
+            end
+          end
+        end
+
+        context 'with AWS KMS providers' do
+          include_context 'with AWS kms_providers' do
+            it_behaves_like 'a functioning auto encryption client'
+          end
+        end
+
+        context 'with local KMS providers' do
+          include_context 'with local kms_providers' do
+            it_behaves_like 'a functioning auto encryption client'
+          end
+        end
+      end
+
+      context 'timeout options' do
+        let(:client) do
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.authorized_test_options.merge(options))
+        end
+
+        context 'when network timeouts are zero' do
+          let(:options) do
+            { socket_timeout: 0, connect_timeout: 0 }
+          end
+
+          it 'sets options to zeros' do
+            client.options[:socket_timeout].should == 0
+            client.options[:connect_timeout].should == 0
+          end
+
+          it 'connects and performs operations successfully' do
+            lambda do
+              client.database.command(ping: 1)
+            end.should_not raise_error
+          end
+        end
+
+        %i(socket_timeout connect_timeout).each do |option|
+          context "when #{option} is negative" do
+            let(:options) do
+              { option => -1 }
+            end
+
+            it 'fails client creation' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /#{option} must be a non-negative number/)
+            end
+          end
+
+          context "when #{option} is of the wrong type" do
+            let(:options) do
+              { option => '42' }
+            end
+
+            it 'fails client creation' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /#{option} must be a non-negative number/)
+            end
+          end
+        end
+
+        context "when :connect_timeout is very small" do
+          # The driver reads first and checks the deadline second.
+          # This means the read (in a monitor) can technically take more than
+          # the connect timeout. Restrict to TLS configurations to make
+          # the network I/O take longer.
+          require_tls
+
+          let(:options) do
+            { connect_timeout: 1e-6, server_selection_timeout: 2 }
+          end
+
+          it 'allows client creation' do
+            lambda do
+              client
+            end.should_not raise_error
+          end
+
+          it 'fails server selection due to very small timeout' do
+            lambda do
+              client.database.command(ping: 1)
+            end.should raise_error(Mongo::Error::NoServerAvailable)
+          end
+        end
+
+        context "when :socket_timeout is very small" do
+          # The driver reads first and checks the deadline second.
+          # This means the read (in a monitor) can technically take more than
+          # the connect timeout. Restrict to TLS configurations to make
+          # the network I/O take longer.
+          require_tls
+
+          let(:options) do
+            { socket_timeout: 1e-6, server_selection_timeout: 2 }
+          end
+
+          it 'allows client creation' do
+            lambda do
+              client
+            end.should_not raise_error
+          end
+
+          it 'fails operations due to very small timeout' do
+            lambda do
+              client.database.command(ping: 1)
+            end.should raise_error(Mongo::Error::SocketTimeoutError)
+          end
+        end
+      end
 
       context 'retry_writes option' do
         let(:client) do
@@ -197,49 +462,19 @@ describe Mongo::Client do
       context 'when compressors are provided' do
 
         let(:client) do
-          new_local_client(SpecConfig.instance.addresses, authorized_client.options.merge(options))
-        end
-
-        context 'when the compressor is supported' do
-
-          let(:options) do
-            { compressors: ['zlib'] }
-          end
-
-          it 'sets the compressor' do
-            expect(client.options['compressors']).to eq(options[:compressors])
-          end
-
-          it 'sends the compressor in the compression key of the handshake document' do
-            expect(client.cluster.app_metadata.send(:document)[:compression]).to eq(options[:compressors])
-          end
-
-          context 'when server supports compression' do
-            require_compression
-            min_server_fcv '3.6'
-
-            it 'uses compression for messages' do
-              expect(Mongo::Protocol::Compressed).to receive(:new).and_call_original
-              client[TEST_COLL].find({}, limit: 1).first
-            end
-          end
-
-          it 'does not use compression for authentication messages' do
-            expect(Mongo::Protocol::Compressed).not_to receive(:new)
-            client.cluster.next_primary.send(:with_connection) do |conn|
-              conn.send(:authenticate!, conn)
-            end
-          end
+          new_local_client(SpecConfig.instance.addresses,
+            SpecConfig.instance.all_test_options.merge(options))
         end
 
         context 'when the compressor is not supported by the driver' do
+          require_warning_clean
 
           let(:options) do
             { compressors: ['snoopy'] }
           end
 
           it 'does not set the compressor and warns' do
-            expect(Mongo::Logger.logger).to receive(:warn)
+            expect(Mongo::Logger.logger).to receive(:warn).with(/Unsupported compressor/)
             expect(client.options['compressors']).to be_nil
           end
 
@@ -278,36 +513,120 @@ describe Mongo::Client do
             expect(client.cluster.next_primary.monitor.compressor).to be_nil
           end
         end
-      end
 
-      context 'when compressors are not provided' do
-        require_no_compression
+        context 'when zlib compression is requested' do
+          require_zlib_compression
 
-        let(:client) do
-          authorized_client
-        end
+          let(:options) do
+            { compressors: ['zlib'] }
+          end
 
-        it 'does not set the compressor' do
-          expect(client.options['compressors']).to be_nil
-        end
+          it 'sets the compressor' do
+            expect(client.options['compressors']).to eq(options[:compressors])
+          end
 
-        it 'sets the compression key of the handshake document to an empty array' do
-          expect(client.cluster.app_metadata.send(:document)[:compression]).to eq([])
-        end
+          it 'sends the compressor in the compression key of the handshake document' do
+            expect(client.cluster.app_metadata.send(:document)[:compression]).to eq(options[:compressors])
+          end
 
-        it 'does not use compression for messages' do
-          client[TEST_COLL].find({}, limit: 1).first
-          expect(Mongo::Protocol::Compressed).not_to receive(:new)
-        end
-      end
+          context 'when server supports compression' do
+            min_server_fcv '3.6'
 
-      context 'when a zlib_compression_level option is provided' do
-        require_compression
-        min_server_fcv '3.6'
+            it 'uses compression for messages' do
+              expect(Mongo::Protocol::Compressed).to receive(:new).at_least(:once).and_call_original
+              client[TEST_COLL].find({}, limit: 1).first
+            end
+          end
 
-        let(:client) do
-          new_local_client_nmio(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(zlib_compression_level: 1))
-        end
+          it 'does not use compression for authentication messages' do
+            expect(Mongo::Protocol::Compressed).not_to receive(:new)
+            client.cluster.next_primary.send(:with_connection) do |conn|
+              conn.connect!
+            end
+          end
+        end
+
+        context 'when snappy compression is requested and supported by the server' do
+          min_server_version '3.6'
+
+          let(:options) do
+            { compressors: ['snappy'] }
+          end
+
+          context 'when snappy gem is installed' do
+            require_snappy_compression
+
+            it 'creates the client' do
+              expect(client.options['compressors']).to eq(['snappy'])
+            end
+          end
+
+          context 'when snappy gem is not installed' do
+            require_no_snappy_compression
+
+            it 'raises an exception' do
+              expect do
+                client
+              end.to raise_error(Mongo::Error::UnmetDependency, /Cannot enable snappy compression/)
+            end
+          end
+        end
+
+        context 'when zstd compression is requested and supported by the server' do
+          min_server_version '4.2'
+
+          let(:options) do
+            { compressors: ['zstd'] }
+          end
+
+          context 'when zstd gem is installed' do
+            require_zstd_compression
+
+            it 'creates the client' do
+              expect(client.options['compressors']).to eq(['zstd'])
+            end
+          end
+
+          context 'when zstd gem is not installed' do
+            require_no_zstd_compression
+
+            it 'raises an exception' do
+              expect do
+                client
+              end.to raise_error(Mongo::Error::UnmetDependency, /Cannot enable zstd compression/)
+            end
+          end
+        end
+      end
+
+      context 'when compressors are not provided' do
+        require_no_compression
+
+        let(:client) do
+          authorized_client
+        end
+
+        it 'does not set the compressor' do
+          expect(client.options['compressors']).to be_nil
+        end
+
+        it 'sets the compression key of the handshake document to an empty array' do
+          expect(client.cluster.app_metadata.send(:document)[:compression]).to eq([])
+        end
+
+        it 'does not use compression for messages' do
+          client[TEST_COLL].find({}, limit: 1).first
+          expect(Mongo::Protocol::Compressed).not_to receive(:new)
+        end
+      end
+
+      context 'when a zlib_compression_level option is provided' do
+        require_compression
+        min_server_fcv '3.6'
+
+        let(:client) do
+          new_local_client_nmio(SpecConfig.instance.addresses, SpecConfig.instance.test_options.merge(zlib_compression_level: 1))
+        end
 
         it 'sets the option on the client' do
           expect(client.options[:zlib_compression_level]).to eq(1)
@@ -411,7 +730,7 @@ describe Mongo::Client do
       context 'when providing a custom logger' do
 
         let(:logger) do
-          Logger.new($stdout).tap do |l|
+          Logger.new(STDOUT).tap do |l|
             l.level = Logger::FATAL
           end
         end
@@ -580,16 +899,40 @@ describe Mongo::Client do
           new_local_client_nmio(['127.0.0.1:27017'])
         end
 
-        let(:platform_string) do
-          [
-            RUBY_VERSION,
-            RUBY_PLATFORM,
-            RbConfig::CONFIG['build']
-          ].join(', ')
+        context 'mri' do
+          require_mri
+
+          let(:platform_string) do
+            [
+              "Ruby #{RUBY_VERSION}",
+              RUBY_PLATFORM,
+              RbConfig::CONFIG['build'],
+              'A',
+            ].join(', ')
+          end
+
+          it 'does not include the platform info in the app metadata' do
+            expect(app_metadata.send(:full_client_document)[:platform]).to eq(platform_string)
+          end
         end
 
-        it 'does not include the platform info in the app metadata' do
-          expect(app_metadata.send(:full_client_document)[:platform]).to eq(platform_string)
+        context 'jruby' do
+          require_jruby
+
+          let(:platform_string) do
+            [
+              "JRuby #{JRUBY_VERSION}",
+              "like Ruby #{RUBY_VERSION}",
+              RUBY_PLATFORM,
+              "JVM #{java.lang.System.get_property('java.version')}",
+              RbConfig::CONFIG['build'],
+              'A',
+            ].join(', ')
+          end
+
+          it 'does not include the platform info in the app metadata' do
+            expect(app_metadata.send(:full_client_document)[:platform]).to eq(platform_string)
+          end
         end
       end
     end
@@ -642,7 +985,7 @@ describe Mongo::Client do
         end
       end
 
-      context 'when options are provided' do
+      context 'when URI options are provided' do
 
         let!(:uri) do
           'mongodb://127.0.0.1:27017/testdb?w=3'
@@ -691,215 +1034,734 @@ describe Mongo::Client do
               end
             end
 
-            context 'when the min_pool_size is equal to the max_pool_size' do
+            context 'when the min_pool_size is equal to the max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=10&maxPoolSize=10'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(10)
+                expect(client.options[:max_pool_size]).to eq(10)
+              end
+            end
+          end
+
+          context 'when max_pool_size is not provided' do
+
+            context 'when the min_pool_size is greater than the default max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=10'
+              end
+
+              it 'raises an Exception' do
+                expect {
+                  client
+                }.to raise_exception(Mongo::Error::InvalidMinPoolSize)
+              end
+            end
+
+            context 'when the min_pool_size is less than the default max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=3'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(3)
+              end
+            end
+
+            context 'when the min_pool_size is equal to the max_pool_size' do
+
+              let(:uri) do
+                'mongodb://127.0.0.1:27017/?minPoolSize=5'
+              end
+
+              it 'sets the option' do
+                expect(client.options[:min_pool_size]).to eq(5)
+              end
+            end
+          end
+        end
+
+        context 'when retryReads URI option is given' do
+
+          context 'it is false' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryReads=false'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_reads]).to be false
+            end
+          end
+
+          context 'it is true' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryReads=true'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_reads]).to be true
+            end
+          end
+        end
+
+        context 'when retryWrites URI option is given' do
+
+          context 'it is false' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryWrites=false'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_writes]).to be false
+            end
+          end
+
+          context 'it is true' do
+            let!(:uri) do
+              'mongodb://127.0.0.1:27017/testdb?retryWrites=true'
+            end
+
+            it 'sets the option on the client' do
+              expect(client.options[:retry_writes]).to be true
+            end
+          end
+        end
+      end
+
+      context 'when options are provided not in the string' do
+
+        let!(:uri) do
+          'mongodb://127.0.0.1:27017/testdb'
+        end
+
+        let(:client) do
+          new_local_client_nmio(uri, :write => { :w => 3 })
+        end
+
+        let(:expected_options) do
+          Mongo::Options::Redacted.new(:write => { :w => 3 },
+            monitoring_io: false, :database => 'testdb', retry_writes: true,
+            retry_reads: true)
+        end
+
+        it 'sets the options' do
+          expect(client.options).to eq(expected_options)
+        end
+      end
+
+      context 'when options are provided in the URI and as Ruby options' do
+
+        let!(:uri) do
+          'mongodb://127.0.0.1:27017/testdb?w=3'
+        end
+
+        let(:client) do
+          new_local_client_nmio(uri, option_name => { :w => 4 })
+        end
+
+        let(:expected_options) do
+          Mongo::Options::Redacted.new(option_name => { :w => 4 },
+            monitoring_io: false, :database => 'testdb', retry_writes: true,
+            retry_reads: true)
+        end
+
+        shared_examples_for 'allows explicit options to take preference' do
+          it 'allows explicit options to take preference' do
+            expect(client.options).to eq(expected_options)
+          end
+        end
+
+        context 'when using :write' do
+          let(:option_name) { :write }
+
+          it_behaves_like 'allows explicit options to take preference'
+        end
+
+        context 'when using :write_concern' do
+          let(:option_name) { :write_concern }
+
+          it_behaves_like 'allows explicit options to take preference'
+        end
+      end
+
+      context 'when a replica set name is provided' do
+
+        let!(:uri) do
+          'mongodb://127.0.0.1:27017/testdb?replicaSet=testing'
+        end
+
+        let(:client) do
+          new_local_client_nmio(uri)
+        end
+
+        it 'sets the correct cluster topology' do
+          expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::ReplicaSetNoPrimary)
+        end
+      end
+    end
+
+    context 'when Ruby options are provided' do
+      let(:client) do
+        new_local_client_nmio(['127.0.0.1:27017'], options)
+      end
+
+      describe 'connection option conflicts' do
+        context 'direct_connection: true and multiple seeds' do
+          let(:client) do
+            new_local_client_nmio(['127.0.0.1:27017', '127.0.0.2:27017'],
+              direct_connection: true)
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /direct_connection=true cannot be used with multiple seeds/)
+          end
+        end
+
+        context 'direct_connection: true and connect: :direct' do
+          let(:options) do
+            {direct_connection: true, connect: :direct}
+          end
+
+          it 'is accepted' do
+            client.options[:direct_connection].should be true
+            client.options[:connect].should be :direct
+          end
+        end
+
+        context 'direct_connection: true and connect: :replica_set' do
+          let(:options) do
+            {direct_connection: true, connect: :replica_set}
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /Conflicting client options: direct_connection=true and connect=replica_set/)
+          end
+        end
+
+        context 'direct_connection: true and connect: :sharded' do
+          let(:options) do
+            {direct_connection: true, connect: :sharded}
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /Conflicting client options: direct_connection=true and connect=sharded/)
+          end
+        end
+
+        context 'direct_connection: false and connect: :direct' do
+          let(:options) do
+            {direct_connection: false, connect: :direct}
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /Conflicting client options: direct_connection=false and connect=direct/)
+          end
+        end
+
+        context 'direct_connection: false and connect: :replica_set' do
+          let(:options) do
+            {direct_connection: false, connect: :replica_set, replica_set: 'foo'}
+          end
+
+          it 'is accepted' do
+            client.options[:direct_connection].should be false
+            client.options[:connect].should be :replica_set
+          end
+        end
+
+        context 'direct_connection: false and connect: :sharded' do
+          let(:options) do
+            {direct_connection: false, connect: :sharded}
+          end
+
+          it 'is accepted' do
+            client.options[:direct_connection].should be false
+            client.options[:connect].should be :sharded
+          end
+        end
+      end
+
+      context ':bg_error_backtrace option' do
+        [true, false, nil, 42].each do |valid_value|
+          context "valid value: #{valid_value.inspect}" do
+            let(:options) do
+              {bg_error_backtrace: valid_value}
+            end
+
+            it 'is accepted' do
+              client.options[:bg_error_backtrace].should == valid_value
+            end
+          end
+        end
+
+        context 'invalid value type' do
+          let(:options) do
+            {bg_error_backtrace: 'yes'}
+          end
+
+          it 'is rejected' do
+            lambda do
+              client
+            end.should raise_error(ArgumentError, /:bg_error_backtrace option value must be true, false, nil or a positive integer/)
+          end
+        end
+
+        context 'invalid value' do
+          [0, -1, 42.0].each do |invalid_value|
+            context "invalid value: #{invalid_value.inspect}" do
+              let(:options) do
+                {bg_error_backtrace: invalid_value}
+              end
+
+              it 'is rejected' do
+                lambda do
+                  client
+                end.should raise_error(ArgumentError, /:bg_error_backtrace option value must be true, false, nil or a positive integer/)
+              end
+            end
+          end
+        end
+      end
+
+      describe ':read option' do
+        [
+          :primary, :primary_preferred, :secondary, :secondary_preferred,  :nearest
+        ].each do |sym|
+          describe "#{sym}" do
+            context 'when given as symbol' do
+              let(:options) do
+                {read: {mode: sym}}
+              end
+
+              it "is accepted" do
+                # the key got converted to a string here
+                expect(client.read_preference).to eq({'mode' => sym})
+              end
+            end
+
+            context 'when given as string' do
+              let(:options) do
+                {read: {mode: sym.to_s}}
+              end
+
+              # string keys are not documented as being allowed
+              # but the code accepts them
+              it "is accepted" do
+                # the key got converted to a string here
+                # the value remains a string
+                expect(client.read_preference).to eq({'mode' => sym.to_s})
+              end
+            end
+          end
+        end
+
+        context 'when not linting' do
+          require_no_linting
+
+          it 'rejects bogus read preference as symbol' do
+            expect do
+              client = new_local_client_nmio(['127.0.0.1:27017'],
+                :read => {:mode => :bogus})
+            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {"mode"=>:bogus}: mode bogus is not one of recognized modes')
+          end
+
+          it 'rejects bogus read preference as string' do
+            expect do
+              client = new_local_client_nmio(['127.0.0.1:27017'],
+                :read => {:mode => 'bogus'})
+            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: {"mode"=>"bogus"}: mode bogus is not one of recognized modes')
+          end
+
+          it 'rejects read option specified as a string' do
+            expect do
+              client = new_local_client_nmio(['127.0.0.1:27017'],
+                :read => 'primary')
+            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
+          end
+
+          it 'rejects read option specified as a symbol' do
+            expect do
+              client = new_local_client_nmio(['127.0.0.1:27017'],
+                :read => :primary)
+            end.to raise_error(Mongo::Error::InvalidReadOption, 'Invalid read option: primary: must be a hash')
+          end
+        end
+      end
+
+      context 'when setting read concern options' do
+        min_server_fcv '3.2'
+
+        context 'when read concern is valid' do
+          let(:options) do
+            { read_concern: { level: :local } }
+          end
+
+          it 'does not warn' do
+            expect(Mongo::Logger.logger).to_not receive(:warn)
+            new_local_client_nmio(SpecConfig.instance.addresses, options)
+          end
+        end
+
+        context 'when read concern has an invalid key' do
+          require_no_linting
+
+          let(:options) do
+            { read_concern: { hello: :local } }
+          end
+
+          it 'logs a warning' do
+            expect(Mongo::Logger.logger).to receive(:warn).with(/Read concern has invalid keys: hello/)
+            new_local_client_nmio(SpecConfig.instance.addresses, options)
+          end
+        end
+
+        context 'when read concern has a non-user-settable key' do
+          let(:options) do
+            { read_concern: { after_cluster_time: 100 } }
+          end
+
+          it 'raises an exception' do
+            expect do
+              new_local_client_nmio(SpecConfig.instance.addresses, options)
+            end.to raise_error(Mongo::Error::InvalidReadConcern, 'The after_cluster_time read_concern option cannot be specified by the user')
+          end
+        end
+      end
+
+      context 'when an invalid option is provided' do
+
+        let(:options) do
+          {ssl: false, invalid: :test}
+        end
+
+        it 'does not set the option' do
+          expect(client.options.keys).not_to include('invalid')
+        end
+
+        it 'sets the valid options' do
+          expect(client.options.keys).to include('ssl')
+        end
+
+        it 'warns that an invalid option has been specified' do
+          expect(Mongo::Logger.logger).to receive(:warn)
+          expect(client.options.keys).not_to include('invalid')
+        end
+      end
+
+=begin WriteConcern object support
+      context 'when write concern is provided via a WriteConcern object' do
+
+        let(:options) do
+          {write_concern: wc}
+        end
+
+        let(:wc) { Mongo::WriteConcern.get(w: 2) }
+
+        it 'stores write concern options in client options' do
+          expect(client.options[:write_concern]).to eq(
+            Mongo::Options::Redacted.new(w: 2))
+        end
+
+        it 'caches write concern object' do
+          expect(client.write_concern).to be wc
+        end
+      end
+=end
+
+      context ':wrapping_libraries option' do
+        let(:options) do
+          {wrapping_libraries: wrapping_libraries}
+        end
 
-              let(:uri) do
-                'mongodb://127.0.0.1:27017/?minPoolSize=10&maxPoolSize=10'
-              end
+        context 'valid input' do
+          context 'symbol keys' do
+            let(:wrapping_libraries) do
+              [name: 'Mongoid', version: '7.1.2'].freeze
+            end
 
-              it 'sets the option' do
-                expect(client.options[:min_pool_size]).to eq(10)
-                expect(client.options[:max_pool_size]).to eq(10)
-              end
+            it 'works' do
+              client.options[:wrapping_libraries].should == ['name' => 'Mongoid', 'version' => '7.1.2']
             end
           end
 
-          context 'when max_pool_size is not provided' do
-
-            context 'when the min_pool_size is greater than the default max_pool_size' do
-
-              let(:uri) do
-                'mongodb://127.0.0.1:27017/?minPoolSize=10'
-              end
-
-              it 'raises an Exception' do
-                expect {
-                  client
-                }.to raise_exception(Mongo::Error::InvalidMinPoolSize)
-              end
+          context 'string keys' do
+            let(:wrapping_libraries) do
+              ['name' => 'Mongoid', 'version' => '7.1.2'].freeze
             end
 
-            context 'when the min_pool_size is less than the default max_pool_size' do
-
-              let(:uri) do
-                'mongodb://127.0.0.1:27017/?minPoolSize=3'
-              end
+            it 'works' do
+              client.options[:wrapping_libraries].should == ['name' => 'Mongoid', 'version' => '7.1.2']
+            end
+          end
 
-              it 'sets the option' do
-                expect(client.options[:min_pool_size]).to eq(3)
-              end
+          context 'Redacted keys' do
+            let(:wrapping_libraries) do
+              [Mongo::Options::Redacted.new(name: 'Mongoid', version: '7.1.2')].freeze
             end
 
-            context 'when the min_pool_size is equal to the max_pool_size' do
+            it 'works' do
+              client.options[:wrapping_libraries].should == ['name' => 'Mongoid', 'version' => '7.1.2']
+            end
+          end
 
-              let(:uri) do
-                'mongodb://127.0.0.1:27017/?minPoolSize=5'
-              end
+          context 'two libraries' do
+            let(:wrapping_libraries) do
+              [
+                {name: 'Mongoid', version: '7.1.2'},
+                {name: 'Rails', version: '4.0', platform: 'Foobar'},
+              ].freeze
+            end
 
-              it 'sets the option' do
-                expect(client.options[:min_pool_size]).to eq(5)
-              end
+            it 'works' do
+              client.options[:wrapping_libraries].should == [
+                {'name' => 'Mongoid', 'version' => '7.1.2'},
+                {'name' => 'Rails', 'version' => '4.0', 'platform' => 'Foobar'},
+              ]
             end
           end
-        end
-
-        context 'when retryReads URI option is given' do
 
-          context 'it is false' do
-            let!(:uri) do
-              'mongodb://127.0.0.1:27017/testdb?retryReads=false'
+          context 'empty array' do
+            let(:wrapping_libraries) do
+              []
             end
 
-            it 'sets the option on the client' do
-              expect(client.options[:retry_reads]).to be false
+            it 'works' do
+              client.options[:wrapping_libraries].should == []
             end
           end
 
-          context 'it is true' do
-            let!(:uri) do
-              'mongodb://127.0.0.1:27017/testdb?retryReads=true'
+          context 'empty array' do
+            let(:wrapping_libraries) do
+              nil
             end
 
-            it 'sets the option on the client' do
-              expect(client.options[:retry_reads]).to be true
+            it 'works' do
+              client.options[:wrapping_libraries].should be nil
             end
           end
         end
 
-        context 'when retryWrites URI option is given' do
+        context 'valid input' do
+          context 'hash given instead of an array' do
+            let(:wrapping_libraries) do
+              {name: 'Mongoid', version: '7.1.2'}.freeze
+            end
 
-          context 'it is false' do
-            let!(:uri) do
-              'mongodb://127.0.0.1:27017/testdb?retryWrites=false'
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /:wrapping_libraries must be an array of hashes/)
+            end
+          end
+
+          context 'invalid keys' do
+            let(:wrapping_libraries) do
+              [name: 'Mongoid', invalid: '7.1.2'].freeze
             end
 
-            it 'sets the option on the client' do
-              expect(client.options[:retry_writes]).to be false
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /:wrapping_libraries element has invalid keys/)
             end
           end
 
-          context 'it is true' do
-            let!(:uri) do
-              'mongodb://127.0.0.1:27017/testdb?retryWrites=true'
+          context 'value includes |' do
+            let(:wrapping_libraries) do
+              [name: 'Mongoid|on|Rails', version: '7.1.2'].freeze
             end
 
-            it 'sets the option on the client' do
-              expect(client.options[:retry_writes]).to be true
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, /:wrapping_libraries element value cannot include '|'/)
             end
           end
         end
       end
 
-      context 'when options are provided not in the string' do
+      context ':auth_mech_properties option' do
+        context 'is nil' do
+          let(:options) do
+            {auth_mech_properties: nil}
+          end
 
-        let!(:uri) do
-          'mongodb://127.0.0.1:27017/testdb'
+          it 'creates the client without the option' do
+            client.options.should_not have_key(:auth_mech_properties)
+          end
         end
+      end
 
-        let(:client) do
-          new_local_client_nmio(uri, :write => { :w => 3 })
-        end
+      context ':server_api parameter' do
+        context 'is a hash with symbol keys' do
+          context 'using known keys' do
+            let(:options) do
+              {server_api: {
+                version: '1',
+                strict: true,
+                deprecation_errors: false,
+              }}
+            end
 
-        let(:expected_options) do
-          Mongo::Options::Redacted.new(:write => { :w => 3 },
-            monitoring_io: false, :database => 'testdb', retry_writes: true,
-            retry_reads: true)
-        end
+            it 'is accepted' do
+              client.options[:server_api].should == {
+                'version' => '1',
+                'strict' => true,
+                'deprecation_errors' => false,
+              }
+            end
+          end
 
-        it 'sets the options' do
-          expect(client.options).to eq(expected_options)
-        end
-      end
+          context 'using an unknown version' do
+            let(:options) do
+              {server_api: {
+                version: '42',
+              }}
+            end
 
-      context 'when options are provided in the URI and as Ruby options' do
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, 'Unknown server API version: 42')
+            end
+          end
 
-        let!(:uri) do
-          'mongodb://127.0.0.1:27017/testdb?w=3'
-        end
+          context 'using an unknown option' do
+            let(:options) do
+              {server_api: {
+                vversion: '1',
+              }}
+            end
 
-        let(:client) do
-          new_local_client_nmio(uri, option_name => { :w => 4 })
-        end
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, 'Unknown keys under :server_api: "vversion"')
+            end
+          end
 
-        let(:expected_options) do
-          Mongo::Options::Redacted.new(option_name => { :w => 4 },
-            monitoring_io: false, :database => 'testdb', retry_writes: true,
-            retry_reads: true)
-        end
+          context 'using a value which is not a hash' do
+            let(:options) do
+              {server_api: 42}
+            end
 
-        shared_examples_for 'allows explicit options to take preference' do
-          it 'allows explicit options to take preference' do
-            expect(client.options).to eq(expected_options)
+            it 'is rejected' do
+              lambda do
+                client
+              end.should raise_error(ArgumentError, ':server_api value must be a hash: 42')
+            end
           end
         end
 
-        context 'when using :write' do
-          let(:option_name) { :write }
+        context 'when connected to a pre-OP_MSG server' do
+          max_server_version '3.4'
 
-          it_behaves_like 'allows explicit options to take preference'
-        end
+          let(:options) do
+            {server_api: {version: 1}}
+          end
 
-        context 'when using :write_concern' do
-          let(:option_name) { :write_concern }
+          let(:client) do
+            new_local_client(SpecConfig.instance.addresses,
+              SpecConfig.instance.all_test_options.merge(options))
+          end
 
-          it_behaves_like 'allows explicit options to take preference'
-        end
-      end
+          it 'constructs the client' do
+            client.should be_a(Mongo::Client)
+          end
 
-      context 'when a replica set name is provided' do
+          it 'does not discover servers' do
+            client.cluster.servers_list.each do |s|
+              expect(s.status).to eq('UNKNOWN')
+            end
+          end
 
-        let!(:uri) do
-          'mongodb://127.0.0.1:27017/testdb?replicaSet=testing'
+          it 'fails operations' do
+            lambda do
+              client.command(ping: 1)
+            end.should raise_error(Mongo::Error::NoServerAvailable)
+          end
         end
+      end
+    end
 
-        let(:client) do
-          new_local_client_nmio(uri)
+    context 'when making a block client' do
+      context 'when the block doesn\'t raise an error' do
+        let(:block_client) do
+          c = nil
+          Mongo::Client.new(
+            SpecConfig.instance.addresses,
+            SpecConfig.instance.test_options.merge(database: SpecConfig.instance.test_db),
+          ) do |client|
+            c = client
+          end
+          c
         end
 
-        it 'sets the correct cluster topology' do
-          expect(client.cluster.topology).to be_a(Mongo::Cluster::Topology::ReplicaSetNoPrimary)
+        it 'is closed after block' do
+          expect(block_client.cluster.connected?).to eq(false)
         end
       end
 
-      context 'when an invalid option is provided' do
-
-        let(:client) do
-          new_local_client_nmio(['127.0.0.1:27017'], :ssl => false, :invalid => :test)
-        end
-
-        it 'does not set the option' do
-          expect(client.options.keys).not_to include('invalid')
+      context 'when the block raises an error' do
+        it 'it is closed after the block' do
+          block_client_raise = nil
+          expect do
+            Mongo::Client.new(
+              SpecConfig.instance.addresses,
+              SpecConfig.instance.test_options.merge(database: SpecConfig.instance.test_db),
+            ) do |client|
+              block_client_raise = client
+              raise "This is an error!"
+            end
+          end.to raise_error(StandardError, "This is an error!")
+          expect(block_client_raise.cluster.connected?).to eq(false)
         end
+      end
 
-        it 'sets the valid options' do
-          expect(client.options.keys).to include('ssl')
+      context 'when the hosts given include the protocol' do
+        it 'raises an error on mongodb://' do
+          expect do
+            Mongo::Client.new(['mongodb://127.0.0.1:27017/test'])
+          end.to raise_error(ArgumentError, "Host 'mongodb://127.0.0.1:27017/test' should not contain protocol. Did you mean to not use an array?")
         end
 
-        it 'warns that an invalid option has been specified' do
-          expect(Mongo::Logger.logger).to receive(:warn)
-          expect(client.options.keys).not_to include('invalid')
+        it 'raises an error on mongodb+srv://' do
+          expect do
+            Mongo::Client.new(['mongodb+srv://127.0.0.1:27017/test'])
+          end.to raise_error(ArgumentError, "Host 'mongodb+srv://127.0.0.1:27017/test' should not contain protocol. Did you mean to not use an array?")
         end
-      end
-
-=begin WriteConcern object support
-      context 'when write concern is provided via a WriteConcern object' do
 
-        let(:client) do
-          new_local_client_nmio(['127.0.0.1:27017'], write_concern: wc)
+        it 'raises an error on multiple items' do
+          expect do
+            Mongo::Client.new(['127.0.0.1:27017', 'mongodb+srv://127.0.0.1:27017/test'])
+          end.to raise_error(ArgumentError, "Host 'mongodb+srv://127.0.0.1:27017/test' should not contain protocol. Did you mean to not use an array?")
         end
 
-        let(:wc) { Mongo::WriteConcern.get(w: 2) }
-
-        it 'stores write concern options in client options' do
-          expect(client.options[:write_concern]).to eq(
-            Mongo::Options::Redacted.new(w: 2))
+        it 'raises an error only at beginning of string' do
+          expect do
+            Mongo::Client.new(['somethingmongodb://127.0.0.1:27017/test', 'mongodb+srv://127.0.0.1:27017/test'])
+          end.to raise_error(ArgumentError, "Host 'mongodb+srv://127.0.0.1:27017/test' should not contain protocol. Did you mean to not use an array?")
         end
 
-        it 'caches write concern object' do
-          expect(client.write_concern).to be wc
+        it 'raises an error with different case' do
+          expect do
+            Mongo::Client.new(['MongOdB://127.0.0.1:27017/test'])
+          end.to raise_error(ArgumentError, "Host 'MongOdB://127.0.0.1:27017/test' should not contain protocol. Did you mean to not use an array?")
         end
       end
-=end
     end
   end
 
@@ -913,7 +1775,7 @@ describe Mongo::Client do
 
     it 'copies monitoring subscribers' do
       monitoring.subscribers.clear
-      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
+      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
       expect(monitoring.present_subscribers.length).to eq(1)
       expect(monitoring.subscribers[Mongo::Monitoring::SERVER_HEARTBEAT].length).to eq(1)
 
@@ -924,12 +1786,12 @@ describe Mongo::Client do
 
     it 'does not change subscribers on original client' do
       monitoring.subscribers.clear
-      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
+      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
       expect(monitoring.present_subscribers.length).to eq(1)
       expect(monitoring.subscribers[Mongo::Monitoring::SERVER_HEARTBEAT].length).to eq(1)
 
-      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
-      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
+      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
+      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
       expect(new_monitoring.present_subscribers.length).to eq(1)
       expect(new_monitoring.subscribers[Mongo::Monitoring::SERVER_HEARTBEAT].length).to eq(3)
       # original client should not have gotten any of the new subscribers
@@ -957,7 +1819,7 @@ describe Mongo::Client do
 
     it 'resets monitoring subscribers' do
       monitoring.subscribers.clear
-      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
+      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
       expect(monitoring.present_subscribers.length).to eq(1)
       expect(monitoring.subscribers[Mongo::Monitoring::SERVER_HEARTBEAT].length).to eq(1)
 
@@ -970,12 +1832,12 @@ describe Mongo::Client do
 
     it 'does not change subscribers on original client' do
       monitoring.subscribers.clear
-      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
+      client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
       expect(monitoring.present_subscribers.length).to eq(1)
       expect(monitoring.subscribers[Mongo::Monitoring::SERVER_HEARTBEAT].length).to eq(1)
 
-      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
-      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, EventSubscriber.new)
+      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
+      new_client.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
       # 7 default subscribers + heartbeat
       expect(new_monitoring.present_subscribers.length).to eq(8)
       # the heartbeat subscriber on the original client is not inherited
@@ -1079,6 +1941,73 @@ describe Mongo::Client do
       end
     end
 
+    context 'when direct_connection option is given' do
+      let(:client) do
+        options = SpecConfig.instance.test_options
+        options.delete(:connect)
+        new_local_client(SpecConfig.instance.addresses, options)
+      end
+
+      before do
+        client.options[:direct_connection].should be nil
+      end
+
+      let(:new_client) do
+        client.with(new_options)
+      end
+
+      context 'direct_connection set to false' do
+
+        let(:new_options) do
+          { direct_connection: false }
+        end
+
+        it 'is accepted' do
+          new_client.options[:direct_connection].should be false
+        end
+      end
+
+      context 'direct_connection set to true' do
+
+        let(:new_options) do
+          { direct_connection: true }
+        end
+
+        context 'in single topology' do
+          require_topology :single
+
+
+          it 'is accepted' do
+            new_client.options[:direct_connection].should be true
+            new_client.cluster.topology.should be_a(Mongo::Cluster::Topology::Single)
+          end
+        end
+
+        context 'in replica set or sharded cluster topology' do
+          require_topology :replica_set, :sharded
+
+          it 'is rejected' do
+            lambda do
+              new_client
+            end.should raise_error(ArgumentError, /direct_connection=true cannot be used with topologies other than Single/)
+          end
+
+          context 'when a new cluster is created' do
+
+            let(:new_options) do
+              { direct_connection: true, app_name: 'new-client' }
+            end
+
+            it 'is rejected' do
+              lambda do
+                new_client
+              end.should raise_error(ArgumentError, /direct_connection=true cannot be used with topologies other than Single/)
+            end
+          end
+        end
+      end
+    end
+
     context 'when the write concern is not changed' do
 
       let(:client) do
@@ -1323,7 +2252,10 @@ describe Mongo::Client do
 
     context 'when new client has a new cluster' do
       let(:client) do
-        new_local_client(['127.0.0.1:27017'], :database => SpecConfig.instance.test_db)
+        new_local_client(['127.0.0.1:27017'],
+          database: SpecConfig.instance.test_db,
+          server_selection_timeout: 0.5,
+          socket_timeout: 0.1, connect_timeout: 0.1)
       end
       let(:new_client) do
         client.with(app_name: 'client_construction_spec').tap do |new_client|
@@ -1348,7 +2280,6 @@ describe Mongo::Client do
     # in #with, the consistent behavior is to never transfer sdam_proc to
     # the new client.
     context 'when sdam_proc is given on original client' do
-      let(:subscriber) { EventSubscriber.new }
 
       let(:sdam_proc) do
         Proc.new do |client|
@@ -1356,31 +2287,91 @@ describe Mongo::Client do
         end
       end
 
-      let(:new_client) { client.with(database: 'foo') }
+      let(:client) do
+        new_local_client(SpecConfig.instance.addresses,
+          SpecConfig.instance.test_options.merge(
+            sdam_proc: sdam_proc,
+            connect_timeout: 3.08, socket_timeout: 3.09,
+            server_selection_timeout: 2.92,
+            heartbeat_frequency: 100,
+            database: SpecConfig.instance.test_db))
+      end
+
+      let(:new_client) do
+        client.with(app_name: 'foo').tap do |new_client|
+          new_client.cluster.should_not == client.cluster
+        end
+      end
+
+      before do
+        client.cluster.next_primary
+        events = subscriber.select_started_events(Mongo::Monitoring::Event::ServerHeartbeatStarted)
+        events.length.should > 0
+      end
 
       it 'does not copy sdam_proc option to new client' do
-        client = new_local_client(['a'], sdam_proc: sdam_proc)
         expect(new_client.options[:sdam_proc]).to be nil
       end
 
       it 'does not notify subscribers set up by sdam_proc' do
-        client = new_local_client(['a'], sdam_proc: sdam_proc)
+        # On 4.4, the push monitor also is receiving heartbeats.
+        # Give those some time to be processed.
+        sleep 2
+
         expect(subscriber.started_events.length).to be > 0
         subscriber.started_events.clear
 
         # If this test takes longer than heartbeat interval,
         # subscriber may receive events from the original client.
 
-        new_client
+        new_client.cluster.next_primary
+
+        # Diagnostics
+        unless subscriber.started_events.empty?
+          p subscriber.started_events
+        end
+
         expect(subscriber.started_events.length).to eq 0
+        new_client.cluster.topology.class.should_not be Mongo::Cluster::Topology::Unknown
+      end
+    end
+
+    context 'when :server_api is changed' do
+
+      let(:client) do
+        new_local_client_nmio(['127.0.0.1:27017'])
+      end
+
+      let(:new_client) do
+        client.with(server_api: {version: '1'})
+      end
+
+      it 'changes :server_api' do
+        new_client.options[:server_api].should == {'version' => '1'}
+      end
+    end
+
+    context 'when :server_api is cleared' do
+
+      let(:client) do
+        new_local_client_nmio(['127.0.0.1:27017'], server_api: {version: '1'})
+      end
+
+      let(:new_client) do
+        client.with(server_api: nil)
+      end
+
+      it 'clears :server_api' do
+        new_client.options[:server_api].should be nil
       end
     end
+
   end
 
   describe '#dup' do
 
     let(:client) do
-      new_local_client(
+      new_local_client_nmio(
           ['127.0.0.1:27017'],
           :read => { :mode => :primary },
           :database => SpecConfig.instance.test_db