mongo 2.7.0 → 2.7.1

data/spec/integration/server_description_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'Server description' do
   describe '#op_time' do
     require_topology :replica_set
-    min_server_version '3.4'
+    min_server_fcv '3.4'
 
     let(:client) { ClientRegistry.instance.global_client('authorized') }
     let(:desc) { client.cluster.servers.first.description }
@@ -17,7 +17,7 @@ describe 'Server description' do
 
   describe '#last_write_date' do
     require_topology :replica_set
-    min_server_version '3.4'
+    min_server_fcv '3.4'
 
     let(:client) { ClientRegistry.instance.global_client('authorized') }
     let(:desc) { client.cluster.servers.first.description }
@@ -35,7 +35,7 @@ describe 'Server description' do
     end
 
     let(:client) { ClientRegistry.instance.global_client('authorized') }
-    let(:desc) { client.cluster.servers.first.description }
+    let(:desc) { client.cluster.next_primary.description }
 
     it 'is set' do
       client.database.command(ismaster: 1)

data/spec/integration/server_selector_spec.rb

@@ -0,0 +1,79 @@
+require 'spec_helper'
+
+describe 'Server selector' do
+  let(:selector) { Mongo::ServerSelector::Primary.new }
+  let(:client) { authorized_client }
+  let(:cluster) { client.cluster }
+
+  describe '#select_server' do
+    let(:result) { selector.select_server(cluster) }
+
+    it 'selects' do
+      expect(result).to be_a(Mongo::Server)
+    end
+
+    context 'no servers in the cluster' do
+      let(:client) { Mongo::Client.new([], server_selection_timeout: 2) }
+
+      it 'raises NoServerAvailable with a message explaining the situation' do
+        expect do
+          result
+        end.to raise_error(Mongo::Error::NoServerAvailable, "Cluster has no addresses, and therefore will never have a server")
+      end
+
+      it 'does not wait for server selection timeout' do
+        start_time = Time.now
+        expect do
+          result
+        end.to raise_error(Mongo::Error::NoServerAvailable)
+        time_passed = Time.now - start_time
+        expect(time_passed < 1).to be true
+      end
+    end
+
+    context 'client is closed' do
+      context 'there is a known primary' do
+        before do
+          client.cluster.next_primary
+          client.close
+          expect(client.cluster.connected?).to be false
+        end
+
+        it 'returns the primary for BC reasons' do
+          expect(result).to be_a(Mongo::Server)
+        end
+      end
+
+      context 'there is no known primary' do
+        before do
+          primary_server = client.cluster.next_primary
+          client.close
+          expect(client.cluster.connected?).to be false
+          primary_server.unknown!
+        end
+
+        it 'raises NoServerAvailable with a message explaining the situation' do
+          expect do
+            result
+          end.to raise_error(Mongo::Error::NoServerAvailable, /The cluster is disconnected \(client may have been closed\)/)
+        end
+      end
+    end
+
+    context 'monitoring thread is dead' do
+      before do
+        client.cluster.servers.first.monitor.instance_variable_get('@thread').kill
+        server = client.cluster.next_primary
+        if server
+          server.monitor.instance_variable_set('@description', Mongo::Server::Description.new({}))
+        end
+      end
+
+      it 'raises NoServerAvailable with a message explaining the situation' do
+        expect do
+          result
+        end.to raise_error(Mongo::Error::NoServerAvailable, /The following servers have dead monitor threads/)
+      end
+    end
+  end
+end

data/spec/lite_spec_helper.rb

@@ -24,7 +24,6 @@ if ENV['DRIVERS_TOOLS']
 else
   SSL_CERTS_DIR = "#{CURRENT_PATH}/support/certificates"
   CLIENT_PEM = "#{SSL_CERTS_DIR}/client.pem"
-  CLIENT_PASSWORD_PEM = "#{SSL_CERTS_DIR}/password_protected.pem"
   CA_PEM = "#{SSL_CERTS_DIR}/ca.pem"
   CRL_PEM = "#{SSL_CERTS_DIR}/crl.pem"
   CLIENT_KEY_PEM = "#{SSL_CERTS_DIR}/client_key.pem"
@@ -57,6 +56,8 @@ unless SpecConfig.instance.client_debug?
 end
 Encoding.default_external = Encoding::UTF_8
 
+autoload :Timecop, 'timecop'
+
 require 'ice_nine'
 require 'support/matchers'
 require 'support/lite_constraints'
