mongo 2.14.0 → 2.15.1

data/spec/mongo/operation/drop_index_spec.rb

@@ -1,10 +1,17 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 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 +33,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 +53,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

@@ -1,8 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-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
@@ -100,7 +105,7 @@ describe Mongo::Operation::Find::Legacy do
       end
 
       it 'applies the correct flags' do
-        expect(message.flags).to eq([ :no_cursor_timeout, :slave_ok ])
+        expect(message.flags).to eq([ :no_cursor_timeout, :secondary_ok ])
       end
     end
 
@@ -116,7 +121,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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::GetMore::Legacy do
@@ -19,6 +22,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 +54,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,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 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 +31,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

@@ -1,7 +1,13 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 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 +106,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 +137,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 +157,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 +196,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 +212,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 +245,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 +262,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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Insert::Command do

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

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Insert::OpMsg do

data/spec/mongo/operation/insert_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 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 +89,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 +118,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 +150,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 +169,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 +201,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 +227,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 +242,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 +279,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/kill_cursors_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::KillCursors::Legacy do

data/spec/mongo/operation/limited_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Limited do

data/spec/mongo/operation/map_reduce_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 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 +103,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 +123,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_legacy_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::ReadPreferenceSupported do
@@ -46,103 +49,93 @@ describe Mongo::Operation::ReadPreferenceSupported do
     end
   end
 
-  describe '#add_slave_ok_flag_maybe' do
+  describe '#add_secondary_ok_flag?' do
 
     let(:actual) do
-      operation.send(:add_slave_ok_flag_maybe, operation.send(:options), connection)
+      operation.send(:add_secondary_ok_flag?, connection)
     end
 
-    shared_examples_for 'sets the slave_ok flag as expected' do
-      it 'sets the slave_ok flag as expected' do
+    shared_examples_for 'sets the secondary_ok flag as expected' do
+      it 'sets the secondary_ok flag as expected' do
         expect(actual).to eq(expected)
       end
     end
 
-    shared_examples_for 'never sets slave_ok' do
+    shared_examples_for 'never sets secondary_ok' do
 
-      let(:expected) do
-        { }
-      end
+      let(:expected) { false }
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when primary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when secondary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
     end
 
-    shared_examples_for 'always sets slave_ok' do
+    shared_examples_for 'always sets secondary_ok' do
 
-      let(:expected) do
-        { :flags => [ :slave_ok ] }
-      end
+      let(:expected) { true }
 
       context 'when no read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when primary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when secondary read preference is specified' do
         let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
     end
 
-    shared_examples_for 'sets slave_ok if read preference is specified and is not primary' do
+    shared_examples_for 'sets secondary_ok if read preference is specified and is not primary' do
 
       context 'when there is no read preference set' do
 
         let(:read_pref) { Mongo::ServerSelector.get }
 
-        let(:expected) do
-          { }
-        end
+        let(:expected) { false }
 
-        it_behaves_like 'sets the slave_ok flag as expected'
+        it_behaves_like 'sets the secondary_ok flag as expected'
       end
 
       context 'when there is a read preference' do
 
-        context 'when the read preference requires the slave_ok flag' do
+        context 'when the read preference requires the secondary_ok flag' do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :secondary) }
 
-          let(:expected) do
-            { :flags => [ :slave_ok ] }
-          end
+          let(:expected) { true }
 
-          it_behaves_like 'sets the slave_ok flag as expected'
+          it_behaves_like 'sets the secondary_ok flag as expected'
         end
 
-        context 'when the read preference does not require the slave_ok flag' do
+        context 'when the read preference does not require the secondary_ok flag' do
 
           let(:read_pref) { Mongo::ServerSelector.get(:mode => :primary) }
 
-          let(:expected) do
-            { }
-          end
+          let(:expected) { false }
 
-          it_behaves_like 'sets the slave_ok flag as expected'
+          it_behaves_like 'sets the secondary_ok flag as expected'
         end
       end
     end
@@ -156,7 +149,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
         let(:standalone?) { true }
 
-        it_behaves_like 'never sets slave_ok'
+        it_behaves_like 'never sets secondary_ok'
       end
 
       context 'when the server is a mongos' do
@@ -164,7 +157,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { true }
 
-        it_behaves_like 'always sets slave_ok'
+        it_behaves_like 'always sets secondary_ok'
       end
 
       context 'when the server is a replica set member' do
