mongo 2.7.0 → 2.7.1

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

@@ -94,14 +94,16 @@ describe Mongo::Collection::View::Writable do
           { collation: { locale: 'en_US', strength: 2 } }
         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'
 
           it 'applies the collation' do
             expect(result['name']).to eq('bang')
           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 {
@@ -161,14 +163,16 @@ describe Mongo::Collection::View::Writable do
           { collation: { locale: 'en_US', strength: 2 } }
         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'
 
           it 'applies the collation' do
             expect(result['name']).to eq('bang')
           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 {
@@ -287,7 +291,8 @@ describe Mongo::Collection::View::Writable do
           { collation: { locale: 'en_US', strength: 2 } }
         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'
 
           it 'applies the collation' do
             expect(result['name']).to eq('bang')
@@ -295,7 +300,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -336,7 +342,8 @@ describe Mongo::Collection::View::Writable do
           { collation: { locale: 'en_US', strength: 2 } }
         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'
 
           it 'applies the collation' do
             expect(result['name']).to eq('bang')
@@ -344,7 +351,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -497,7 +505,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result['name']).to eq('bang')
@@ -505,7 +514,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -546,7 +556,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result['name']).to eq('bang')
@@ -554,7 +565,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -667,7 +679,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(2)
@@ -675,7 +688,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -717,7 +731,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(2)
@@ -725,7 +740,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -828,7 +844,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -836,7 +853,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -877,7 +895,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -885,7 +904,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -1056,7 +1076,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -1064,7 +1085,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -1105,7 +1127,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -1113,7 +1136,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -1289,7 +1313,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(2)
@@ -1297,7 +1322,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -1339,7 +1365,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(2)
@@ -1347,7 +1374,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -1520,7 +1548,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -1528,7 +1557,8 @@ describe Mongo::Collection::View::Writable 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 {
@@ -1569,7 +1599,8 @@ describe Mongo::Collection::View::Writable do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -1577,7 +1608,8 @@ describe Mongo::Collection::View::Writable 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 {

data/spec/mongo/collection/view_spec.rb

@@ -170,14 +170,16 @@ describe Mongo::Collection::View do
           view.limit(-1).first
         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'
 
           it 'applies the collation' do
             expect(result['name']).to eq('bang')
           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 {

data/spec/mongo/collection_spec.rb

@@ -475,7 +475,7 @@ describe Mongo::Collection do
           it_behaves_like 'a capped collection command'
 
           context 'when validators can be set' do
-            min_server_version '3.2'
+            min_server_fcv '3.2'
             it_behaves_like 'a validated collection command'
           end
         end
@@ -489,7 +489,7 @@ describe Mongo::Collection do
           it_behaves_like 'a capped collection command'
 
           context 'when validators can be set' do
-            min_server_version '3.2'
+            min_server_fcv '3.2'
             it_behaves_like 'a validated collection command'
           end
         end
@@ -511,7 +511,9 @@ describe Mongo::Collection do
           described_class.new(database, :specs, options)
         end
 
-        context 'when the server supports write concern on the create command', if: replica_set? && collation_enabled? do
+        context 'when the server supports write concern on the create command' do
+          min_server_fcv '3.4'
+          require_topology :replica_set
 
           it 'applies the write concern' do
             expect{
@@ -520,7 +522,8 @@ describe Mongo::Collection do
           end
         end
 
-        context 'when the server does not support write concern on the create command', unless: collation_enabled? do
+        context 'when the server does not support write concern on the create command' do
+          max_server_version '3.2'
 
           it 'does not apply the write concern' do
             expect(collection.create).to be_successful
@@ -548,7 +551,8 @@ describe Mongo::Collection do
             collection.drop
           end
 
-          context 'when the server supports collations', if: collation_enabled? do
+          context 'when the server supports collations' do
+            min_server_fcv '3.4'
 
             it 'executes the command' do
               expect(response).to be_successful
@@ -565,7 +569,8 @@ describe Mongo::Collection do
             end
           end
 
-          context 'when the server does not support collations', unless: collation_enabled? do
+          context 'when the server does not support collations' do
+            max_server_version '3.2'
 
             it 'raises an error' do
               expect {
@@ -678,10 +683,11 @@ describe Mongo::Collection do
 
         it_behaves_like 'an operation using a session'
 
-        # Due to how rspec interprets nested `if: condition` guards, we can't use one to skip this
-        # test in the case that the server will override the write concern (preventing the expected
-        # failure), so we're forced to use a traditional conditional to avoid defining the test.
-        it_behaves_like 'a failed operation using a session' if can_set_write_concern?
+        context 'can set write concern' do
+          require_set_write_concern
+
+          it_behaves_like 'a failed operation using a session'
+        end
       end
 
       context 'when the collection does not have a write concern set' do
@@ -698,7 +704,8 @@ describe Mongo::Collection do
           expect(database.collection_names).to_not include('specs')
         end
 
-        context 'when the collection does not exist', if: can_set_write_concern? do
+        context 'when the collection does not exist' do
+          require_set_write_concern
 
           it 'does not raise an error' do
             expect(database['non-existent-coll'].drop).to be(false)
@@ -718,7 +725,9 @@ describe Mongo::Collection do
           collection.with(write_options)
         end
 
-        context 'when the server supports write concern on the drop command', if: collation_enabled? && can_set_write_concern? do
+        context 'when the server supports write concern on the drop command' do
+          min_server_fcv '3.4'
+          require_set_write_concern
 
           it 'applies the write concern' do
             expect{
@@ -727,7 +736,8 @@ describe Mongo::Collection do
           end
         end
 
-        context 'when the server does not support write concern on the drop command', unless: collation_enabled? do
+        context 'when the server does not support write concern on the drop command' do
+          max_server_version '3.2'
 
           it 'does not apply the write concern' do
             expect(collection_with_write_options.drop).to be_successful
@@ -736,7 +746,9 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection does not exist', if: can_set_write_concern? do
+    context 'when the collection does not exist' do
+      require_set_write_concern
+
       before do
         begin
           collection.drop
@@ -821,7 +833,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the user is not authorized', if: auth_enabled? do
+    context 'when the user is not authorized' do
+      require_auth
 
       let(:view) do
         unauthorized_collection.find
@@ -886,7 +899,7 @@ describe Mongo::Collection do
       end
 
       context 'session id' do
-        min_server_version '3.6'
+        min_server_fcv '3.6'
         require_topology :replica_set, :sharded
 
         let(:options) do
@@ -1207,7 +1220,7 @@ describe Mongo::Collection do
     end
 
     context 'when the documents are sent with OP_MSG' do
-      min_server_version '3.6'
+      min_server_fcv '3.6'
 
       let(:client) do
         subscribed_client
@@ -1236,7 +1249,7 @@ describe Mongo::Collection do
     end
 
     context 'when collection has a validator' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating].drop
@@ -1444,7 +1457,7 @@ describe Mongo::Collection do
     end
 
     context 'when collection has a validator' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -1549,7 +1562,7 @@ describe Mongo::Collection do
       it_behaves_like 'a failed operation using a session'
     end
 
-    context 'when batch size is specified', unless: need_to_skip_on_sharded_auth_40? do
+    context 'when batch size is specified' do
 
       let(:batch_size) { 1 }
 
@@ -1668,14 +1681,16 @@ describe Mongo::Collection do
           authorized_collection.aggregate(pipeline, options).collect { |doc| doc['name']}
         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'
 
           it 'applies the collation' do
             expect(result).to eq(['bang', 'bang'])
           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 {
@@ -1700,6 +1715,42 @@ describe Mongo::Collection do
     end
   end
 
+  describe '#count_documents' do
+    context 'when transactions are enabled' do
+      require_transaction_support
+
+      before do
+        # Ensure that the collection is created
+        authorized_collection.insert_one(x: 1)
+        authorized_collection.delete_many({})
+      end
+
+      let(:session) do
+        authorized_client.start_session
+      end
+
+      it 'successfully starts a transaction and executes a transaction' do
+        session.start_transaction
+        expect(
+          session.instance_variable_get(:@state)
+        ).to eq(Mongo::Session::STARTING_TRANSACTION_STATE)
+
+        expect(authorized_collection.count_documents({}, { session: session })).to eq(0)
+        expect(
+          session.instance_variable_get(:@state)
+        ).to eq(Mongo::Session::TRANSACTION_IN_PROGRESS_STATE)
+
+        authorized_collection.insert_one({ x: 1 }, { session: session })
+        expect(authorized_collection.count_documents({}, { session: session })).to eq(1)
+
+        session.commit_transaction
+        expect(
+          session.instance_variable_get(:@state)
+        ).to eq(Mongo::Session::TRANSACTION_COMMITTED_STATE)
+      end
+    end
+  end
+
   describe '#count' do
 
     let(:documents) do
@@ -1774,14 +1825,16 @@ describe Mongo::Collection do
           { collation: { locale: 'en_US', strength: 2 } }
         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'
 
           it 'applies the collation to the count' do
             expect(result).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 {
@@ -1885,14 +1938,16 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation to the distinct' do
           expect(result).to eq(['bang'])
         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 {
@@ -1972,7 +2027,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the delete fails', if: standalone? do
+    context 'when the delete fails' do
+      require_topology :single
 
       let(:result) do
         collection_invalid_write_concern.delete_one
@@ -2051,7 +2107,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -2089,7 +2146,8 @@ describe Mongo::Collection 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 {
@@ -2157,7 +2215,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the deletes fail', if: standalone?  do
+    context 'when the deletes fail' do
+      require_topology :single
 
       let(:result) do
         collection_invalid_write_concern.delete_many
@@ -2237,7 +2296,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(2)
@@ -2275,7 +2335,8 @@ describe Mongo::Collection 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 {
@@ -2320,8 +2381,9 @@ describe Mongo::Collection do
     end
   end
 
-  describe '#parallel_scan', unless: sharded? do
+  describe '#parallel_scan' do
     max_server_version '4.0'
+    require_topology :single, :replica_set
 
     let(:documents) do
       (1..200).map do |i|
@@ -2419,7 +2481,7 @@ describe Mongo::Collection do
     end
 
     context 'when a read concern is provided' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       let(:result) do
         authorized_collection.with(options).parallel_scan(2)
@@ -2450,7 +2512,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection has a read preference', unless: sharded? do
+    context 'when the collection has a read preference' do
+      require_topology :single, :replica_set
 
       before do
         allow(collection.client.cluster).to receive(:single?).and_return(false)
@@ -2480,7 +2543,8 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when a max time ms value is provided', if: !sharded? do
+    context 'when a max time ms value is provided' do
+      require_topology :single, :replica_set
 
       let(:result) do
         authorized_collection.parallel_scan(2, options)
@@ -2612,7 +2676,7 @@ describe Mongo::Collection do
     end
 
     context 'when collection has a validator' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -2685,7 +2749,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -2723,7 +2788,8 @@ describe Mongo::Collection 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 {
@@ -2917,7 +2983,8 @@ describe Mongo::Collection do
         { '$or' => [{ _id: 0 }, { _id: 1 }]}
       end
 
-      context 'when the server supports arrayFilters', if: array_filters_enabled? do
+      context 'when the server supports arrayFilters' do
+        min_server_fcv '3.6'
 
         before do
           authorized_collection.insert_many([{
@@ -2975,7 +3042,8 @@ describe Mongo::Collection do
         end
       end
 
-      context 'when the server does not support arrayFilters', unless: array_filters_enabled? do
+      context 'when the server does not support arrayFilters' do
+        max_server_version '3.4'
 
         let(:result) do
           authorized_collection.update_many(selector,
@@ -3025,7 +3093,7 @@ describe Mongo::Collection do
     end
 
     context 'when collection has a validator' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -3102,7 +3170,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(2)
@@ -3140,7 +3209,8 @@ describe Mongo::Collection 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 {
@@ -3343,7 +3413,7 @@ describe Mongo::Collection do
     end
 
     context 'when collection has a validator' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating,
@@ -3419,7 +3489,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result.written_count).to eq(1)
@@ -3457,7 +3528,8 @@ describe Mongo::Collection 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 {
@@ -3506,7 +3578,8 @@ describe Mongo::Collection do
         { _id: 0}
       end
 
-      context 'when the server supports arrayFilters', if: array_filters_enabled? do
+      context 'when the server supports arrayFilters' do
+        min_server_fcv '3.6'
 
         before do
           authorized_collection.insert_one(_id: 0, x: [{ y: 1 }, { y: 2 }, {y: 3 }])
@@ -3545,7 +3618,8 @@ describe Mongo::Collection do
         end
       end
 
-      context 'when the server does not support arrayFilters', unless: array_filters_enabled? do
+      context 'when the server does not support arrayFilters' do
+        max_server_version '3.4'
 
         let(:result) do
           authorized_collection.update_one(selector,
@@ -3582,7 +3656,7 @@ describe Mongo::Collection do
     end
 
     context 'when the documents are sent with OP_MSG' do
-      min_server_version '3.6'
+      min_server_fcv '3.6'
 
       let(:client) do
         subscribed_client
@@ -3781,8 +3855,9 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when write_concern is provided', if: standalone? do
-      min_server_version '3.2'
+    context 'when write_concern is provided' do
+      min_server_fcv '3.2'
+      require_topology :single
 
       it 'uses the write concern' do
         expect {
@@ -3792,8 +3867,9 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection has a write concern', if: standalone? do
-      min_server_version '3.2'
+    context 'when the collection has a write concern' do
+      min_server_fcv '3.2'
+      require_topology :single
 
       let(:collection) do
         authorized_collection.with(write: { w: 2 })
@@ -3825,7 +3901,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result['name']).to eq('bang')
@@ -3833,7 +3910,8 @@ describe Mongo::Collection 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 {
@@ -4052,7 +4130,7 @@ describe Mongo::Collection do
     end
 
     context 'when collection has a validator' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating].drop
@@ -4112,8 +4190,9 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when write_concern is provided', if: standalone? do
-      min_server_version '3.2'
+    context 'when write_concern is provided' do
+      min_server_fcv '3.2'
+      require_topology :single
 
       it 'uses the write concern' do
         expect {
@@ -4124,8 +4203,9 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection has a write concern', if: standalone? do
-      min_server_version '3.2'
+    context 'when the collection has a write concern' do
+      min_server_fcv '3.2'
+      require_topology :single
 
       let(:collection) do
         authorized_collection.with(write: { w: 2 })
@@ -4160,7 +4240,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result['name']).to eq('bang')
@@ -4168,7 +4249,8 @@ describe Mongo::Collection 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 {
@@ -4216,7 +4298,8 @@ describe Mongo::Collection do
         { _id: 0 }
       end
 
-      context 'when the server supports arrayFilters', if: array_filters_enabled? do
+      context 'when the server supports arrayFilters' do
+        min_server_fcv '3.6'
 
         before do
           authorized_collection.insert_one(_id: 0, x: [{ y: 1 }, { y: 2 }, { y: 3 }])
@@ -4254,7 +4337,8 @@ describe Mongo::Collection 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'
 
         let(:result) do
           authorized_collection.find_one_and_update(selector,
@@ -4441,7 +4525,7 @@ describe Mongo::Collection do
     end
 
     context 'when collection has a validator' do
-      min_server_version '3.2'
+      min_server_fcv '3.2'
 
       around(:each) do |spec|
         authorized_client[:validating].drop
@@ -4501,8 +4585,9 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when write_concern is provided', if: standalone? do
-      min_server_version '3.2'
+    context 'when write_concern is provided' do
+      min_server_fcv '3.2'
+      require_topology :single
 
       it 'uses the write concern' do
         expect {
@@ -4513,8 +4598,9 @@ describe Mongo::Collection do
       end
     end
 
-    context 'when the collection has a write concern', if: standalone? do
-      min_server_version '3.2'
+    context 'when the collection has a write concern' do
+      min_server_fcv '3.2'
+      require_topology :single
 
       let(:collection) do
         authorized_collection.with(write: { w: 2 })
@@ -4549,7 +4635,8 @@ describe Mongo::Collection do
         { collation: { locale: 'en_US', strength: 2 } }
       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'
 
         it 'applies the collation' do
           expect(result['name']).to eq('bang')
@@ -4557,7 +4644,8 @@ describe Mongo::Collection 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 {
@@ -4602,7 +4690,9 @@ describe Mongo::Collection do
 
   describe '#watch' do
 
-    context 'when change streams can be tested', if: test_change_streams? do
+    context 'when change streams can be tested' do
+      min_server_fcv '3.6'
+      require_topology :replica_set
 
       let(:change_stream) do
         authorized_collection.watch