@@ -85,7 +86,8 @@ else
 end
 
 RSpec.configure do |config|
-  config.extend(CommonShortcuts)
+  config.extend(CommonShortcuts::ClassMethods)
+  config.include(CommonShortcuts::InstanceMethods)
   config.extend(LiteConstraints)
   config.include(ClientRegistryMacros)
 

data/spec/mongo/address_spec.rb

@@ -320,4 +320,12 @@ describe Mongo::Address do
       end
     end
   end
+
+  describe '#connect_timeout' do
+    let(:address) { Mongo::Address.new('127.0.0.1') }
+
+    it 'defaults to 10' do
+      expect(address.send(:connect_timeout)).to eq(10)
+    end
+  end
 end

data/spec/mongo/auth/cr_spec.rb

@@ -64,7 +64,9 @@ describe Mongo::Auth::CR do
         }.to raise_error(Mongo::Auth::Unauthorized)
       end
 
-      context 'when compression is used', if: testing_compression? do
+      context 'when compression is used' do
+        require_compression
+        min_server_fcv '3.6'
 
         it 'does not compress the message' do
           expect(Mongo::Protocol::Compressed).not_to receive(:new)
@@ -77,6 +79,7 @@ describe Mongo::Auth::CR do
   end
 
   context 'when the user is authorized for the database' do
+    max_server_fcv '2.6'
 
     let(:cr) do
       described_class.new(root_user)
@@ -86,7 +89,7 @@ describe Mongo::Auth::CR do
       cr.login(connection).documents[0]
     end
 
-    it 'logs the user into the connection', unless: scram_sha_1_enabled? do
+    it 'logs the user into the connection' do
       expect(cr.login(connection).documents[0]['ok']).to eq(1)
     end
   end

data/spec/mongo/auth/invalid_mechanism_spec.rb

@@ -0,0 +1,11 @@
+require 'lite_spec_helper'
+
+describe Mongo::Auth::InvalidMechanism do
+  describe 'message' do
+    let(:exception) { described_class.new(:foo) }
+
+    it 'includes all built in mechanisms' do
+      expect(exception.message).to eq(':foo is invalid, please use one of the following mechanisms: :mongodb_cr, :mongodb_x509, :plain, :scram, :scram256')
+    end
+  end
+end

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

@@ -7,7 +7,8 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
     described_class.new(user, mechanism)
   end
 
