fix failing specs

Author: jamis

lib/mongo/client.rb

@@ -1362,27 +1362,27 @@ def cluster_modifying?(new_options)
     # The argument may contain a subset of options that the client will
     # eventually have; this method validates each of the provided options
     # but does not check for interactions between combinations of options.
-    def validate_new_options!(opts)
-      return Options::Redacted.new unless opts
-
-      validate_read_concern!(opts[:read_concern])
-      validate_server_api!(opts[:server_api])
-      validate_max_min_pool_size!(opts)
-      validate_max_connecting!(opts)
-      validate_read!(opts)
-      validate_compressors!(opts)
-      validate_srv_max_hosts!(opts)
-
-      invalid_options = opts.keys.map(&:to_sym) - VALID_OPTIONS
-      if invalid_options.any?
-        log_warn("Unsupported client options: #{invalid_options.join(', ')}. These will be ignored.")
-        opts = opts.select { |key,| VALID_OPTIONS.include?(key.to_sym) }
-      end
-
-      Lint.validate_underscore_read_preference(opts[:read])
-      Lint.validate_read_concern_option(opts[:read_concern])
+    def validate_new_options!(options)
+      return Options::Redacted.new unless options
+
+      Options::Redacted.new(options).tap do |opts|
+        validate_read_concern!(opts[:read_concern])
+        validate_server_api!(opts[:server_api])
+        validate_max_min_pool_size!(opts)
+        validate_max_connecting!(opts)
+        validate_read!(opts)
+        validate_compressors!(opts)
+        validate_srv_max_hosts!(opts)
+
+        invalid_options = opts.keys.map(&:to_sym) - VALID_OPTIONS
+        if invalid_options.any?
+          log_warn("Unsupported client options: #{invalid_options.join(', ')}. These will be ignored.")
+          opts.delete_if { |key,| !VALID_OPTIONS.include?(key.to_sym) }
+        end
 
-      Options::Redacted.new(opts)
+        Lint.validate_underscore_read_preference(opts[:read])
+        Lint.validate_read_concern_option(opts[:read_concern])
+      end
     end
 
     # Validates all options after they are set on the client.
@@ -1645,7 +1645,11 @@ def validate_compressors!(opts)
         validate_zstd_compression!
       end
 
-      opts[:compressors] = compressors unless compressors.empty?
+      if compressors.empty?
+        opts.delete(:compressors)
+      else
+        opts[:compressors] = compressors
+      end
     end
 
     def validate_snappy_compression!

spec/mongo/client_construction_spec.rb

@@ -817,8 +817,9 @@
             { max_connecting: -5 }
           end
 
-          it 'raises an exception' do
-            expect { client }.to raise_error(Mongo::Error::InvalidMaxConnecting)
+          it 'logs a warning' do
+            expect(Mongo::Logger.logger).to receive(:warn).with(/Invalid max_connecting/)
+            client
           end
         end
       end
@@ -1035,13 +1036,14 @@
             end
           end
 
-          context 'when max_connecting is a negative integer' do
+          context 'when max_connecting is zero' do
             let(:uri) do
               'mongodb://127.0.0.1:27017/?maxConnecting=0'
             end
 
-            it 'raises an exception' do
-              expect { client }.to raise_error(Mongo::Error::InvalidMaxConnecting)
+            it 'logs a warning' do
+              expect(Mongo::Logger.logger).to receive(:warn).with(/Invalid max_connecting/)
+              client
             end
           end
         end