mongo 2.6.1 → 2.6.2

data/spec/mongo/auth/scram/negotiation_spec.rb

@@ -26,7 +26,8 @@ module Mongo
   end
 end
 
-describe 'SCRAM-SHA auth mechanism negotiation', if: scram_sha_256_enabled? do
+describe 'SCRAM-SHA auth mechanism negotiation' do
+  require_scram_sha_256_support
 
   URI_OPTION_MAP = {
     :auth_source => 'authsource',
@@ -65,7 +66,7 @@ describe 'SCRAM-SHA auth mechanism negotiation', if: scram_sha_256_enabled? do
       end
 
       Mongo::Client.new(
-        ADDRESSES,
+        SpecConfig.instance.addresses,
         TEST_OPTIONS.merge(opts)
       )
     end
@@ -310,11 +311,11 @@ describe 'SCRAM-SHA auth mechanism negotiation', if: scram_sha_256_enabled? do
   context 'when the configuration is specified in the URI' do
 
     let(:uri) do
-      "mongodb://#{user.name}:#{password}@#{ADDRESSES.join(',')}/admin".tap do |uri|
+      "mongodb://#{user.name}:#{password}@#{SpecConfig.instance.addresses.join(',')}/admin".tap do |uri|
         first = true
 
-        if defined?(URI_OPTIONS)
-          URI_OPTIONS.each do |k, v|
+        if SpecConfig.instance.uri_options
+          SpecConfig.instance.uri_options.each do |k, v|
             uri << (first ? '?' : '&')
             first = false
 

data/spec/mongo/auth/scram_spec.rb

@@ -101,6 +101,7 @@ describe Mongo::Auth::SCRAM do
   end
 
   context 'when SCRAM-SHA-256 is used' do
+    require_scram_sha_256_support
 
     describe '#login' do
 
@@ -119,13 +120,13 @@ describe Mongo::Auth::SCRAM do
           described_class.new(user)
         end
 
-        it 'raises an exception', if: scram_sha_256_enabled? do
+        it 'raises an exception' do
           expect {
             cr.login(connection)
           }.to raise_error(Mongo::Auth::Unauthorized)
         end
 
-        context 'when compression is used', if: scram_sha_256_enabled? && testing_compression? do
+        context 'when compression is used', if: testing_compression? do
 
           it 'does not compress the message' do
             expect(Mongo::Protocol::Compressed).not_to receive(:new)
@@ -150,12 +151,12 @@ describe Mongo::Auth::SCRAM do
           test_user.instance_variable_set(:@client_key, nil)
         end
 
-        it 'logs the user into the connection and caches the client key', if: scram_sha_256_enabled? do
+        it 'logs the user into the connection and caches the client key' do
           expect(login['ok']).to eq(1)
           expect(test_user.send(:client_key)).not_to be_nil
         end
 
-        it 'raises an exception when an incorrect client key is set', if: scram_sha_256_enabled? do
+        it 'raises an exception when an incorrect client key is set' do
           test_user.instance_variable_set(:@client_key, "incorrect client key")
           expect {
             cr.login(connection)

data/spec/mongo/bulk_write_spec.rb

@@ -424,7 +424,7 @@ describe Mongo::BulkWrite do
                                                    }])
               end
 
-              let(:selector) do 
+              let(:selector) do
                 { '$or' => [{ _id: 1 }, { _id: 2 }]}
               end
 
@@ -2136,7 +2136,8 @@ describe Mongo::BulkWrite do
     end
   end
 
-  describe 'when the collection has a validator', if: find_command_enabled? do
+  describe 'when the collection has a validator' do
+    min_server_version '3.2'
 
     before do
       collection_with_validator.insert_many([{ :a => 1 }, { :a => 2 }])

data/spec/mongo/client_spec.rb

