mongo 2.6.2 → 2.16.0

data/spec/mongo/bulk_write_spec.rb

@@ -1,22 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::BulkWrite do
 
   before do
-    authorized_collection.delete_many
-  end
-
-  after do
-    authorized_collection.delete_many
-    collection_with_validator.drop
-  end
-
-  let(:collection_with_validator) do
-    begin; authorized_client[:validating].drop; rescue; end
-    authorized_client[:validating,
-                      :validator => { :a => { '$exists' => true } }].tap do |c|
-      c.create
-    end
+    authorized_collection.drop
   end
 
   let(:collection_invalid_write_concern) do
@@ -39,6 +29,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
 
@@ -83,7 +83,7 @@ describe Mongo::BulkWrite do
           end
 
           it 'sets the document index on the error' do
-            expect(error.result[Mongo::Error::WRITE_ERRORS].first['index']).to eq(2)
+            expect(error.result['writeErrors'].first['index']).to eq(2)
           end
 
           context 'when a session is provided' do
@@ -143,11 +143,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
 
@@ -202,11 +198,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
 
@@ -246,6 +238,44 @@ describe Mongo::BulkWrite do
             expect(authorized_collection.find(_id: 0).count).to eq(0)
           end
 
+          context 'when the write has specified a hint option' do
+            let(:requests) do
+              [{
+                 delete_one: {
+                   filter: { _id: 1 },
+                   hint: '_id_',
+                 }
+               }]
+            end
+
+            context 'with unacknowledged write concern' do
+              let(:bulk_write) do
+                described_class.new(
+                  collection,
+                  requests,
+                  options.merge(write_concern: { w: 0 })
+                )
+              end
+
+              it 'raises a client-side error' do
+                expect do
+                  bulk_write.execute
+                end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+              end
+            end
+
+            # Functionality on more recent servers is sufficiently covered by spec tests.
+            context 'on server versions < 3.4' do
+              max_server_fcv '3.2'
+
+              it 'raises a client-side error' do
+                expect do
+                  bulk_write.execute
+                end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+              end
+            end
+          end
+
           context 'when a session is provided' do
 
             let(:operation) do
@@ -265,11 +295,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
 