-  context 'when SCRAM-SHA-1 is used', if: scram_sha_1_enabled? do
+  context 'when SCRAM-SHA-1 is used' do
+    min_server_fcv '3.0'
 
     let(:user) do
       Mongo::Auth::User.new(
@@ -208,7 +209,7 @@ describe Mongo::Auth::SCRAM::Conversation, retry: 3 do
   end
 
   context 'when SCRAM-SHA-256 is used' do
-    require_scram_sha_256_support
+    min_server_fcv '4.0'
 
     let(:user) do
       Mongo::Auth::User.new(

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

@@ -1,8 +1,7 @@
 require 'spec_helper'
-require 'cgi'
 
 describe 'SCRAM-SHA auth mechanism negotiation' do
-  require_scram_sha_256_support
+  min_server_fcv '4.0'
 
   before(:all) do
     ClientRegistry.instance.close_all_clients

data/spec/mongo/auth/scram_spec.rb

@@ -39,6 +39,7 @@ describe Mongo::Auth::SCRAM do
   end
 
   context 'when SCRAM-SHA-1 is used' do
+    min_server_fcv '3.0'
 
     describe '#login' do
 
@@ -57,13 +58,15 @@ describe Mongo::Auth::SCRAM do
           described_class.new(user)
         end
 
-        it 'raises an exception', if: scram_sha_1_enabled? do
+        it 'raises an exception' do
           expect {
             cr.login(connection)
           }.to raise_error(Mongo::Auth::Unauthorized)
         end
 
-        context 'when compression is used', if: testing_compression? do
+        context 'when compression is used' do
+          require_compression
+          min_server_fcv '3.6'
 
           it 'does not compress the message' do
             expect(Mongo::Protocol::Compressed).not_to receive(:new)
@@ -88,12 +91,12 @@ describe Mongo::Auth::SCRAM do
           root_user.instance_variable_set(:@client_key, nil)
         end
 
-        it 'logs the user into the connection and caches the client key', if: scram_sha_1_enabled? do
+        it 'logs the user into the connection and caches the client key' do
           expect(login['ok']).to eq(1)
           expect(root_user.send(:client_key)).not_to be_nil
         end
 
-        it 'raises an exception when an incorrect client key is set', if: scram_sha_1_enabled? do
+        it 'raises an exception when an incorrect client key is set' do
           root_user.instance_variable_set(:@client_key, "incorrect client key")
           expect {
             cr.login(connection)
@@ -104,7 +107,7 @@ describe Mongo::Auth::SCRAM do
   end
 
   context 'when SCRAM-SHA-256 is used' do
-    require_scram_sha_256_support
+    min_server_fcv '4.0'
 
     describe '#login' do
 
@@ -129,7 +132,9 @@ describe Mongo::Auth::SCRAM do
           }.to raise_error(Mongo::Auth::Unauthorized)
         end
 
-        context 'when compression is used', if: testing_compression? do
+        context 'when compression is used' do
+          require_compression
+          min_server_fcv '3.6'
 
           it 'does not compress the message' do
             expect(Mongo::Protocol::Compressed).not_to receive(:new)

data/spec/mongo/auth/user/view_spec.rb

@@ -30,7 +30,9 @@ describe Mongo::Auth::User::View do
           expect(response).to be_successful
         end
 
-        context 'when compression is used', if: testing_compression? do
+        context 'when compression is used' do
+          require_compression
+          min_server_fcv '3.6'
 
           it 'does not compress the message' do
             # The dropUser command message will be compressed, so expect instantiation once.
@@ -97,7 +99,9 @@ describe Mongo::Auth::User::View do
           expect(response).to be_successful
         end
 
-        context 'when compression is used', if: testing_compression? do
+        context 'when compression is used' do
+          require_compression
+          min_server_fcv '3.6'
 
           it 'does not compress the message' do
             # The dropUser command message will be compressed, so expect instantiation once.
@@ -145,7 +149,9 @@ describe Mongo::Auth::User::View do
           expect(response).to be_successful
         end
 
-        context 'when compression is used', if: testing_compression? do
+        context 'when compression is used' do
+          require_compression
+          min_server_fcv '3.6'
 
           it 'does not compress the message' do
             # The dropUser command message will be compressed, so expect instantiation once.
@@ -286,15 +292,16 @@ describe Mongo::Auth::User::View do
       end
 
       context 'when a user is not authorized' do
+        require_auth
 
         let(:view) do
           described_class.new(unauthorized_client.database)
         end
 
-        it 'raises an OperationFailure', if: auth_enabled? do
-          expect{
+        it 'raises an OperationFailure' do
+          expect do
             view.info('emily')
-          }.to raise_exception(Mongo::Error::OperationFailure)
+          end.to raise_exception(Mongo::Error::OperationFailure)
         end
       end
     end

data/spec/mongo/bulk_write_spec.rb

@@ -26,6 +26,16 @@ describe Mongo::BulkWrite do
     authorized_client
   end
 
+  shared_examples_for 'bulk write with write concern yielding operation failure' do
+    require_topology :single
+
+    it 'raises an OperationFailure' do
+      expect {
+        bulk_write_invalid_write_concern.execute
+      }.to raise_error(Mongo::Error::OperationFailure)
+    end
+  end
+
   describe '#execute' do
     shared_examples_for 'an executable bulk write' do
 
@@ -130,11 +140,7 @@ describe Mongo::BulkWrite do
 
           context 'when there is a write concern error' do
 
-            it 'raises an OperationFailure', if: standalone? do
-              expect {
-                bulk_write_invalid_write_concern.execute
-              }.to raise_error(Mongo::Error::OperationFailure)
-            end
+            it_behaves_like 'bulk write with write concern yielding operation failure'
 
             context 'when a session is provided' do
 
@@ -189,11 +195,7 @@ describe Mongo::BulkWrite do
 
           context 'when there is a write concern error' do
 
-            it 'raises an OperationFailure', if: standalone? do
-              expect {
-                bulk_write_invalid_write_concern.execute
-              }.to raise_error(Mongo::Error::OperationFailure)
-            end
+            it_behaves_like 'bulk write with write concern yielding operation failure'
 
             context 'when a session is provided' do
 
@@ -252,11 +254,7 @@ describe Mongo::BulkWrite do
 
           context 'when there is a write concern error' do
 
-            it 'raises an OperationFailure', if: standalone? do
-              expect {
-                bulk_write_invalid_write_concern.execute
-              }.to raise_error(Mongo::Error::OperationFailure)
-            end
+            it_behaves_like 'bulk write with write concern yielding operation failure'
 
             context 'when a session is provided' do
 
@@ -285,7 +283,8 @@ describe Mongo::BulkWrite do
                 [{ delete_one: { filter: { name: 'BANG' }, collation: collation } }]
               end
 
-              context 'when the server selected supports collations', if: collation_enabled? do
+              context 'when the server selected supports collations' do
+                min_server_fcv '3.4'
 
                 let!(:result) do
                   bulk_write.execute
@@ -300,7 +299,8 @@ describe Mongo::BulkWrite do
                 end
               end
 
-              context 'when the server selected does not support collations', unless: collation_enabled? do
+              context 'when the server selected does not support collations' do
+                max_server_version '3.2'
 
                 it 'raises an exception' do
                   expect {
@@ -365,7 +365,8 @@ describe Mongo::BulkWrite do
                  }]
               end
 
-              context 'when the server selected supports arrayFilters', if: array_filters_enabled? do
+              context 'when the server selected supports arrayFilters' do
+                min_server_fcv '3.6'
 
                 let!(:result) do
                   bulk_write.execute
@@ -378,7 +379,8 @@ describe Mongo::BulkWrite do
                 end
               end
 
-              context 'when the server selected does not support arrayFilters', unless: array_filters_enabled? do
+              context 'when the server selected does not support arrayFilters' do
+                max_server_version '3.4'
 
                 it 'raises an exception' do
                   expect {
@@ -425,7 +427,8 @@ describe Mongo::BulkWrite do
                  }]
               end
 