@@ -34,14 +34,14 @@ describe Mongo::Client do
           expect do
             client = described_class.new(['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.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 = described_class.new(['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.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
@@ -717,7 +717,8 @@ describe Mongo::Client do
 
     context 'when providing a connection string' do
 
-      context 'when the string uses the SRV Protocol', if: test_connecting_externally? do
+      context 'when the string uses the SRV Protocol' do
+        require_external_connectivity
 
         let!(:uri) do
           'mongodb+srv://test5.test.build.10gen.cc/testdb'
@@ -1468,7 +1469,7 @@ describe Mongo::Client do
       end
 
       let(:client) do
-        Mongo::Client.new(ADDRESSES, client_options).tap do |cl|
+        Mongo::Client.new(SpecConfig.instance.addresses, client_options).tap do |cl|
           cl.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber.clear_events!)
         end
       end
@@ -1481,6 +1482,10 @@ describe Mongo::Client do
         client.list_databases({}, true)
       end
 
+      after do
+        client.close
+      end
+
       it 'sends the command with the nameOnly flag set to true' do
         expect(command[:nameOnly]).to be(true)
       end
@@ -1548,11 +1553,14 @@ describe Mongo::Client do
       described_class.new(['127.0.0.1:27017'])
     end
 
-    before do
-      expect(client.cluster).to receive(:reconnect!).and_call_original
+    it 'replaces the cluster' do
+      old_id = client.cluster.object_id
+      client.reconnect
+      new_id = client.cluster.object_id
+      expect(new_id).not_to eql(old_id)
     end
 
-    it 'reconnects the cluster and returns true' do
+    it 'returns true' do
       expect(client.reconnect).to be(true)
     end
   end

data/spec/mongo/cluster/topology/replica_set_spec.rb

@@ -514,6 +514,9 @@ describe Mongo::Cluster::Topology::ReplicaSet do
           allow(d).to receive(:replica_set_name).and_return('test')
           allow(d).to receive(:is_server?).and_return(true)
           allow(d).to receive(:ghost?).and_return(false)
+          allow(d).to receive(:address).and_return(address)
+          allow(d).to receive(:me_mismatch?).and_return(false)
+          allow(d).to receive(:unknown?).and_return(false)
         end
       end
 
@@ -533,6 +536,10 @@ describe Mongo::Cluster::Topology::ReplicaSet do
             allow(d).to receive(:replica_set_name).and_return('testing')
             allow(d).to receive(:lists_server?).and_return(true)
             allow(d).to receive(:servers).and_return([double('server')])
+            allow(d).to receive(:address).and_return(address)
+            allow(d).to receive(:me_mismatch?).and_return(false)
+            allow(d).to receive(:unknown?).and_return(false)
+            allow(d).to receive(:server_type).and_return(:secondary)
           end
         end
 
@@ -543,19 +550,46 @@ describe Mongo::Cluster::Topology::ReplicaSet do
 
       context 'when the description does not include the server in question' do
 
-        let(:description) do
-          double('description').tap do |d|
-            allow(d).to receive(:config).and_return({ 'setName' => 'testing' })
-            allow(d).to receive(:replica_set_member?).and_return(true)
-            allow(d).to receive(:replica_set_name).and_return('testing')
-            allow(d).to receive(:is_server?).and_return(false)
-            allow(d).to receive(:lists_server?).and_return(false)
-            allow(d).to receive(:servers).and_return([double('server')])
+        context 'when the description is primary' do
+          let(:description) do
+            double('description').tap do |d|
+              allow(d).to receive(:config).and_return({ 'setName' => 'testing' })
+              allow(d).to receive(:replica_set_member?).and_return(true)
+              allow(d).to receive(:replica_set_name).and_return('testing')
+              allow(d).to receive(:is_server?).and_return(false)
+              allow(d).to receive(:lists_server?).and_return(false)
+              allow(d).to receive(:servers).and_return([double('server')])
+              allow(d).to receive(:address).and_return("127.0.0.1:27018")
+              allow(d).to receive(:me_mismatch?).and_return(false)
+              allow(d).to receive(:unknown?).and_return(false)
+              allow(d).to receive(:server_type).and_return(:primary)
+            end
+          end
+
+          it 'returns true' do
+            expect(topology.remove_server?(description, secondary)).to eq(true)
           end
         end
 
-        it 'returns true' do
-          expect(topology.remove_server?(description, secondary)).to eq(true)
+        context 'when the description is not' do
+          let(:description) do
+            double('description').tap do |d|
+              allow(d).to receive(:config).and_return({ 'setName' => 'testing' })
+              allow(d).to receive(:replica_set_member?).and_return(true)
+              allow(d).to receive(:replica_set_name).and_return('testing')
+              allow(d).to receive(:is_server?).and_return(false)
+              allow(d).to receive(:lists_server?).and_return(false)
+              allow(d).to receive(:servers).and_return([double('server')])
+              allow(d).to receive(:address).and_return('127.0.0.1:27018')
+              allow(d).to receive(:me_mismatch?).and_return(false)
+              allow(d).to receive(:unknown?).and_return(false)
+              allow(d).to receive(:server_type).and_return(:secondary)
+            end
+          end
+
+          it 'returns false' do
+            expect(topology.remove_server?(description, secondary)).to eq(false)
+          end
         end
       end
     end
@@ -568,6 +602,8 @@ describe Mongo::Cluster::Topology::ReplicaSet do
           allow(d).to receive(:replica_set_member?).and_return(true)
           allow(d).to receive(:replica_set_name).and_return('test')
           allow(d).to receive(:is_server?).and_return(false)
+          allow(d).to receive(:address).and_return('127.0.0.1:27018')
+          allow(d).to receive(:unknown?).and_return(false)
         end
       end
 

data/spec/mongo/cluster_spec.rb

@@ -7,7 +7,7 @@ describe Mongo::Cluster do
   end
 
   let(:cluster) do
-    described_class.new(ADDRESSES, monitoring, TEST_OPTIONS)
+    described_class.new(SpecConfig.instance.addresses, monitoring, TEST_OPTIONS)
   end
 
   describe '#==' do
@@ -19,7 +19,7 @@ describe Mongo::Cluster do
         context 'when the options are the same' do
 
           let(:other) do
-            described_class.new(ADDRESSES, monitoring, TEST_OPTIONS)
+            described_class.new(SpecConfig.instance.addresses, monitoring, TEST_OPTIONS)
           end
 
           it 'returns true' do
@@ -594,7 +594,7 @@ describe Mongo::Cluster do
   describe '#update_cluster_time' do
 
     let(:cluster) do
-      described_class.new(ADDRESSES, monitoring, TEST_OPTIONS.merge(heartbeat_frequency: 1000))
+      described_class.new(SpecConfig.instance.addresses, monitoring, TEST_OPTIONS.merge(heartbeat_frequency: 1000))
     end
 
     let(:result) do

data/spec/mongo/collection/view/aggregation_spec.rb

@@ -147,7 +147,8 @@ describe Mongo::Collection::View::Aggregation do
       end
     end
 
-    context 'when the initial response has no results but an active cursor', if: find_command_enabled? do
+    context 'when the initial response has no results but an active cursor' do
+      min_server_version '3.2'
 
       let(:documents) do
         [

data/spec/mongo/collection/view/readable_spec.rb

@@ -20,7 +20,8 @@ describe Mongo::Collection::View::Readable do
 
   shared_examples_for 'a read concern aware operation' do
 
-    context 'when a read concern is provided', if: find_command_enabled? do
+    context 'when a read concern is provided' do
+      min_server_version '3.2'
 
       let(:new_view) do
         Mongo::Collection::View.new(new_collection, selector, options)

data/spec/mongo/collection_spec.rb

@@ -101,7 +101,7 @@ describe Mongo::Collection do
   describe '#with' do
 
     let(:client) do
-      Mongo::Client.new(ADDRESSES, TEST_OPTIONS)
+      Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS)
     end
 
     let(:database) do
@@ -133,7 +133,7 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(server_selection_timeout: 2))
+          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(server_selection_timeout: 2))
         end
 
         it 'passes the the server_selection_timeout to the cluster' do
