mongo 2.13.0 → 2.15.0.alpha

data/spec/mongo/operation/drop_index_spec.rb

@@ -1,10 +1,14 @@
 require 'spec_helper'
 
 describe Mongo::Operation::DropIndex do
+  require_no_required_api_version
+
   before do
     authorized_collection.indexes.drop_all
   end
 
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#execute' do
 
     context 'when the index exists' do
@@ -26,7 +30,7 @@ describe Mongo::Operation::DropIndex do
       end
 
       let(:response) do
-        operation.execute(authorized_primary, client: nil)
+        operation.execute(authorized_primary, context: context)
       end
 
       it 'removes the index' do
@@ -46,7 +50,7 @@ describe Mongo::Operation::DropIndex do
 
       it 'raises an exception' do
         expect {
-          operation.execute(authorized_primary, client: nil)
+          operation.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/find/legacy_spec.rb

@@ -3,6 +3,8 @@ require 'spec_helper'
 describe Mongo::Operation::Find::Legacy do
   max_server_version '3.4'
 
+  let(:context) { Mongo::Operation::Context.new }
+
   let(:selector) { { foo: 1 } }
   let(:query_options) { {} }
   let(:spec) do
@@ -116,7 +118,7 @@ describe Mongo::Operation::Find::Legacy do
 
       it 'does not raise an exception' do
         authorized_primary.with_connection do |connection|
-          expect(op.execute(connection, client: nil)).to be_a(Mongo::Operation::Find::Legacy::Result)
+          expect(op.execute(connection, context: context)).to be_a(Mongo::Operation::Find::Legacy::Result)
         end
       end
     end

data/spec/mongo/operation/get_more_spec.rb

@@ -19,6 +19,8 @@ describe Mongo::Operation::GetMore::Legacy do
 
   let(:op) { described_class.new(spec) }
 
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#initialize' do
 
     it 'sets the spec' do
@@ -49,7 +51,7 @@ describe Mongo::Operation::GetMore::Legacy do
       expect(Mongo::Protocol::GetMore).to receive(:new).with(SpecConfig.instance.test_db, TEST_COLL, to_return, cursor_id).and_call_original
       begin
         authorized_primary.with_connection do |connection|
-          op.execute(connection, client: nil)
+          op.execute(connection, context: context)
         end
       rescue
       end

data/spec/mongo/operation/indexes_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Indexes do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
+
   describe '#execute' do
 
     let(:index_spec) do
@@ -24,7 +28,7 @@ describe Mongo::Operation::Indexes do
     end
 
     let(:indexes) do
-      operation.execute(authorized_primary, client: nil)
+      operation.execute(authorized_primary, context: context)
     end
 
     it 'returns the indexes for the collection' do

data/spec/mongo/operation/insert/bulk_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Mongo::Operation::Insert do
   require_no_multi_shard
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   before do
     begin
@@ -100,7 +103,7 @@ describe Mongo::Operation::Insert do
 
       let(:inserted_ids) do
         authorized_primary.with_connection do |connection|
-          op.bulk_execute(connection, client: nil).inserted_ids
+          op.bulk_execute(connection, context: context).inserted_ids
         end
       end
 
@@ -131,7 +134,7 @@ describe Mongo::Operation::Insert do
 
         let(:response) do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
         end
 
@@ -151,7 +154,7 @@ describe Mongo::Operation::Insert do
 
         let(:response) do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
         end
 
@@ -190,7 +193,7 @@ describe Mongo::Operation::Insert do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(1)
           end
@@ -206,7 +209,7 @@ describe Mongo::Operation::Insert do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(1)
           end
@@ -239,7 +242,7 @@ describe Mongo::Operation::Insert do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(2)
           end
@@ -256,7 +259,7 @@ describe Mongo::Operation::Insert do
 
           it 'does not after first error' do
             authorized_primary.with_connection do |connection|
-              failing_insert.bulk_execute(connection, client: nil)
+              failing_insert.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find.count).to eq(2)
           end

data/spec/mongo/operation/insert/command_spec.rb

@@ -63,7 +63,7 @@ describe Mongo::Operation::Insert::Command do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -90,7 +90,7 @@ describe Mongo::Operation::Insert::Command do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server does not support OP_MSG' do
       max_server_version '3.4'

data/spec/mongo/operation/insert/op_msg_spec.rb

@@ -72,7 +72,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -99,7 +99,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server supports OP_MSG' do
       min_server_fcv '3.6'
@@ -167,7 +167,7 @@ describe Mongo::Operation::Insert::OpMsg do
 
         context 'when an implicit session is created and the topology is then updated and the server does not support sessions' do
           # Mocks on features are incompatible with linting
-          skip_if_linting
+          require_no_linting
 
           let(:expected_global_args) do
             global_args.dup.tap do |args|