-              context 'when the server selected supports arrayFilters', if: array_filters_enabled? do
+              context 'when the server selected supports arrayFilters' do
+                min_server_fcv '3.6'
 
                 let!(:result) do
                   bulk_write.execute
@@ -441,7 +444,8 @@ describe Mongo::BulkWrite do
                 end
               end
 
-              context 'when the server selected does not support arrayFilters', unless: array_filters_enabled? do
+              context 'when the server selected does not support arrayFilters' do
+                max_server_version '3.4'
 
                 it 'raises an exception' do
                   expect {
@@ -517,12 +521,7 @@ describe Mongo::BulkWrite do
 
           context 'when there is a write concern error' do
 
-
-            it 'raises an OperationFailure', if: standalone? do
-              expect {
-                bulk_write_invalid_write_concern.execute
-              }.to raise_error(Mongo::Error::OperationFailure)
-            end
+            it_behaves_like 'bulk write with write concern yielding operation failure'
 
             context 'when a session is provided' do
 
@@ -554,7 +553,8 @@ describe Mongo::BulkWrite do
                { delete_one: { filter: { name: 'DOINK' }, collation: collation }}]
             end
 
-            context 'when the server selected supports collations', if: collation_enabled? do
+            context 'when the server selected supports collations' do
+              min_server_fcv '3.4'
 
               let!(:result) do
                 bulk_write.execute
@@ -569,7 +569,8 @@ describe Mongo::BulkWrite do
               end
             end
 