@@ -144,7 +144,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
+          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
         end
 
         it 'sets the new read options on the new collection' do
@@ -156,7 +156,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference and server selection timeout set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(read: { mode: :primary_preferred }, server_selection_timeout: 2))
+          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(read: { mode: :primary_preferred }, server_selection_timeout: 2))
         end
 
         it 'sets the new read options on the new collection' do
@@ -186,7 +186,7 @@ describe Mongo::Collection do
       context 'when the client has a write concern set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(write: INVALID_WRITE_CONCERN))
+          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(write: INVALID_WRITE_CONCERN))
         end
 
         it 'sets the new write options on the new collection' do
@@ -219,7 +219,7 @@ describe Mongo::Collection do
       context 'when the client has a server selection timeout setting' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(server_selection_timeout: 2))
+          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(server_selection_timeout: 2))
         end
 
         it 'passes the server_selection_timeout setting to the cluster' do
@@ -230,7 +230,7 @@ describe Mongo::Collection do
       context 'when the client has a read preference set' do
 
         let(:client) do
-          Mongo::Client.new(ADDRESSES, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
+          Mongo::Client.new(SpecConfig.instance.addresses, TEST_OPTIONS.merge(read: { mode: :primary_preferred }))
         end
 
         it 'sets the new read options on the new collection' do
@@ -489,7 +489,8 @@ describe Mongo::Collection do
 
           it_behaves_like 'a capped collection command'
 
-          context 'when validators can be set', if: find_command_enabled? do
+          context 'when validators can be set' do
+            min_server_version '3.2'
             it_behaves_like 'a validated collection command'
           end
         end
@@ -502,7 +503,8 @@ describe Mongo::Collection do
 
           it_behaves_like 'a capped collection command'
 
-          context 'when validators can be set', if: find_command_enabled? do
+          context 'when validators can be set' do
+            min_server_version '3.2'
             it_behaves_like 'a validated collection command'
           end
         end
@@ -1241,7 +1243,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when collection has a validator', if: find_command_enabled? do
+    context 'when collection has a validator' do
+      min_server_version '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -1446,7 +1449,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when collection has a validator', if: find_command_enabled? do
+    context 'when collection has a validator' do
+      min_server_version '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -2327,6 +2331,7 @@ describe Mongo::Collection do
   end
 
   describe '#parallel_scan', unless: sharded? do
+    max_server_version '4.0'
 
     let(:documents) do
       (1..200).map do |i|
@@ -2423,7 +2428,8 @@ describe Mongo::Collection do
       it_behaves_like 'an operation supporting causally consistent reads'
     end
 
-    context 'when a read concern is provided', if: find_command_enabled? do
+    context 'when a read concern is provided' do
+      min_server_version '3.2'
 
       let(:result) do
         authorized_collection.with(options).parallel_scan(2)
@@ -2615,7 +2621,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when collection has a validator', if: find_command_enabled? do
+    context 'when collection has a validator' do
+      min_server_version '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -3027,7 +3034,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when collection has a validator', if: find_command_enabled? do
+    context 'when collection has a validator' do
+      min_server_version '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -3344,7 +3352,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when collection has a validator', if: find_command_enabled? do
+    context 'when collection has a validator' do
+      min_server_version '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -3781,7 +3790,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when write_concern is provided', if: find_command_enabled? && standalone? do
+    context 'when write_concern is provided', if: standalone? do
+      min_server_version '3.2'
 
       it 'uses the write concern' do
         expect {
@@ -3791,7 +3801,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection has a write concern', if: find_command_enabled? && standalone? do
+    context 'when the collection has a write concern', if: standalone? do
+      min_server_version '3.2'
 
       let(:collection) do
         authorized_collection.with(write: { w: 2 })
@@ -4049,7 +4060,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when collection has a validator', if: find_command_enabled? do
+    context 'when collection has a validator' do
+      min_server_version '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -4108,7 +4120,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when write_concern is provided', if: find_command_enabled? && standalone? do
+    context 'when write_concern is provided', if: standalone? do
+      min_server_version '3.2'
 
       it 'uses the write concern' do
         expect {
@@ -4119,7 +4132,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection has a write concern', if: find_command_enabled? && standalone? do
+    context 'when the collection has a write concern', if: standalone? do
+      min_server_version '3.2'
 
       let(:collection) do
         authorized_collection.with(write: { w: 2 })
@@ -4434,7 +4448,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when collection has a validator', if: find_command_enabled? do
+    context 'when collection has a validator' do
+      min_server_version '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -4493,7 +4508,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when write_concern is provided', if: find_command_enabled? && standalone? do
+    context 'when write_concern is provided', if: standalone? do
+      min_server_version '3.2'
 
       it 'uses the write concern' do
         expect {
@@ -4504,7 +4520,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection has a write concern', if: find_command_enabled? && standalone? do
+    context 'when the collection has a write concern', if: standalone? do
+      min_server_version '3.2'
 
       let(:collection) do
         authorized_collection.with(write: { w: 2 })