data/spec/mongo/operation/insert_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::Insert do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:documents) do
     [{ '_id' => 1,
@@ -83,7 +86,7 @@ describe Mongo::Operation::Insert do
       end
 
       let(:inserted_ids) do
-        insert.execute(authorized_primary, client: nil).inserted_ids
+        insert.execute(authorized_primary, context: context).inserted_ids
       end
 
       let(:collection_ids) do
@@ -112,7 +115,7 @@ describe Mongo::Operation::Insert do
       context 'when the insert succeeds' do
 
         let!(:response) do
-          insert.execute(authorized_primary, client: nil)
+          insert.execute(authorized_primary, context: context)
         end
 
         it 'reports the correct written count' do
@@ -144,8 +147,8 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            failing_insert.execute(authorized_primary, client: nil)
-            failing_insert.execute(authorized_primary, client: nil)
+            failing_insert.execute(authorized_primary, context: context)
+            failing_insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -163,7 +166,7 @@ describe Mongo::Operation::Insert do
         end
 
         let!(:response) do
-          insert.execute(authorized_primary, client: nil)
+          insert.execute(authorized_primary, context: context)
         end
 
         it 'reports the correct written count' do
@@ -195,8 +198,8 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            failing_insert.execute(authorized_primary, client: nil)
-            failing_insert.execute(authorized_primary, client: nil)
+            failing_insert.execute(authorized_primary, context: context)
+            failing_insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
       end
@@ -221,8 +224,8 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            failing_insert.execute(authorized_primary, client: nil)
-            failing_insert.execute(authorized_primary, client: nil)
+            failing_insert.execute(authorized_primary, context: context)
+            failing_insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::OperationFailure)
         end
 
@@ -236,13 +239,13 @@ describe Mongo::Operation::Insert do
 
         it 'raises an error' do
           expect {
-            insert.execute(authorized_primary, client: nil)
+            insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
         end
 
         it 'does not insert the document' do
           expect {
-            insert.execute(authorized_primary, client: nil)
+            insert.execute(authorized_primary, context: context)
           }.to raise_error(Mongo::Error::MaxBSONSize)
           expect(authorized_collection.find.count).to eq(0)
         end
@@ -273,7 +276,7 @@ describe Mongo::Operation::Insert do
       end
 
       let(:response) do
-        op.execute(authorized_primary, client: nil)
+        op.execute(authorized_primary, context: context)
       end
 
       it 'uses op codes instead of write commands' do

data/spec/mongo/operation/map_reduce_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::MapReduce do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:map) do
   %Q{
@@ -97,7 +100,7 @@ describe Mongo::Operation::MapReduce do
     context 'when the map/reduce succeeds' do
 
       let(:response) do
-        op.execute(authorized_primary, client: nil)
+        op.execute(authorized_primary, context: context)
       end
 
       it 'returns the response' do
@@ -117,7 +120,7 @@ describe Mongo::Operation::MapReduce do
 
       it 'raises an exception' do
         expect {
-          op.execute(authorized_primary, client: nil)
+          op.execute(authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/read_preference_op_msg_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Mongo::Operation::SessionsSupported do
   # https://jira.mongodb.org/browse/RUBY-2224
-  skip_if_linting
+  require_no_linting
 
   let(:selector) do
     BSON::Document.new(name: 'test')

data/spec/mongo/operation/remove_user_spec.rb

@@ -1,6 +1,9 @@
 require 'spec_helper'
 
 describe Mongo::Operation::RemoveUser do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#execute' do
 
@@ -22,7 +25,7 @@ describe Mongo::Operation::RemoveUser do
     context 'when user removal was successful' do
 
       let!(:response) do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'removes the user from the database' do
@@ -33,12 +36,12 @@ describe Mongo::Operation::RemoveUser do
     context 'when removal was not successful' do
 
       before do
-        operation.execute(root_authorized_primary, client: nil)
+        operation.execute(root_authorized_primary, context: context)
       end
 
       it 'raises an exception' do
         expect {
-          operation.execute(root_authorized_primary, client: nil)
+          operation.execute(root_authorized_primary, context: context)
         }.to raise_error(Mongo::Error::OperationFailure)
       end
     end

data/spec/mongo/operation/result_spec.rb

@@ -337,7 +337,7 @@ describe Mongo::Operation::Result do
       it 'raises OperationFailure' do
         expect do
           result.validate!
-        end.to raise_error(Mongo::Error::OperationFailure, /Replication is being shut down \(91\)/)
+        end.to raise_error(Mongo::Error::OperationFailure, /\[91\]: Replication is being shut down/)
       end
     end
   end

data/spec/mongo/operation/update/bulk_spec.rb

@@ -2,6 +2,9 @@ require 'spec_helper'
 
 describe Mongo::Operation::Update do
   require_no_multi_shard
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   let(:documents) do
     [{ :q => { :foo => 1 },
@@ -99,7 +102,7 @@ describe Mongo::Operation::Update do
 
         it 'updates the document' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find(field: 'blah').count).to eq(1)
         end
@@ -125,7 +128,7 @@ describe Mongo::Operation::Update do
 
         it 'updates the documents' do
           authorized_primary.with_connection do |connection|
-            op.bulk_execute(connection, client: nil)
+            op.bulk_execute(connection, context: context)
           end
           expect(authorized_collection.find(field: 'blah').count).to eq(2)
         end
@@ -159,7 +162,7 @@ describe Mongo::Operation::Update do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
@@ -173,7 +176,7 @@ describe Mongo::Operation::Update do
 
           it 'aborts after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(0)
           end
@@ -208,7 +211,7 @@ describe Mongo::Operation::Update do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end
@@ -222,7 +225,7 @@ describe Mongo::Operation::Update do
 
           it 'does not abort after first error' do
             authorized_primary.with_connection do |connection|
-              failing_update.bulk_execute(connection, client: nil)
+              failing_update.bulk_execute(connection, context: context)
             end
             expect(authorized_collection.find(other: 'blah').count).to eq(1)
           end

data/spec/mongo/operation/update/command_spec.rb

@@ -69,7 +69,7 @@ describe Mongo::Operation::Update::Command do
 
   describe 'write concern' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when write concern is not specified' do
 
@@ -96,7 +96,7 @@ describe Mongo::Operation::Update::Command do
 
   describe '#message' do
     # https://jira.mongodb.org/browse/RUBY-2224
-    skip_if_linting
+    require_no_linting
 
     context 'when the server does not support OP_MSG' do
       max_server_version '3.4'