@@ -298,7 +324,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
@@ -313,7 +340,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 {
@@ -361,6 +389,44 @@ describe Mongo::BulkWrite do
           end
 
           context 'when bulk executing update_one' do
+            context 'when the write has specified a hint option' do
+              let(:requests) do
+                [{
+                   update_one: {
+                     filter: { _id: 1 },
+                     update: { '$set' => { 'x.$[i].y' => 5 } },
+                     hint: '_id_',
+                   }
+                 }]
+              end
+
+              # Functionality on more recent servers is sufficiently covered by spec tests.
+              context 'on server versions < 3.4' do
+                max_server_fcv '3.2'
+
+                it 'raises a client-side error' do
+                  expect do
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+                end
+              end
+
+              context 'with unacknowledged write concern' do
+                let(:bulk_write) do
+                  described_class.new(
+                    collection,
+                    requests,
+                    options.merge(write_concern: { w: 0 })
+                  )
+                end
+
+                it 'raises a client-side error' do
+                  expect do
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
+              end
+            end
 
             context 'when the write has specified arrayFilters' do
 
@@ -378,7 +444,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
@@ -391,7 +458,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 {
@@ -403,6 +471,45 @@ describe Mongo::BulkWrite do
           end
 
           context 'when bulk executing update_many' do
+            context 'when the write has specified a hint option' do
+              let(:requests) do
+                [{
+                   update_many: {
+                     filter: { '$or' => [{ _id: 1 }, { _id: 2 }]},
+                     update: { '$set' => { 'x.$[i].y' => 5 } },
+                     hint: '_id_',
+                   }
+                 }]
+              end
+
+              # Functionality on more recent servers is sufficiently covered by spec tests.
+              context 'on server versions < 3.4' do
+                max_server_fcv '3.2'
+
+                it 'raises a client-side error' do
+                  expect do
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+                end
+              end
+
+              context 'with unacknowledged write concern' do
+                let(:bulk_write) do
+                  described_class.new(
+                    collection,
+                    requests,
+                    options.merge(write_concern: { w: 0 })
+                  )
+                end
+
+                it 'raises a client-side error' do
+                  expect do
+                    bulk_write.execute
+                  end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+                end
+              end
+            end
+
 
             context 'when the write has specified arrayFilters' do
 
@@ -438,7 +545,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
@@ -454,7 +562,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 {
@@ -530,12 +639,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
 
@@ -567,7 +671,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
@@ -582,7 +687,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 {
@@ -651,6 +757,44 @@ describe Mongo::BulkWrite do
             expect(authorized_collection.find(_id: 0).count).to eq(0)
           end
 
+          context 'when the write has specified a hint option' do
+            let(:requests) do
+              [{
+                 delete_many: {
+                   filter: { _id: 1 },
+                   hint: '_id_',
+                 }
+               }]
+            end
+
+            # Functionality on more recent servers is sufficiently covered by spec tests.
+            context 'on server versions < 3.4' do
+              max_server_fcv '3.2'
+
+              it 'raises a client-side error' do
+                expect do
+                  bulk_write.execute
+                end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+              end
+            end
+
+            context 'with unacknowledged write concern' do
+              let(:bulk_write) do
+                described_class.new(
+                  collection,
+                  requests,
+                  options.merge(write_concern: { w: 0 })
+                )
+              end
+
+              it 'raises a client-side error' do
+                expect do
+                  bulk_write.execute
+                end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+              end
+            end
+          end
+
           context 'when a session is provided' do
 
             let(:operation) do
@@ -670,11 +814,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
 
@@ -705,7 +845,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
@@ -720,7 +861,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 {
@@ -812,11 +954,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
 
@@ -849,7 +987,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
@@ -864,7 +1003,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 {
@@ -934,6 +1074,45 @@ describe Mongo::BulkWrite do
             expect(authorized_collection.find(_id: 0).first[:name]).to eq('test')
           end
 
+          context 'when a hint option is provided' do
+            let(:requests) do
+              [{
+                replace_one: {
+                  filter: { _id: 0 },
+                  replacements: { name: 'test' },
+                  hint: '_id_'
+                }
+              }]
+            end
+
+            # Functionality on more recent servers is sufficiently covered by spec tests.
+            context 'on server versions < 3.4' do
+              max_server_fcv '3.2'
+
+              it 'raises a client-side error' do
+                expect do
+                  bulk_write.execute
+                end.to raise_error(Mongo::Error::UnsupportedOption, /The MongoDB server handling this request does not support the hint option on this command./)
+              end
+            end
+
+            context 'with unacknowledged write concern' do
+              let(:bulk_write) do
+                described_class.new(
+                  collection,
+                  requests,
+                  options.merge(write_concern: { w: 0 })
+                )
+              end
+
+              it 'raises a client-side error' do
+                expect do
+                  bulk_write.execute
+                end.to raise_error(Mongo::Error::UnsupportedOption, /The hint option cannot be specified on an unacknowledged write operation/)
+              end
+            end
+          end
+
           context 'when a session is provided' do
 
             let(:operation) do
@@ -953,11 +1132,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
 
@@ -990,33 +1165,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 {
@@ -1159,13 +1336,17 @@ describe Mongo::BulkWrite do
             end
 
             context 'when the number of updates exceeds the max batch size' do
+              # Test uses doubles for server descriptions, doubles are
+              # incompatible with freezing which linting does for descriptions
+              require_no_linting
 
               let(:batch_size) do
                 11
               end
 
               before do
-                allow(client.cluster.next_primary).to receive(:max_write_batch_size).and_return(batch_size - 1)
+                allow_any_instance_of(Mongo::Server::Description).to \
+                  receive(:max_write_batch_size).and_return(batch_size - 1)
               end
 
               let(:requests) do
@@ -1182,11 +1363,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
 
@@ -1240,15 +1417,15 @@ 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
 
+              # In a multi-sharded cluster, the write seems to go to a
+              # different shard from the read
+              require_no_multi_mongos
+
               let(:extra_options) do
                 { write_concern: { w: 0 } }
               end
@@ -1293,33 +1470,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 {
@@ -1399,33 +1578,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 {
@@ -1565,11 +1746,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
 
@@ -1646,11 +1823,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
@@ -1671,33 +1844,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 {
@@ -1794,11 +1969,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
 
@@ -1835,24 +2006,28 @@ 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
       end
 
       context 'when the operations need to be split' do
+        # Test uses doubles for server descriptions, doubles are
+        # incompatible with freezing which linting does for descriptions
+        require_no_linting
 
         let(:batch_size) do
           11
         end
 
+        let(:connection) do
+          server = client.cluster.next_primary
+        end
+
         before do
-          allow(client.cluster.next_primary).to receive(:max_write_batch_size).and_return(batch_size - 1)
+          allow_any_instance_of(Mongo::Server::Description).to \
+            receive(:max_write_batch_size).and_return(batch_size - 1)
         end
 
         context 'when a write error occurs' do
@@ -1880,7 +2055,7 @@ describe Mongo::BulkWrite do
 
           it 'sets the document index on the error' do
             requests.push({ insert_one: { _id: 5 }})
-            expect(error.result[Mongo::Error::WRITE_ERRORS].first['index']).to eq(batch_size)
+            expect(error.result['writeErrors'].first['index']).to eq(batch_size)
           end
         end
 
@@ -1921,10 +2096,24 @@ describe Mongo::BulkWrite do
             it_behaves_like 'an operation using a session'
           end
 
-          context 'when retryable writes are supported', if: test_sessions? do
+          context 'when retryable writes are supported' do
+            require_wired_tiger
+            min_server_fcv '3.6'
+            require_topology :replica_set, :sharded
+
+            # In a multi-shard cluster, retries may go to a different server
+            # than original command which these tests are not prepared to handle
+            require_no_multi_mongos
+
+
+            let(:subscriber) { Mrss::EventSubscriber.new }
 
             let(:client) do
-              authorized_client_with_retry_writes
+              authorized_client_with_retry_writes.tap do |client|
+                # We do not unsubscribe any of these subscribers.
+                # This is harmless since they simply store the events in themselves.
+                client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
+              end
             end
 
             let(:collection) do
@@ -1935,12 +2124,18 @@ describe Mongo::BulkWrite do
               bulk_write.execute
             end
 
+            let(:started_events) do
+              subscriber.started_events.select do |event|
+                event.command['insert']
+              end
+            end
+
             let(:first_txn_number) do
-              EventSubscriber.started_events[-2].command['txnNumber'].instance_variable_get(:@integer)
+              Utils.int64_value(started_events[-2].command['txnNumber'])
             end
 
             let(:second_txn_number) do
-              EventSubscriber.started_events[-1].command['txnNumber'].instance_variable_get(:@integer)
+              Utils.int64_value(started_events[-1].command['txnNumber'])
             end
 
             it 'inserts the documents' do
@@ -1951,8 +2146,12 @@ describe Mongo::BulkWrite do
               expect(result.inserted_ids.size).to eq(batch_size)
             end
 
+            it 'publishes the expected number of events' do
+              expect(started_events.length).to eq 2
+            end
+
             it 'increments the transaction number' do
-              expect(first_txn_number + 1). to eq(second_txn_number)
+              expect(second_txn_number). to eq(first_txn_number + 1)
             end
           end
         end
@@ -2137,14 +2336,19 @@ describe Mongo::BulkWrite do
   end
 
   describe 'when the collection has a validator' do
-    min_server_version '3.2'
+    min_server_fcv '3.2'
 
-    before do
-      collection_with_validator.insert_many([{ :a => 1 }, { :a => 2 }])
+    let(:collection_with_validator) do
+      authorized_client[:validating,
+                        :validator => { :a => { '$exists' => true } }].tap do |c|
+        c.create
+      end
     end
 
-    after do
+    before do
+      begin; authorized_client[:validating].drop; rescue; end
       collection_with_validator.delete_many
+      collection_with_validator.insert_many([{ :a => 1 }, { :a => 2 }])
     end
 
     context 'when the documents are invalid' do