-            context 'when the server selected does not support collations', unless: collation_enabled? do
+            context 'when the server selected does not support collations' do
+              max_server_version '3.2'
 
               it 'raises an exception' do
                 expect {
@@ -657,11 +658,7 @@ describe Mongo::BulkWrite do
 
           context 'when there is a write concern error' do
 
-            it 'raises an OperationFailure', if: standalone? do
-              expect {
-                bulk_write_invalid_write_concern.execute
-              }.to raise_error(Mongo::Error::OperationFailure)
-            end
+            it_behaves_like 'bulk write with write concern yielding operation failure'
 
             context 'when a session is provided' do
 
@@ -692,7 +689,8 @@ describe Mongo::BulkWrite do
               [{ delete_many: { filter: { name: 'BANG' }, collation: collation }}]
             end
 
-            context 'when the server selected supports collations', if: collation_enabled? do
+            context 'when the server selected supports collations' do
+              min_server_fcv '3.4'
 
               let!(:result) do
                 bulk_write.execute
@@ -707,7 +705,8 @@ describe Mongo::BulkWrite do
               end
             end
 
-            context 'when the server selected does not support collations', unless: collation_enabled? do
+            context 'when the server selected does not support collations' do
+              max_server_version '3.2'
 
               it 'raises an exception' do
                 expect {
@@ -799,11 +798,7 @@ describe Mongo::BulkWrite do
 
           context 'when there is a write concern error' do
 
-            it 'raises an OperationFailure', if: standalone? do
-              expect {
-                bulk_write_invalid_write_concern.execute
-              }.to raise_error(Mongo::Error::OperationFailure)
-            end
+            it_behaves_like 'bulk write with write concern yielding operation failure'
 
             context 'when a session is provided' do
 
@@ -836,7 +831,8 @@ describe Mongo::BulkWrite do
                { delete_many: { filter: { name: 'DOINK' },  collation: collation }}]
             end
 
-            context 'when the server selected supports collations', if: collation_enabled? do
+            context 'when the server selected supports collations' do
+              min_server_fcv '3.4'
 
               let!(:result) do
                 bulk_write.execute
@@ -851,7 +847,8 @@ describe Mongo::BulkWrite do
               end
             end
 
-            context 'when the server selected does not support collations', unless: collation_enabled? do
+            context 'when the server selected does not support collations' do
+              max_server_version '3.2'
 
               it 'raises an exception' do
                 expect {
@@ -940,11 +937,7 @@ describe Mongo::BulkWrite do
 
           context 'when there is a write concern error' do
 
-            it 'raises an OperationFailure', if: standalone? do
-              expect {
-                bulk_write_invalid_write_concern.execute
-              }.to raise_error(Mongo::Error::OperationFailure)
-            end
+            it_behaves_like 'bulk write with write concern yielding operation failure'
 
             context 'when a session is provided' do
 
@@ -977,33 +970,35 @@ describe Mongo::BulkWrite do
             end
 
             context 'when the server selected supports collations' do
+              min_server_fcv '3.4'
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation', if: collation_enabled? do
+              it 'applies the collation' do
                 expect(authorized_collection.find(other: 'pong').count).to eq(1)
               end
 
-              it 'reports the upserted id', if: collation_enabled? do
+              it 'reports the upserted id' do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count', if: collation_enabled? do
+              it 'reports the upserted count' do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count', if: collation_enabled? do
+              it 'reports the modified count' do
                 expect(result.modified_count).to eq(1)
               end
 
-              it 'reports the matched count', if: collation_enabled? do
+              it 'reports the matched count' do
                 expect(result.matched_count).to eq(1)
               end
             end
 
-            context 'when the server selected does not support collations', unless: collation_enabled? do
+            context 'when the server selected does not support collations' do
+              max_server_version '3.2'
 
               it 'raises an exception' do
                 expect {
@@ -1169,11 +1164,7 @@ describe Mongo::BulkWrite do
 
             context 'when there is a write concern error' do
 
-              it 'raises an OperationFailure', if: standalone? do
-                expect {
-                  bulk_write_invalid_write_concern.execute
-                }.to raise_error(Mongo::Error::OperationFailure)
-              end
+              it_behaves_like 'bulk write with write concern yielding operation failure'
 
               context 'when a session is provided' do
 
@@ -1227,11 +1218,7 @@ describe Mongo::BulkWrite do
 
             context 'when there is a write concern error' do
 
-              it 'raises an OperationFailure', if: standalone? do
-                expect {
-                  bulk_write_invalid_write_concern.execute
-                }.to raise_error(Mongo::Error::OperationFailure)
-              end
+              it_behaves_like 'bulk write with write concern yielding operation failure'
             end
 
             context 'when write_concern is specified as an option' do
@@ -1280,33 +1267,35 @@ describe Mongo::BulkWrite do
             end
 
             context 'when the server selected supports collations' do
+              min_server_fcv '3.4'
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation', if: collation_enabled? do
+              it 'applies the collation' do
                 expect(authorized_collection.find(name: 'pong').count).to eq(1)
               end
 
-              it 'reports the upserted id', if: collation_enabled? do
+              it 'reports the upserted id' do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count', if: collation_enabled? do
+              it 'reports the upserted count' do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count', if: collation_enabled? do
+              it 'reports the modified count' do
                 expect(result.modified_count).to eq(1)
               end
 
-              it 'reports the matched count', if: collation_enabled? do
+              it 'reports the matched count' do
                 expect(result.matched_count).to eq(1)
               end
             end
 
-            context 'when the server selected does not support collations', unless: collation_enabled? do
+            context 'when the server selected does not support collations' do
+              max_server_version '3.2'
 
               it 'raises an exception' do
                 expect {
@@ -1386,33 +1375,35 @@ describe Mongo::BulkWrite do
             end
 
             context 'when the server selected supports collations' do
+              min_server_fcv '3.4'
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation', if: collation_enabled? do
+              it 'applies the collation' do
                 expect(authorized_collection.find(name: 'pong').count).to eq(2)
               end
 
-              it 'reports the upserted id', if: collation_enabled? do
+              it 'reports the upserted id' do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count', if: collation_enabled? do
+              it 'reports the upserted count' do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count', if: collation_enabled? do
+              it 'reports the modified count' do
                 expect(result.modified_count).to eq(2)
               end
 
-              it 'reports the matched count', if: collation_enabled? do
+              it 'reports the matched count' do
                 expect(result.matched_count).to eq(2)
               end
             end
 
-            context 'when the server selected does not support collations', unless: collation_enabled? do
+            context 'when the server selected does not support collations' do
+              max_server_version '3.2'
 
               it 'raises an exception' do
                 expect {
@@ -1552,11 +1543,7 @@ describe Mongo::BulkWrite do
 
             context 'when there is a write concern error' do
 
-              it 'raises an OperationFailure', if: standalone? do
-                expect {
-                  bulk_write_invalid_write_concern.execute
-                }.to raise_error(Mongo::Error::OperationFailure)
-              end
+              it_behaves_like 'bulk write with write concern yielding operation failure'
             end
           end
 
@@ -1633,11 +1620,7 @@ describe Mongo::BulkWrite do
 
             context 'when there is a write concern error' do
 
-              it 'raises an OperationFailure', if: standalone? do
-                expect {
-                  bulk_write_invalid_write_concern.execute
-                }.to raise_error(Mongo::Error::OperationFailure)
-              end
+              it_behaves_like 'bulk write with write concern yielding operation failure'
             end
           end
         end
@@ -1658,33 +1641,35 @@ describe Mongo::BulkWrite do
             end
 
             context 'when the server selected supports collations' do
+              min_server_fcv '3.4'
 
               let!(:result) do
                 bulk_write.execute
               end
 
-              it 'applies the collation', if: collation_enabled? do
+              it 'applies the collation' do
                 expect(authorized_collection.find(name: 'pong').count).to eq(2)
               end
 
-              it 'reports the upserted id', if: collation_enabled? do
+              it 'reports the upserted id' do
                 expect(result.upserted_ids).to eq([])
               end
 
-              it 'reports the upserted count', if: collation_enabled? do
+              it 'reports the upserted count' do
                 expect(result.upserted_count).to eq(0)
               end
 
-              it 'reports the modified count', if: collation_enabled? do
+              it 'reports the modified count' do
                 expect(result.modified_count).to eq(2)
               end
 
-              it 'reports the matched count', if: collation_enabled? do
+              it 'reports the matched count' do
                 expect(result.matched_count).to eq(2)
               end
             end
 
-            context 'when the server selected does not support collations', unless: collation_enabled? do
+            context 'when the server selected does not support collations' do
+              max_server_version '3.2'
 
               it 'raises an exception' do
                 expect {
@@ -1781,11 +1766,7 @@ describe Mongo::BulkWrite do
 
             context 'when there is a write concern error' do
 
-              it 'raises an OperationFailure', if: standalone? do
-                expect {
-                  bulk_write_invalid_write_concern.execute
-                }.to raise_error(Mongo::Error::OperationFailure)
-              end
+              it_behaves_like 'bulk write with write concern yielding operation failure'
             end
           end
 
@@ -1822,11 +1803,7 @@ describe Mongo::BulkWrite do
 
             context 'when there is a write concern error' do
 
-              it 'raises an OperationFailure', if: standalone? do
-                expect {
-                  bulk_write_invalid_write_concern.execute
-                }.to raise_error(Mongo::Error::OperationFailure)
-              end
+              it_behaves_like 'bulk write with write concern yielding operation failure'
             end
           end
         end
@@ -1909,7 +1886,7 @@ describe Mongo::BulkWrite do
           end
 
           context 'when retryable writes are supported' do
-            min_server_version '3.6'
+            min_server_fcv '3.6'
             require_topology :replica_set, :sharded
 
             let(:subscriber) { EventSubscriber.new }
@@ -2142,7 +2119,7 @@ describe Mongo::BulkWrite do
   end
 
   describe 'when the collection has a validator' do
-    min_server_version '3.2'
+    min_server_fcv '3.2'
 
     let(:collection_with_validator) do
       authorized_client[:validating,