@@ -172,7 +165,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { false }
 
-        it_behaves_like 'always sets slave_ok'
+        it_behaves_like 'always sets secondary_ok'
       end
     end
 
@@ -185,7 +178,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
 
         let(:standalone?) { true }
 
-        it_behaves_like 'never sets slave_ok'
+        it_behaves_like 'never sets secondary_ok'
       end
 
       context 'when the server is a mongos' do
@@ -193,7 +186,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { true }
 
-        it_behaves_like 'sets slave_ok if read preference is specified and is not primary'
+        it_behaves_like 'sets secondary_ok if read preference is specified and is not primary'
       end
 
       context 'when the server is a replica set member' do
@@ -201,12 +194,12 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:standalone?) { false }
         let(:mongos?) { false }
 
-        it_behaves_like 'sets slave_ok if read preference is specified and is not primary'
+        it_behaves_like 'sets secondary_ok if read preference is specified and is not primary'
       end
     end
   end
 
-  describe '#update_selector_for_read_pref' do
+  describe '#add_read_preference_legacy' do
 
     let(:read_pref) do
       Mongo::ServerSelector.get(:mode => mode)
@@ -215,7 +208,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
     # Behavior of sending $readPreference is the same regardless of topology.
     shared_examples_for '$readPreference in the command' do
       let(:actual) do
-        operation.send(:update_selector_for_read_pref, operation.send(:selector), connection)
+        operation.send(:add_read_preference_legacy, operation.send(:selector), connection)
       end
 
       let(:expected_read_preference) do
@@ -342,7 +335,7 @@ describe Mongo::Operation::ReadPreferenceSupported do
         let(:mongos?) { false }
 
         # $readPreference is not sent to replica set nodes running legacy
-        # servers - the allowance of secondary reads is handled by slave_ok
+        # servers - the allowance of secondary reads is handled by secondary_ok
         # flag.
         it_behaves_like 'does not send read preference'
       end

data/spec/mongo/operation/read_preference_op_msg_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::SessionsSupported do
@@ -175,13 +178,13 @@ describe Mongo::Operation::SessionsSupported do
         let(:tag_sets) { nil }
 
         context 'without tag_sets specified' do
-          it_behaves_like 'does not modify selector'
+          it_behaves_like 'adds read preference'
         end
 
         context 'with empty tag_sets' do
           let(:tag_sets) { [] }
 
-          it_behaves_like 'does not modify selector'
+          it_behaves_like 'adds read preference'
         end
 
         context 'with tag_sets specified' do
@@ -256,7 +259,7 @@ describe Mongo::Operation::SessionsSupported do
           let(:hedge) { nil }
 
           context 'when tag_sets and hedge are not specified' do
-            it_behaves_like 'does not modify selector'
+            it_behaves_like 'adds read preference'
           end
 
           context 'when tag_sets are specified' do

data/spec/mongo/operation/remove_user_spec.rb

@@ -1,6 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::RemoveUser do
+  require_no_required_api_version
+
+  let(:context) { Mongo::Operation::Context.new }
 
   describe '#execute' do
 
@@ -22,7 +28,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 +39,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

@@ -1,10 +1,15 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Result do
 
   let(:description) do
-    Mongo::Server::Description.new(double('description address'),
-      'minWireVersion' => 0, 'maxWireVersion' => 2)
+    Mongo::Server::Description.new(
+      double('description address'),
+      { 'minWireVersion' => 0, 'maxWireVersion' => 2 }
+    )
   end
 
   let(:result) do
@@ -31,7 +36,7 @@ describe Mongo::Operation::Result do
     context 'when the reply is for a read command' do
 
       let(:documents) do
-        [{ 'ismaster' => true, 'ok' => 1.0 }]
+        [{ 'isWritablePrimary' => true, 'ok' => 1.0 }]
       end
 
       it 'returns true' do
@@ -145,7 +150,7 @@ describe Mongo::Operation::Result do
     context 'when the reply is for a read command' do
 
       let(:documents) do
-        [{ 'ismaster' => true, 'ok' => 1.0 }]
+        [{ 'hello' => true, 'ok' => 1.0 }]
       end
 
       it 'returns the number returned' do
@@ -337,7 +342,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/specifiable_spec.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe Mongo::Operation::Specifiable do